unified css of buttons

20 files changed, 202 insertions, 199 deletions

diff --git a/askbot/media/bootstrap/css/bootstrap.css b/askbot/media/bootstrap/css/bootstrap.css
index e6190005..396e05c6 100644
--- a/askbot/media/bootstrap/css/bootstrap.css
+++ b/askbot/media/bootstrap/css/bootstrap.css
@@ -935,7 +935,6 @@ input[type="file"] {
   line-height: 18px \9;
 }
 select {
-  width: 220px;
   background-color: #ffffff;
 }
 select[multiple],
@@ -968,6 +967,7 @@ textarea {
   -o-transition: border linear 0.2s, box-shadow linear 0.2s;
   transition: border linear 0.2s, box-shadow linear 0.2s;
 }
+/*
 input:focus,
 textarea:focus {
   border-color: rgba(82, 168, 236, 0.8);
@@ -975,10 +975,9 @@ textarea:focus {
   -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
   box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
   outline: 0;
-  outline: thin dotted \9;
-  /* IE6-9 */
-
+  outline: thin dotted \9; ***** for IE6-9 *
 }
+*/
 input[type="file"]:focus,
 input[type="radio"]:focus,
 input[type="checkbox"]:focus,
diff --git a/askbot/media/js/post.js b/askbot/media/js/post.js
index 94e230a2..342a3cf3 100644
--- a/askbot/media/js/post.js
+++ b/askbot/media/js/post.js
@@ -1544,9 +1544,9 @@ EditCommentForm.prototype.createDom = function(){
     div.append(this._textarea);
     this._text_counter = $('<span></span>').attr('class', 'counter');
     div.append(this._text_counter);
-    this._submit_btn = $('<button class="submit small"></button>');
+    this._submit_btn = $('<button class="submit"></button>');
     div.append(this._submit_btn);
-    this._cancel_btn = $('<button class="submit small"></button>');
+    this._cancel_btn = $('<button class="submit"></button>');
     this._cancel_btn.html(gettext('cancel'));
     div.append(this._cancel_btn);
 
diff --git a/askbot/media/style/lib_style.less b/askbot/media/style/lib_style.less
index 05ab38f5..5e454173 100644
--- a/askbot/media/style/lib_style.less
+++ b/askbot/media/style/lib_style.less
@@ -17,29 +17,6 @@
 @main-font:'Open Sans Condensed', Arial, sans-serif;
 @secondary-font:Arial;
 
-/* Buttons */
-
-.button-style(@h:20px, @f:14px){
-    height:@h;
-    font-size:@f;
-    text-align:center;
-    text-decoration:none;
-    cursor:pointer;
-    color:@button-label;
-    font-family:@main-font;
-    .text-shadow(0px,1px,0px,#c6d9dd);
-    border-top:#eaf2f3 1px solid;
-    .linear-gradient(#d1e2e5,#a9c2c7);
-    .rounded-corners(4px);
-    .box-shadow(1px, 1px, 2px, #636363)
-}
-
-.button-style-hover{
-    .linear-gradient(#cde5e9,#94b3ba);
-    text-decoration:none;
-    .text-shadow(0px, 1px, 0px, #c6d9dd);
-}
-
 /* General styles for gradients */
 
 .linear-gradient(@start:#eee,@end:#fff,@stop:25%){
diff --git a/askbot/media/style/style.less b/askbot/media/style/style.less
index 5dce292c..64bc584a 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,
@@ -208,7 +211,7 @@ body.user-messages {
 
 .wait-icon-box {
     text-align: center;
-    margin-bottom: 8px;
+    margin: 5px 0 8px;
 }
 
 #closeNotify {
@@ -500,9 +503,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 {
@@ -552,13 +553,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;
     }
 }
@@ -579,9 +580,11 @@ input[type="submit"].searchBtn {
     line-height: 22px;
     text-align: center;
     float:right;
-    margin: 7px 28px 0 0;
+    margin: 8px 28px 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;
@@ -604,8 +607,14 @@ 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 {
@@ -616,11 +625,12 @@ input[type="submit"].searchBtn {
     line-height: 42px;
     border:0px;
     border-left:#deded0 1px solid;
+    .box-shadow(0, 0, 0);
     text-align: center;
     width: 35px;
     cursor:pointer;
     float: right;
-    margin-top: 7px;
+    margin: 7px 0 0 0;
     position: relative;
     z-index: 10001;
 }
@@ -629,17 +639,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;
+}
+
+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;
 }
 
-#askButton:hover{
-    .button-style-hover;
+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 */
 }
 
 /* 
@@ -800,16 +856,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;
        }
@@ -822,21 +870,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;
     }
@@ -1334,7 +1378,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;
 }
@@ -1660,10 +1704,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 {
@@ -1679,10 +1720,6 @@ ul#related-tags li {
     height: 25px;
 }
 
-.add-groups:hover {
-    .button-style-hover;
-}
-
 #id_user,
 #id_user_author {
     border:#cce6ec 3px solid;
@@ -1704,10 +1741,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 {
@@ -1717,10 +1751,6 @@ ul#related-tags li {
     padding: 0 10px;
 }
 
-.add-groups:hover {
-    .button-style-hover;
-}
-
 #id_user,
 #id_user_author {
     border:#cce6ec 3px solid;
@@ -1749,18 +1779,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 {
@@ -1768,7 +1792,7 @@ ul#related-tags li {
     }
 }
 .users-page .wmd-container {
-    width: 200px;
+    width: auto;
 }
 .ask-page,
 .question-page,
@@ -1803,7 +1827,7 @@ ul#related-tags li {
 }
 
 .users-page #editor {
-    width: 192px;
+    width: 187px;
 }
 
 #id_title {
@@ -2264,22 +2288,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;
         }
 
@@ -2296,43 +2323,35 @@ 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;
             vertical-align: top;
             width: 100px;
         }
-        button{
-            line-height:25px;
-            margin-bottom:5px;
-            .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;
@@ -2346,16 +2365,13 @@ ul#related-tags li {
         }
         .comment {
             border-bottom: 1px solid #edeeeb;
-            clear:both;
+            clear: both;
             margin: 0;
-            margin-top:8px;
-            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;
-            background:#fff url(../images/comment-background.png) bottom repeat-x;
-            .rounded-corners(5px);
         }
         div.comment:hover {
             background-color: #efefef;
@@ -2402,29 +2418,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{
@@ -2708,11 +2727,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;
@@ -2727,6 +2741,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;
@@ -2759,17 +2785,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;
-    }
 }
 
 
@@ -2901,12 +2916,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;
@@ -2930,16 +2939,18 @@ 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;
 }
 
@@ -4332,10 +4343,6 @@ textarea.tipped-input {
     border-spacing: 10px; 
     border-collapse: separate;
 
-    button {
-        .button-style(27px, 14px);
-    }
-
     form {
         display: inline-block;
         margin-bottom: 0;
diff --git a/askbot/templates/answer_edit.html b/askbot/templates/answer_edit.html
index f80715ec..875eec5b 100644
--- a/askbot/templates/answer_edit.html
+++ b/askbot/templates/answer_edit.html
@@ -40,8 +40,18 @@
         {% endif %}
         </div>
         <div class="after-editor">
-            <input id="edit_post_form_submit_button" type="submit" value="{% trans %}Save edit{% endtrans %}" class="submit" />&nbsp;
-            <input type="button" value="{% trans %}Cancel{% endtrans %}" class="submit" onclick="history.back(-1);" />
+            <input 
+                id="edit_post_form_submit_button"
+                type="submit"
+                value="{% trans %}Save edit{% endtrans %}"
+                class="large submit"
+            />&nbsp;
+            <input 
+                type="button"
+                value="{% trans %}Cancel{% endtrans %}"
+                class="large submit"
+                onclick="history.back(-1);"
+            />
         </div>
 
     </form>
diff --git a/askbot/templates/authopenid/authopenid_macros.html b/askbot/templates/authopenid/authopenid_macros.html
index 9d35ac6f..d0dca8bf 100644
--- a/askbot/templates/authopenid/authopenid_macros.html
+++ b/askbot/templates/authopenid/authopenid_macros.html
@@ -63,7 +63,7 @@
             <h2 id="openid-heading">{% trans %}Please enter your <span>user name</span>, then sign in{% endtrans %}</h2>
             <p class="hint">{% trans %}(or select another login method above){% endtrans %}</p>
             <input type="text" name="openid_login_token" />
-            <input class="submit-b" type="submit" name="openid_login_with_extra_token" value="{% trans %}Sign in{% endtrans %}"/>
+            <input type="submit" name="openid_login_with_extra_token" value="{% trans %}Sign in{% endtrans %}"/>
         </fieldset> 
     {% endif %}
 {% endmacro %}
diff --git a/askbot/templates/authopenid/signin.html b/askbot/templates/authopenid/signin.html
index c5a5c47f..ff7d47a4 100644
--- a/askbot/templates/authopenid/signin.html
+++ b/askbot/templates/authopenid/signin.html
@@ -115,7 +115,7 @@
                     </tr>

                 </table>

                 <p id="local_login_buttons">

-                    <input class="submit-b" name="login_with_password" type="submit" value="{% trans %}Sign in{% endtrans %}" />

+                    <input name="login_with_password" type="submit" value="{% trans %}Sign in{% endtrans %}" />

                     {% if settings.USE_LDAP_FOR_PASSWORD_LOGIN == False %}

                     <a class="create-password-account" style="vertical-align:middle" href="{% url user_signup_with_password %}?login_provider=local">{% trans %}Create a password-protected account{% endtrans %}</a>

                     {% endif %}

@@ -145,7 +145,7 @@
                     </tr>

                 </table>

                 <p id="local_login_buttons">

-                    <input class="submit-b" name="change_password" type="submit" value="{% trans %}Change password{% endtrans %}" />

+                    <input name="change_password" type="submit" value="{% trans %}Change password{% endtrans %}" />

                 </p>

             {% endif %}

         </fieldset>

@@ -212,7 +212,6 @@
                 {% endif %}

                 {{ account_recovery_form.email }}

                 <input

-                    class="submit-b"

                     type="submit"

                     {% if view_subtype == 'bad_key' %}

                     value="{% trans %}Send a new recovery key{% endtrans %}"

diff --git a/askbot/templates/authopenid/widget_signin.html b/askbot/templates/authopenid/widget_signin.html
index c3dbcfde..72860120 100644
--- a/askbot/templates/authopenid/widget_signin.html
+++ b/askbot/templates/authopenid/widget_signin.html
@@ -115,7 +115,7 @@
                     </tr>

                 </table>

                 <p id="local_login_buttons">

-                    <input class="submit-b" name="login_with_password" type="submit" value="{% trans %}Sign in{% endtrans %}" />

+                    <input name="login_with_password" type="submit" value="{% trans %}Sign in{% endtrans %}" />

                     {% if settings.USE_LDAP_FOR_PASSWORD_LOGIN == False %}

                     <a class="create-password-account" style="vertical-align:middle" href="{% url user_signup_with_password %}?login_provider=local">{% trans %}Create a password-protected account{% endtrans %}</a>

                     {% endif %}

@@ -145,7 +145,7 @@
                     </tr>

                 </table>

                 <p id="local_login_buttons">

-                    <input class="submit-b" name="change_password" type="submit" value="{% trans %}Change password{% endtrans %}" />

+                    <input name="change_password" type="submit" value="{% trans %}Change password{% endtrans %}" />

                 </p>

             {% endif %}

         </fieldset>

@@ -212,7 +212,6 @@
                 {% endif %}

                 {{ account_recovery_form.email }}

                 <input

-                    class="submit-b"

                     type="submit"

                     {% if view_subtype == 'bad_key' %}

                     value="{% trans %}Send a new recovery key{% endtrans %}"

diff --git a/askbot/templates/list_suggested_tags.html b/askbot/templates/list_suggested_tags.html
index 31e48c09..660c8308 100644
--- a/askbot/templates/list_suggested_tags.html
+++ b/askbot/templates/list_suggested_tags.html
@@ -31,8 +31,8 @@
                         {% if tag.threads.count() == 0 %}
                             <tr class="thread-info" data-thread-id="0">
                                 <td class="per-thread-controls">
-                                    <button class="btn accept">{% trans %}Accept{% endtrans %}</button>
-                                    <button class="btn reject">{% trans %}Reject{% endtrans %}</button>
+                                    <button class="accept">{% trans %}Accept{% endtrans %}</button>
+                                    <button class="reject">{% trans %}Reject{% endtrans %}</button>
                                 </td>
                                 <td class="thread-links-col">
                                     <span>{% trans %}There are no questions with this tag yet{% endtrans %}</span>
@@ -42,8 +42,8 @@
                             {% for thread in tag.threads.all() %}
                                 <tr class="thread-info" data-thread-id="{{ thread.id }}">
                                     <td class="per-thread-controls">
-                                        <button class="btn accept">{% trans %}Accept{% endtrans %}</button>
-                                        <button class="btn reject">{% trans %}Reject{% endtrans %}</button>
+                                        <button class="accept">{% trans %}Accept{% endtrans %}</button>
+                                        <button class="reject">{% trans %}Reject{% endtrans %}</button>
                                     </td>
                                     <td class="thread-links-col">
                                         <a title="{{ thread._question_post().summary|escape }}"
@@ -59,8 +59,8 @@
                 <tr class="per-tag-controls" data-tag-id="{{ tag.id }}">
                     <td colspan="4">
                         {% if tag.threads.count() > 1 %}
-                            <button class="btn accept">{% trans name=tag.name %}Apply tag "{{ name }}" to all above questions{% endtrans %}</button>
-                            <button class="btn reject">{% trans %}Reject tag{% endtrans %}</button>
+                            <button class="accept">{% trans name=tag.name %}Apply tag "{{ name }}" to all above questions{% endtrans %}</button>
+                            <button class="reject">{% trans %}Reject tag{% endtrans %}</button>
                         {% endif %}
                     </td>
                 </tr>
diff --git a/askbot/templates/macros.html b/askbot/templates/macros.html
index f94fc12d..6c6b22d4 100644
--- a/askbot/templates/macros.html
+++ b/askbot/templates/macros.html
@@ -258,7 +258,7 @@ poor design of the data or methods on data objects #}
 -%}
     {% if acceptance_level in ('open', 'moderated') %}
         <button 
-            class="group-join-btn follow-toggle {% if membership_level != 'none' %}on on-state{% endif %}"
+            class="group-join-btn button follow-toggle {% if membership_level != 'none' %}on on-state{% endif %}"
             data-group-id="{{group_id}}"
             {% if acceptance_level == 'open' %}
                 data-off-prompt-text="{% trans %}Leave this group{% endtrans %}"
@@ -564,7 +564,7 @@ answer {% if answer.accepted() %}accepted-answer{% endif %} {% if answer.author_
 {%- macro follow_toggle(follow, name, alias, id) -%}
     {# follow - boolean; name - object type name; alias - e.g. users name; id - object id #}
     <div 
-        class="follow-toggle follow-user-toggle" 
+        class="button follow-toggle follow-user-toggle" 
         id="follow-{{ name|escape }}-{{ id }}"
     >
         {% if follow %}
diff --git a/askbot/templates/question.html b/askbot/templates/question.html
index 5fcea3a9..429cf38d 100644
--- a/askbot/templates/question.html
+++ b/askbot/templates/question.html
@@ -151,6 +151,14 @@
                 if (flags.length > 0) {
                     removeNode(flags[0]);
                 }
+                var closeBtn = findChildrenByClassName(controls, 'question-close');
+                if (
+                    closeBtn.length === 1 &&
+                    data['userReputation'] <
+                    {{ settings.MIN_REP_TO_CLOSE_OTHERS_QUESTIONS }}
+                ) {
+                    removeNode(closeBtn[0]);
+                }
                 if (//maybe remove "edit" button
                     data['userReputation'] <
                     {{settings.MIN_REP_TO_EDIT_OTHERS_POSTS}}
diff --git a/askbot/templates/question/answer_controls.html b/askbot/templates/question/answer_controls.html
index c7d3c4d9..21aafe47 100644
--- a/askbot/templates/question/answer_controls.html
+++ b/askbot/templates/question/answer_controls.html
@@ -67,6 +67,7 @@
             <input type="hidden" name="answer_id" id="id_answer_id" value="{{answer.id}}"/>
             <input 
                 type="submit"
+                class="link"
                 value="{% trans %}repost as a question comment{% endtrans %}"
             />
         </form>
@@ -80,6 +81,7 @@
             <input type="hidden" name="answer_id" value="{{ answer.id }}"/>
             <input 
                 type="submit"
+                class="link"
                 value="{% trans %}repost as a comment under the older answer{% endtrans %}"
             />
         </form>
diff --git a/askbot/templates/question/content.html b/askbot/templates/question/content.html
index 7efc1d54..4481fb9a 100644
--- a/askbot/templates/question/content.html
+++ b/askbot/templates/question/content.html
@@ -27,7 +27,7 @@
 {# buttons below cannot be cached yet #}
 {% if user_already_gave_answer %}
     <a
-        class="submit"
+        class="button submit"
         href="{% url "edit_answer" previous_answer.id %}"
     >{% trans %}Edit Your Previous Answer{% endtrans %}</a>
     <span>{% trans %}(only one answer per question is allowed){% endtrans %}</span>
diff --git a/askbot/templates/question/new_answer_form.html b/askbot/templates/question/new_answer_form.html
index bc51f44a..f9559c4d 100644
--- a/askbot/templates/question/new_answer_form.html
+++ b/askbot/templates/question/new_answer_form.html
@@ -10,7 +10,7 @@
     {% if request.user.is_anonymous() and settings.ALLOW_POSTING_BEFORE_LOGGING_IN == False %}
         {% if not thread.closed %}
             <a
-                    class="submit"
+                    class="button submit"
                     href="{{settings.LOGIN_URL}}?next={% url question question.id %}"
                     >{% trans %}Login/Signup to Answer{% endtrans %}</a>
         {% endif %}
diff --git a/askbot/templates/question_edit.html b/askbot/templates/question_edit.html
index 7cf1c143..1aaa972c 100644
--- a/askbot/templates/question_edit.html
+++ b/askbot/templates/question_edit.html
@@ -54,8 +54,8 @@
             </div>
             {% endif %}
         </div>
-        <input id="edit_post_form_submit_button" type="submit" value="{% trans %}Save edit{% endtrans %}" class="submit" />&nbsp;
-        <input type="button" value="{% trans %}Cancel{% endtrans %}" class="submit" onclick="history.back(-1);" />
+        <input id="edit_post_form_submit_button" type="submit" value="{% trans %}Save edit{% endtrans %}" class="large submit" />&nbsp;
+        <input type="button" value="{% trans %}Cancel{% endtrans %}" class="large submit" onclick="history.back(-1);" />
 
     </div>
 </form>
diff --git a/askbot/templates/tags/form_bulk_tag_subscription.html b/askbot/templates/tags/form_bulk_tag_subscription.html
index d588cfaf..95168e45 100644
--- a/askbot/templates/tags/form_bulk_tag_subscription.html
+++ b/askbot/templates/tags/form_bulk_tag_subscription.html
@@ -9,7 +9,7 @@
 <form action="." method="POST" accept-charset="utf-8">
 <table border="0">
 {{form.as_table()}}
-<tr><td colspan='2' style='text-align: right;'><input type="submit" class="submit" value="Save"></td></tr>
+<tr><td/><td><input type="submit" class="submit" value="Save"></td></tr>
 </table>
 </form>
 {% endblock %}
diff --git a/askbot/templates/user_inbox/group_join_requests.html b/askbot/templates/user_inbox/group_join_requests.html
index 2defe5e1..c4c4d29d 100644
--- a/askbot/templates/user_inbox/group_join_requests.html
+++ b/askbot/templates/user_inbox/group_join_requests.html
@@ -22,7 +22,6 @@
                     />
                     <input type="hidden" name="action" value="approve"/>
                     <input
-                        class="btn"
                         type="submit"
                         value="{% trans %}Approve{% endtrans %}"
                     />
@@ -38,7 +37,6 @@
                     />
                     <input type="hidden" name="action" value="deny"/>
                     <input
-                        class="btn"
                         type="submit"
                         value="{% trans %}Deny{% endtrans %}"
                     />
diff --git a/askbot/templates/widgets/ask_button.html b/askbot/templates/widgets/ask_button.html
index e202b110..f8ea82bd 100644
--- a/askbot/templates/widgets/ask_button.html
+++ b/askbot/templates/widgets/ask_button.html
@@ -4,6 +4,7 @@
     {% endif %}
     <a
         id="askButton"
+        class="button"
         href="{{ search_state.full_ask_url() }}{% if group %}{% if '?' in search_state.full_ask_url() %}&{% else %}?{% endif %}group_id={{ group.id }}{% endif %}"
         >{% if group %}{% trans %}Ask the Group{% endtrans %}{% else %}{% trans %}Ask Your Question{% endtrans %}{% endif %}</a>
 {% endif %}
diff --git a/askbot/tests/page_load_tests.py b/askbot/tests/page_load_tests.py
index c4ee8554..dca5c30f 100644
--- a/askbot/tests/page_load_tests.py
+++ b/askbot/tests/page_load_tests.py
@@ -724,7 +724,9 @@ class CommandViewTests(AskbotTestCase):
 
     def test_load_object_description_fails(self):
         response = self.client.get(reverse('load_object_description'))
-        self.assertEqual(response.status_code, 404)#bad request
+        soup = BeautifulSoup(response.content)
+        title = soup.find_all('h1')[0].contents[0]
+        self.assertEqual(title, 'Page not found')
 
     def test_set_tag_filter_strategy(self):
         user = self.create_user('someuser')
diff --git a/askbot/views/users.py b/askbot/views/users.py
index 0305eb48..a1304dfb 100644
--- a/askbot/views/users.py
+++ b/askbot/views/users.py
@@ -726,6 +726,7 @@ def show_group_join_requests(request, user, context):
                     ).order_by('-active_at')
     data = {
         'active_tab':'users',
+        'inbox_section': 'group-join-requests',
         'page_class': 'user-profile-page',
         'tab_name' : 'join_requests',
         'tab_description' : _('group joining requests'),