some style changes to display the header correctly and added optional setting ASKBOT_CSS_DEVEL to the settings.py

5 files changed, 14 insertions, 8 deletions

diff --git a/askbot/context.py b/askbot/context.py
index 6dc38f79..f740d293 100644
--- a/askbot/context.py
+++ b/askbot/context.py
@@ -15,6 +15,7 @@ def application_settings(request):
     my_settings = askbot_settings.as_dict()
     my_settings['LANGUAGE_CODE'] = settings.LANGUAGE_CODE
     my_settings['ASKBOT_URL'] = settings.ASKBOT_URL
+    my_settings['ASKBOT_CSS_DEVEL'] = getattr(settings, 'ASKBOT_CSS_DEVEL', False)
     my_settings['DEBUG'] = settings.DEBUG
     my_settings['ASKBOT_VERSION'] = askbot.get_version()
     my_settings['LOGIN_URL'] = url_utils.get_login_url()
diff --git a/askbot/skins/default/media/style/style.css b/askbot/skins/default/media/style/style.css
index cacc8782..ba5875ad 100644
--- a/askbot/skins/default/media/style/style.css
+++ b/askbot/skins/default/media/style/style.css
@@ -124,6 +124,9 @@ blockquote {
   height: 0;
   visibility: hidden;
 }
+body.user-messages {
+    margin-top: 2.4em;
+}
 .badges a {
   color: #763333;
   text-decoration: underline;
@@ -166,7 +169,7 @@ h1 {
   border-top: #fff 1px solid;
   font-family: 'Yanone Kaffeesatz', sans-serif;
 }
-.notify p {
+.notify p.notification {
   margin-top: 6px;
   margin-bottom: 6px;
   font-size: 16px;
@@ -204,6 +207,7 @@ h1 {
   padding: 5px 0px 5px 0px;
   height: 75px;
   width: auto;
+  float: left;
 }
 #userToolsNav {
   /* Navigation bar containing login link or user information, check widgets/user_navigation.html*/
diff --git a/askbot/skins/default/media/style/style.less b/askbot/skins/default/media/style/style.less
index 3d436958..543b6157 100644
--- a/askbot/skins/default/media/style/style.less
+++ b/askbot/skins/default/media/style/style.less
@@ -177,8 +177,8 @@ body.user-messages {
     border-top:#fff 1px solid;
     font-family:@main-font;
 
-    p {
-         margin-top: 6px;
+    p.notification {
+        margin-top: 6px;
         margin-bottom: 6px;
         font-size: 16px;
         color:#424242
@@ -220,6 +220,7 @@ body.user-messages {
     padding: 5px 0px 5px 0px;
     height: 75px;
     width: auto;
+    float: left;
 }
 
 #userToolsNav {/* Navigation bar containing login link or user information, check widgets/user_navigation.html*/
diff --git a/askbot/skins/default/templates/meta/html_head_stylesheets.html b/askbot/skins/default/templates/meta/html_head_stylesheets.html
index 4e3f173b..14f3c106 100644
--- a/askbot/skins/default/templates/meta/html_head_stylesheets.html
+++ b/askbot/skins/default/templates/meta/html_head_stylesheets.html
@@ -1,9 +1,9 @@
-{%if settings.DEBUG %}
+{% if settings.ASKBOT_CSS_DEVEL == False %}
+<link href="{{"/style/style.css"|media }}" rel="stylesheet" type="text/css" />
+{% else %}
 <link href="{{"/style/style.less"|media }}" rel="stylesheet/less" type="text/css" />
 <script type="text/javascript" src="{{"/js/less.min.js"|media}}"></script>
-{%else%}
-<link href="{{"/style/style.css"|media }}" rel="stylesheet" type="text/css" />
-{%endif%}
+{% endif %}
 <link href='http://fonts.googleapis.com/css?family=Yanone+Kaffeesatz:300,400,700' rel='stylesheet' type='text/css'>
 {{ skin.get_extra_css_link() }}
 {% if settings.USE_CUSTOM_CSS %}
diff --git a/askbot/skins/default/templates/widgets/system_messages.html b/askbot/skins/default/templates/widgets/system_messages.html
index 6b803846..10ba4a84 100644
--- a/askbot/skins/default/templates/widgets/system_messages.html
+++ b/askbot/skins/default/templates/widgets/system_messages.html
@@ -1,7 +1,7 @@
 <div class="notify" style="display:none">
     {% if user_messages %}
         {% for message in user_messages %}
-              <p>{{ message }}</p>
+              <p class="notification">{{ message }}</p>
         {% endfor %}
     {% endif %}
     <a id="closeNotify" onclick="notify.close(true)"></a>