summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEvgeny Fadeev <evgeny.fadeev@gmail.com>2013-07-26 02:04:38 -0400
committerEvgeny Fadeev <evgeny.fadeev@gmail.com>2013-07-26 02:04:38 -0400
commit5cbe3177031222ac7734e25418dc0c5a5847c40d (patch)
tree1e0197cc1185fb7487b55b1ed71b0d765def7f14
parent02b27696fa0d22bfe569366c70afe30a78516bd8 (diff)
downloadaskbot-5cbe3177031222ac7734e25418dc0c5a5847c40d.tar.gz
askbot-5cbe3177031222ac7734e25418dc0c5a5847c40d.tar.bz2
askbot-5cbe3177031222ac7734e25418dc0c5a5847c40d.zip
minor css and js adjustments
-rw-r--r--askbot/media/js/utils.js5
-rw-r--r--askbot/media/style/style.css20
-rw-r--r--askbot/media/style/style.less14
3 files changed, 37 insertions, 2 deletions
diff --git a/askbot/media/js/utils.js b/askbot/media/js/utils.js
index 7e021de9..c0f7ca2f 100644
--- a/askbot/media/js/utils.js
+++ b/askbot/media/js/utils.js
@@ -964,6 +964,7 @@ var ModalDialog = function() {
this._reject_handler = function() { me.hide(); };
this._content_element = undefined;
this._headerEnabled = true;
+ this._className = undefined;
};
inherits(ModalDialog, WrappedElement);
@@ -1024,6 +1025,9 @@ ModalDialog.prototype.createDom = function() {
var element = this._element;
element.addClass('modal');
+ if (this._className) {
+ element.addClass(this._className);
+ }
//1) create header
if (this._headerEnabled) {
@@ -1085,6 +1089,7 @@ ModalDialog.prototype.createDom = function() {
*/
var FileUploadDialog = function() {
ModalDialog.call(this);
+ this._className = 'file-upload-dialog';
this._post_upload_handler = undefined;
this._fileType = 'image';
this._headerEnabled = false;
diff --git a/askbot/media/style/style.css b/askbot/media/style/style.css
index 1bcc3fd2..ccdf91ff 100644
--- a/askbot/media/style/style.css
+++ b/askbot/media/style/style.css
@@ -45,10 +45,17 @@ hr {
border-top: 1px dashed #ccccce;
}
input,
-select {
+select,
+textarea {
vertical-align: middle;
font-family: Trebuchet MS, "segoe ui", Helvetica, Tahoma, Verdana, MingLiu, PMingLiu, Arial, sans-serif;
margin-left: 0px;
+ -webkit-appearance: none;
+ border-radius: 0;
+ -ms-border-radius: 0;
+ -moz-border-radius: 0;
+ -webkit-border-radius: 0;
+ -khtml-border-radius: 0;
}
select {
width: 100%;
@@ -4547,6 +4554,17 @@ td.setting-input textarea {
#scopeNav {
display: none;
}
+ .ask-page #id_post_author_username,
+ .question-page #id_post_author_username,
+ .edit-question-page #id_post_author_username,
+ .edit-answer-page #id_post_author_username,
+ .ask-page #id_post_author_email,
+ .question-page #id_post_author_email,
+ .edit-question-page #id_post_author_email,
+ .edit-answer-page #id_post_author_email {
+ width: 100%;
+ margin: 6px 0;
+ }
}
/* language-specific fixes */
body.lang-es #searchBar {
diff --git a/askbot/media/style/style.less b/askbot/media/style/style.less
index 950d9305..b6c1ac51 100644
--- a/askbot/media/style/style.less
+++ b/askbot/media/style/style.less
@@ -32,10 +32,12 @@ hr {
border-top: 1px dashed #ccccce;
}
-input, select {
+input, select, textarea {
vertical-align: middle;
font-family: Trebuchet MS, "segoe ui", Helvetica, Tahoma, Verdana, MingLiu, PMingLiu, Arial, sans-serif;
margin-left:0px;
+ -webkit-appearance: none;
+ .rounded-corners(0);
}
select {
width: 100%;
@@ -4751,6 +4753,16 @@ td.setting-input {
#scopeNav {
display: none;
}
+ .ask-page,
+ .question-page,
+ .edit-question-page,
+ .edit-answer-page {
+ #id_post_author_username,
+ #id_post_author_email {
+ width: 100%;
+ margin: 6px 0;
+ }
+ }
}
/* language-specific fixes */