Merge remote-tracking branch 'askbot/master' into wikipost

3 files changed, 21 insertions, 16 deletions

diff --git a/askbot/skins/default/media/style/style.css b/askbot/skins/default/media/style/style.css
index dac36645..491469d3 100644
--- a/askbot/skins/default/media/style/style.css
+++ b/askbot/skins/default/media/style/style.css
@@ -58,16 +58,16 @@ body.user-messages{margin-top:2.4em;}
 #secondaryHeader #scopeWrapper .scope-selector{font-size:21px;color:#5a5a4b;height:55px;line-height:55px;margin-left:24px;}
 #secondaryHeader #scopeWrapper .on{background:url(../images/scopearrow.png) no-repeat center bottom;}
 #secondaryHeader #scopeWrapper .ask-message{font-size:24px;}
-#searchBar{display:inline-block;background-color:#fff;width:412px;border:1px solid #c9c9b5;float:right;height:42px;margin:6px 0px 0px 15px;}#searchBar .searchInput,#searchBar .searchInputCancelable,#searchBar .searchInputAuth,#searchBar .searchInputCancelableAuth{font-size:30px;height:40px;font-weight:300;background:#FFF;border:0px;color:#484848;padding-left:10px;font-family:Arial;vertical-align:middle;}
-#searchBar .searchInput,#searchBar .searchInputCancelable{width:352px;}
+#searchBar{display:inline-block;background-color:#fff;width:412px;border:1px solid #c9c9b5;float:right;height:42px;margin:6px 0px 0px 15px;}#searchBar .searchInput,#searchBar .searchInputCancelable{font-size:30px;height:40px;font-weight:300;background:#FFF;border:0px;color:#484848;padding-left:10px;font-family:Arial;vertical-align:middle;}
+#searchBar .searchInput{width:352px;}
 #searchBar .searchInputCancelable{width:317px;}
-#searchBar .searchInputAuth{width:340px;}
-#searchBar .searchInputCancelableAuth{width:310px;}
 #searchBar .logoutsearch{width:337px;}
 #searchBar .searchBtn{font-size:10px;color:#666;background-color:#eee;height:42px;border:#FFF 1px solid;line-height:22px;text-align:center;float:right;margin:0px;width:48px;background:-98px -36px url(../images/sprites.png) no-repeat;cursor:pointer;}
 #searchBar .searchBtn:hover{background:-146px -36px url(../images/sprites.png) no-repeat;}
 #searchBar .cancelSearchBtn{font-size:30px;color:#ce8888;background:#fff;height:42px;border:0px;border-left:#deded0 1px solid;text-align:center;width:35px;cursor:pointer;}
 #searchBar .cancelSearchBtn:hover{color:#d84040;}
+body.anon #searchBar{width:500px;}body.anon #searchBar .searchInput{width:440px;}
+body.anon #searchBar .searchInputCancelable{width:405px;}
 #askButton{background:url(../images/bigbutton.png) repeat-x bottom;line-height:44px;text-align:center;width:200px;height:42px;font-size:23px;color:#4a757f;margin-top:7px;float:right;text-transform:uppercase;border-radius:5px;-ms-border-radius:5px;-moz-border-radius:5px;-webkit-border-radius:5px;-khtml-border-radius:5px;-webkit-box-shadow:1px 1px 2px #636363;-moz-box-shadow:1px 1px 2px #636363;box-shadow:1px 1px 2px #636363;}
 #askButton:hover{text-decoration:none;background:url(../images/bigbutton.png) repeat-x top;text-shadow:0px 1px 0px #c6d9dd;-moz-text-shadow:0px 1px 0px #c6d9dd;-webkit-text-shadow:0px 1px 0px #c6d9dd;}
 #ContentLeft{width:730px;float:left;position:relative;padding-bottom:10px;}
diff --git a/askbot/skins/default/media/style/style.less b/askbot/skins/default/media/style/style.less
index 0457102b..49b1de4c 100644
--- a/askbot/skins/default/media/style/style.less
+++ b/askbot/skins/default/media/style/style.less
@@ -384,8 +384,7 @@ body.user-messages {
     height:42px;
     margin:6px 0px 0px 15px;
 
-    .searchInput, .searchInputCancelable,
-    .searchInputAuth, .searchInputCancelableAuth {
+    .searchInput, .searchInputCancelable {
         font-size: 30px;
         height: 40px;
         font-weight:300;
@@ -397,7 +396,7 @@ body.user-messages {
         vertical-align: middle;
     }
 
-    .searchInput, .searchInputCancelable {
+    .searchInput {
         width: 352px;
     }
 
@@ -405,14 +404,6 @@ body.user-messages {
         width: 317px;
     }
 
-    .searchInputAuth{
-        width: 340px; 
-    }
-
-    .searchInputCancelableAuth {
-        width: 310px; /*FIXME byron */
-    }
-
     .logoutsearch {
         width: 337px;
     }
@@ -453,6 +444,20 @@ body.user-messages {
     }
 }
 
+body.anon {
+    #searchBar {
+        width: 500px;
+        .searchInput {
+            width: 440px;
+        }
+
+        .searchInputCancelable {
+            width: 405px;
+        }
+    }
+}
+
+
 #askButton{ /* check blocks/secondary_header.html and widgets/ask_button.html*/
     background: url(../images/bigbutton.png) repeat-x bottom;
     line-height:44px;
diff --git a/askbot/skins/default/templates/base.html b/askbot/skins/default/templates/base.html
index 9e44494b..1102007b 100644
--- a/askbot/skins/default/templates/base.html
+++ b/askbot/skins/default/templates/base.html
@@ -14,7 +14,7 @@
         {% endif %}
     </head>
     {% endspaceless %}
-    <body class="{% block body_class %}{% endblock %}{% if user_messages %} user-messages{% endif %}{% if page_class %} {{page_class}}{% endif %}">
+    <body class="{% block body_class %}{% endblock %}{% if user_messages %} user-messages{% endif %}{% if page_class %} {{page_class}}{% endif %}{% if request.user.is_anonymous() %} anon{% endif %} lang-{{settings.LANGUAGE_CODE}}">
         {% include "widgets/system_messages.html" %}
         {% include "custom_header.html" ignore missing %}
         {% include "widgets/header.html" %} {# Logo, user tool navigation and meta navitation #}