merged the master branch

1 files changed, 217 insertions, 161 deletions

diff --git a/askbot/media/style/style.less b/askbot/media/style/style.less
index 0857f551..85b18ac1 100644
--- a/askbot/media/style/style.less
+++ b/askbot/media/style/style.less
@@ -38,6 +38,9 @@ input, select {
     font-family: Trebuchet MS, "segoe ui", Helvetica, Tahoma, Verdana, MingLiu, PMingLiu, Arial, sans-serif;
     margin-left:0px;
 }
+select {
+    width: 100%;
+}
 
 input[type="text"].prompt,
 input[type="password"].prompt,
@@ -215,7 +218,7 @@ body.user-messages {
 
 .wait-icon-box {
     text-align: center;
-    margin-bottom: 8px;
+    margin: 5px 0 8px;
 }
 
 #closeNotify {
@@ -507,9 +510,7 @@ body.user-messages {
         width: 100%;
         margin: 8px 0 6px 0;
         padding: 0;
-        -webkit-box-shadow: none;
-        -moz-box-shadow: none;
-        box-shadow: none;
+        .box-shadow(0, 0, 0);
     }
 
     div.input-tool-tip {
@@ -538,6 +539,7 @@ body.user-messages {
         padding: 0 0 10px 0;
         margin: 0;
         position: relative;
+        width: 100%;
         li {
             padding: 5px 10px;
             position: relative;
@@ -559,13 +561,13 @@ body.user-messages {
 
     .footer {
         text-align: center;
-        padding-bottom: 10px;
+        padding: 9px 0 10px 0;
     }
 }
 
 .search-drop-menu.empty {
     ul {
-        padding: 5px;
+        padding: 1px;
         margin: 0;
     }
 }
@@ -586,13 +588,28 @@ input[type="submit"].searchBtn {
     line-height: 22px;
     text-align: center;
     float:right;
-    margin: 7px 28px 0 0;
+    margin: -39px -48px 0 0;
     width: 48px;
-    .sprites(-98px,-36px);
+    .sprites(-98px,-37px);
+    .rounded-corners(0);
+    .box-shadow(0, 0, 0);
     cursor:pointer;
     position: relative;
     z-index: 10001;
 }
+
+.groups-page, /* todo: clean up - should not need this */
+.tags-page,
+.badges-pages,
+.user-profile-page,
+.meta,
+.openid-signin,
+.users-page {
+    input[type="submit"].searchBtn {
+        margin-top: 1px;
+    }
+}
+
 .ask-page {
     input[type="submit"].searchBtn {
         display: none;
@@ -611,23 +628,30 @@ input[type="submit"].searchBtn {
     }
 }
 
-.searchBtn:hover {
-    .sprites(-98px-48,-36px);
+input[type="submit"].searchBtn:hover {
+    background-image: none;
+    background-image: none;
+    background-image: none;
+    background-image: none;
+    background-image: none;
+    background-image: none;
+    .sprites(-98px-48,-37px);
 }
 
-.cancelSearchBtn {
-    font-size: 30px;
-    color: #ce8888;
-    background:#fff;
-    height: 41px;
-    line-height: 42px;
-    border:0px;
-    border-left:#deded0 1px solid;
+input[type="button"].cancelSearchBtn {
+    font-size: 30px !important;
+    color: #aaa;
+    background: #fff !important;
+    height: 37px !important;
+    line-height: 37px;
+    border: 0px;
+    .box-shadow(0, 0, 0);
+    .rounded-corners(0);
     text-align: center;
-    width: 35px;
+    width: 35px !important;
     cursor:pointer;
     float: right;
-    margin-top: 7px;
+    margin: -40px 0 0 0;
     position: relative;
     z-index: 10001;
 }
@@ -636,17 +660,63 @@ input[type="submit"].searchBtn {
     color: #d84040;
 }
 
-#askButton{ /* check blocks/secondary_header.html and widgets/ask_button.html*/
-    line-height:44px;
-    margin-top:6px;
-    float:right;
-    text-transform:uppercase;
-    .button-style(42px, 20px);
-    width: 200px;/* to match width of sidebar */
+button,
+input[type="submit"],
+input[type="button"],
+input[type="reset"],
+.button {
+    cursor: pointer;
+    color: @button-label;
+    height: 27px;
+    font-family: @main-font;
+    font-size: 14px;
+    font-weight: bold;
+    text-align: center;
+    text-decoration: none;
+    .text-shadow(0px,1px,0px,#c6d9dd);
+    border: 0 !important;
+    border-top: #eaf2f3 1px solid;
+    .linear-gradient(#d1e2e5,#a9c2c7);
+    .rounded-corners(4px);
+    .box-shadow(1px, 1px, 2px, #636363)
+}
+button.large,
+input[type="submit"].large,
+input[type="button"].large,
+input[type="reset"].large,
+.button.large {
+    font-size: 20px;
+    height: 35px;
+    line-height: 35px;
+    padding: 0 10px;
 }
 
-#askButton:hover{
-    .button-style-hover;
+button:hover, 
+input[type="submit"]:hover,
+.button:hover {
+    .linear-gradient(#cde5e9,#94b3ba);
+    text-decoration:none;
+    .text-shadow(0px, 1px, 0px, #c6d9dd);
+}
+
+input[type="submit"].link {
+    .box-shadow(0, 0, 0);
+    .text-shadow(0, 0, 0);
+    font-weight: normal;
+}
+
+input[type="submit"].link:hover {
+    text-decoration: underline;
+}
+
+#askButton { /* check blocks/secondary_header.html and widgets/ask_button.html*/
+    float:right;
+    font-size: 20px;
+    height: 42px;
+    line-height: 44px;
+    margin-top: 6px;
+    text-transform: uppercase;
+    width: 200px;/* to match width of sidebar */
 }
 
 /* 
@@ -669,16 +739,50 @@ input[type="submit"].searchBtn {
 body.anon.ask-page .search-drop-menu {
     margin: 0;
 }
-body.anon {
+#scopeNav {
+    height: 41px;
+    float: left;
+    width: 280px;
+}
+.scopes-True-True-False {
     #searchBar,
     .search-drop-menu {
-        margin-left: 227px;/* we don't have the "followed" scope */
+        margin-left: 228px;
+    }
+    #scopeNav {
+        width: 180px;
     }
 }
-#searchBar.cancelable {
-    padding-right: 82px;
+.scopes-True-False-True {
+    #searchBar,
+    .search-drop-menu {
+        margin-left: 203px;
+    }
+    #scopeNav {
+        width: 150px;
+    }
+}
+.scopes-False-True-True {
+    #searchBar,
+    .search-drop-menu {
+        margin-left: 286px;
+    }
+    #scopeNav {
+        width: 238px;
+    }
+}
+.scopes-True-False-False,
+.scopes-False-True-False,
+.scopes-False-False-True,
+.scopes-False-False-False {
+    #searchBar,
+    .search-drop-menu {
+        margin-left: 52px;
+    }
+    #scopeNav {
+        width: 0;
+    }
 }
-
 
 /* ----- Content layout, check two_column_body.html or one_column_body.html ----- */
 
@@ -704,8 +808,9 @@ body.anon {
 
 .box {
     background: #fff;
-    padding: 4px 0px 10px 0px;
+    padding: 4px 0px 10px 1px;
     width:200px;
+    overflow: hidden;
 
     p {
         margin-bottom: 4px;
@@ -806,16 +911,8 @@ body.anon {
         #subscribedTagAdd,
         #ab-tag-search-add {
             border:0;
-            font-weight:bold;
             margin-top:-2px;
-            .button-style(27px, 14px);
-            .rounded-corners(4px);
         }
-       #interestingTagAdd:hover,
-       #ignoredTagAdd:hover,
-       #ab-tag-search-add:hover {
-            .button-style-hover;
-       }
        #ab-tag-search-add {
             width: 47px;
        }
@@ -828,21 +925,17 @@ body.anon {
 /* widgets for question template */
 
     a.followed, a.follow{
+        height: 34px;
+        font-size: 21px;
         line-height:34px;
         border:0;
         font-weight:normal;
         margin-top:3px;
         display:block;
-        .button-style(34px,21px);
         .center;
         width: 130px;
     }
 
-    a.followed:hover, a.follow:hover{
-        .button-style-hover;
-        .text-shadow(0px, 1px, 0px, #c6d9dd);
-    }
-
     a.followed div.unfollow{
         display:none;
     }
@@ -1340,7 +1433,7 @@ ul.tags.marked-tags,
 ul#related-tags {
     list-style: none;
     margin: 0;
-    padding: 0;
+    padding: 0 0 0 1px;
     line-height: 170%;
     display: block;
 }
@@ -1363,9 +1456,7 @@ ul.tags.marked-tags li,
 }
 
 #tagSelector div.inputs {
-    clear: both;
-    float: none;
-    margin-bottom:10px;
+    margin: 6px 0 12px 0;
 }
 
 .tags-page ul.tags li,
@@ -1666,10 +1757,7 @@ ul#related-tags li {
 .add-groups,
 .add-users {
     border:0;
-    font-weight:bold;
     margin-top:-2px;
-    .button-style(27px, 14px);
-    .rounded-corners(4px);
 }
 
 .share-input-col {
@@ -1685,10 +1773,6 @@ ul#related-tags li {
     height: 25px;
 }
 
-.add-groups:hover {
-    .button-style-hover;
-}
-
 #id_user,
 #id_user_author {
     border:#cce6ec 3px solid;
@@ -1710,10 +1794,7 @@ ul#related-tags li {
 .add-groups,
 .add-users {
     border:0;
-    font-weight:bold;
     margin-top:-2px;
-    .button-style(27px, 14px);
-    .rounded-corners(4px);
 }
 
 .add-everyone-group {
@@ -1723,10 +1804,6 @@ ul#related-tags li {
     padding: 0 10px;
 }
 
-.add-groups:hover {
-    .button-style-hover;
-}
-
 #id_user,
 #id_user_author {
     border:#cce6ec 3px solid;
@@ -1755,18 +1832,12 @@ ul#related-tags li {
 .edit-question-page input.submit {
     float: left;
     font-weight:normal;
+    height: 35px;
+    font-size: 20px;
     margin-top:3px;
-    .button-style(34px,21px);
     margin-right:7px;
 }
 
-#fmanswer input.submit:hover,
-.ask-page input.submit:hover,
-.edit-question-page input.submit:hover{
-    .button-style-hover;
-    .text-shadow(0px, 1px, 0px, #c6d9dd)
-}
-
 .wmd-container {
     border:#cce6ec 3px solid;
     textarea {
@@ -1774,7 +1845,7 @@ ul#related-tags li {
     }
 }
 .users-page .wmd-container {
-    width: 200px;
+    width: auto;
 }
 .ask-page,
 .question-page,
@@ -1813,7 +1884,7 @@ ul#related-tags li {
 }
 
 .users-page #editor {
-    width: 192px;
+    width: 187px;
 }
 
 #id_title {
@@ -2278,22 +2349,25 @@ ul#related-tags li {
         clear: both;
         
         div.controls {
-              clear: both;
+            clear: both;
             float:left;
             width: 100%;
             margin: 3px 0 20px 5px;
         }
         
         .controls a {
-             color: #988e4c;
-            padding: 0 3px 2px 22px;
-            font-family:@body-font;
-            font-size:13px;
-            background:url(../images/comment.png) no-repeat center left;
+            border: none;
+            color: #988e4c;
+            padding: 0 3px 5px 22px;
+            font-family: @body-font;
+            font-size: 13px;
+            font-weight: normal;
+            background: url(../images/comment.png) no-repeat center left;
+            .box-shadow(0, 0, 0);
+            .text-shadow(0, 0, 0);
         }
 
         .controls a:hover {
-            background-color: #f5f0c9;
             text-decoration: none;
         }
 
@@ -2310,28 +2384,24 @@ ul#related-tags li {
         }
         
         form.post-comments {
-            margin: 3px 26px 0 42px;
-            textarea{
-                font-size: 13px;
-                line-height: 1.3;
-
-            }
+            padding: 6px 6px 7px 42px;
+            border-bottom: 1px solid #edeeeb;
+            margin-bottom: 0;
         }
 
         textarea {
-            height: 42px;
-            width:100%;
-            margin: 7px 0 5px 1px;
+            box-sizing: border-box;
+            border: #cce6ec 3px solid;
             font-family: @body-font;
+            font-size: 13px;
+            height: 54px;
+            line-height: 1.3;
+            margin: -1px 0 7px 1px;
             outline: none;
             overflow:auto;
-            font-size: 12px;
-            line-height: 140%;
-            padding-left:2px;
-            padding-top:3px;
-            border:#cce6ec 3px solid;
+            padding: 0px 19px 2px 3px;
+            width:100%;
         }
-        
         input {
             margin-left: 10px;
             margin-top: 1px;
@@ -2347,15 +2417,11 @@ ul#related-tags li {
             vertical-align: top;
         }
 
-        button{
-            line-height:25px;
-            margin: 0 10px 5px -2px;
-            .button-style(27px, 12px);
-            font-family:@body-font;
-            font-weight:bold;
-        }
-        button:hover{
-            .button-style-hover;
+        button.submit {
+            height: 26px;
+            line-height: 26px;
+            padding: 0 8px;
+            margin-right: 6px;
         }
         .counter {
             display: inline-block;
@@ -2368,12 +2434,12 @@ ul#related-tags li {
         }
         .comment {
             border-bottom: 1px solid #edeeeb;
-            clear:both;
+            clear: both;
             margin: 0;
-            padding-bottom:4px;
+            padding-bottom: 4px;
             overflow: auto;
-            font-family:@body-font;
-            font-size:11px;
+            font-family: @body-font;
+            font-size: 11px;
             min-height: 25px;
         }
         div.comment:hover {
@@ -2421,29 +2487,32 @@ ul#related-tags li {
                 padding-left:6px;
             }
 
-            .convert-comment{
-              display: inline;
-              white-space: nowrap;
-              padding-left: 0px;
-            }
+            .convert-comment {
+                display: inline;
+                white-space: nowrap;
+                padding-left: 0px;
+                input {
+                    background: none;
+                    padding: 0px;
+                    color: #1B79BD;
+                    border:none;
+                    height: 13px;
+                    width:auto;
+                    font-family: Arial;
+                    font-size: 13px;
+                    font-weight: normal;
+                    line-height: 13px;
+                    margin: 0 0 0 8px;
+                    .box-shadow(0, 0, 0);
+                    .text-shadow(0, 0, 0);
+                }
 
-            .convert-comment input{
-              background: none;
-              padding: 0px;
-              color: #1B79BD;
-              border:none;
-              width:auto;
-              font-family: Arial;
-              line-height: 14px;
-              margin-left: 6px;
-              font-size: 13px;
-              box-shadow: none;
+                input:hover {
+                    text-decoration: underline;
+                    cursor: pointer;
+                }
             }
 
-            .convert-comment input:hover{
-              text-decoration:underline;
-              cursor:pointer;
-            }
         }
 
         .comment-body p{
@@ -2727,11 +2796,6 @@ ul#related-tags li {
     input.submit{
         font-weight:normal;
         margin:5px 0px;
-        .button-style(26px,15px);
-        font-family:@body-font;
-    }
-    input.submit:hover{
-        .button-style-hover;
     }
     .cancel{
         background:url(../images/small-button-cancel.png) repeat-x top !important;
@@ -2746,6 +2810,18 @@ ul#related-tags li {
     }
 }
 
+.user-profile-page.inbox-group-join-requests {
+    form {
+        margin-bottom: 0;
+    }
+    table {
+        margin-bottom: 13px;
+    }
+    td {
+        padding-right: 10px;
+    }
+}
+
 .inbox-flags.user-profile-page {
     .re {
         width: 810px;
@@ -2778,17 +2854,6 @@ ul#related-tags li {
         border:#cce6ec 3px solid;
         width:200px;
     }
-    .submit-b{
-        .button-style(24px,15px);
-        font-family:@body-font;
-        font-weight:bold;
-        padding-right:10px;
-        border:0;
-    }
-
-    .submit-b:hover{
-        .button-style-hover;
-    }
 }
 
 
@@ -2920,12 +2985,6 @@ a:hover.medal {
     .inputs {
         margin-top: 10px; 
         margin-bottom: 10px; 
-        input[type='submit']{
-          .button-style(26px,15px);
-        }
-    }
-    input[type='submit'].select-language {
-        .button-style(26px,15px);
     }
     select {
         margin-bottom: 12px;
@@ -2949,16 +3008,17 @@ a:hover.medal {
     p{font-size:13px;}
 }
 
+.follow-toggle {
+    height: auto;
+}
+
 .follow-toggle,.submit {
-    border:0 !important;
     font-weight:bold;
     line-height:26px;
     margin-top:-2px;
-    .button-style(26px,14px);
 }
 
 .follow-toggle:hover, .submit:hover {
-    .button-style-hover;
     text-decoration:none !important;
 }
 
@@ -4352,10 +4412,6 @@ textarea.tipped-input {
     border-spacing: 10px; 
     border-collapse: separate;
 
-    button {
-        .button-style(27px, 14px);
-    }
-
     form {
         display: inline-block;
         margin-bottom: 0;