Actually switch to Bootstrap3-esque buttons.

(imported from commit ddcecb8c5a63324a666ffe170e2d5a76171776c9)
Shadhopson · Mar 5, 2014 · 095c82e · 095c82e
1 parent 82dfc7b
commit 095c82e
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 11 deletions.
diff --git a/static/templates/admin_tab.handlebars b/static/templates/admin_tab.handlebars
@@ -11,7 +11,12 @@
           <div class="controls">
             <input type="text" name="realm_name" class="admin-realm-name"
                    value="{{ realm_name }}" />
-            <input type="submit" class="btn" value="Save" />
+          </div>
+        </div>
+
+        <div class="control-group">
+          <div class="controls">
+            <input type="submit" class="btn btn-default" value="Save" />
           </div>
         </div>
       </form>

diff --git a/static/templates/alert_word_settings_item.handlebars b/static/templates/alert_word_settings_item.handlebars
@@ -1,8 +1,8 @@
 {{! Alert word in the settings page that can be removed }}
 <li class="alert-word-item" data-word='{{word}}'>
 	{{#if editing}}
-		<input class="edit-alert-word input-medium" type="text" placeholder="Alert Word" /><button class="btn btn-mini add-alert-word" type="button">Add</button>
+		<input class="edit-alert-word input-medium" type="text" placeholder="Alert Word" /><button class="btn btn-default btn-mini add-alert-word" type="button">Add</button>
 	{{else}}
-		{{word}}<button class="btn btn-mini remove-alert-word" type="button"><i class="icon-vector-remove"></i></button>
+		{{word}}<button class="btn btn-default btn-mini remove-alert-word" type="button"><i class="icon-vector-remove"></i></button>
 	{{/if}}
 </li>
diff --git a/static/templates/settings_tab.handlebars b/static/templates/settings_tab.handlebars
@@ -21,7 +21,7 @@
         <div class="control-group" id="pw_change_link">
           <label for="change_password_button" class="control-label">Password</label>
           <div class="controls">
-            <button class="btn change_password_button" data-dismiss="modal" aria-hidden="true">Change Password</button>
+            <button class="btn btn-default change_password_button" data-dismiss="modal" aria-hidden="true">Change Password</button>
           </div>
         </div>
 
@@ -78,7 +78,7 @@
           <div id="user_avatar_file"></div>
           <input type="file" name="user_avatar_file_input" class="notvisible" id="user_avatar_file_input" value="Upload avatar" />
           <div id="upload_avatar_spinner"></div>
-          <button class="btn" id="user_avatar_upload_button">Customize avatar</button>
+          <button class="btn btn-default" id="user_avatar_upload_button">Customize avatar</button>
         </div>
 
       </form>
@@ -249,8 +249,8 @@
             <div class="controls">
               <div id="bot_avatar_file"></div>
               <input type="file" name="bot_avatar_file_input" class="notvisible" id="bot_avatar_file_input" value="Upload avatar" />
-              <button class="btn" id="bot_avatar_clear_button">Clear avatar</button>
-              <button class="btn" id="bot_avatar_upload_button">Customize avatar</button> (Optional)
+              <button class="btn btn-default" id="bot_avatar_clear_button">Clear avatar</button>
+              <button class="btn btn-default" id="bot_avatar_upload_button">Customize avatar</button> (Optional)
             </div>
           </div>
           <p>
@@ -274,7 +274,7 @@
         messages, you should use your personal API key.
       </p>
       <div class="control-group">
-        <button class="btn" id="api_key_button">Show/change your API key</button>
+        <button class="btn btn-default" id="api_key_button">Show/change your API key</button>
       </div>
     </div>
     <div id="get_api_key_box">

diff --git a/templates/zerver/compose.html b/templates/zerver/compose.html
@@ -5,14 +5,14 @@
     <div id="compose_controls" class="compose-content">
           <div id="compose_buttons">
             <span class="new_message_button">
-              <button type="button" class="btn btn-large compose_stream_button"
+              <button type="button" class="btn btn-default btn-large compose_stream_button"
                       id="left_bar_compose_stream_button_big" title="New stream message (c)">
                 <i class="icon-vector-bullhorn"></i><span class="compose_stream_button_label">&nbsp;&nbsp;New stream message</span>
               </button>
             </span>
             {% if not embedded %}
             <span class="new_message_button">
-              <button type="button" class="btn btn-large compose_private_button"
+              <button type="button" class="btn btn-default btn-large compose_private_button"
                       id="left_bar_compose_private_button_big" title="New private message (C)">
                 <i class="icon-vector-user"></i><span class="compose_private_button_label">&nbsp;&nbsp;New private message</span>
               </button>

diff --git a/templates/zerver/right-sidebar.html b/templates/zerver/right-sidebar.html
@@ -23,7 +23,7 @@
               <div class="alert alert_sidebar alert-error home-error-bar" id="reloading-application"></div>
               {% if enable_feedback %}
               <div id="feedback_section">
-                <button type="button" class="btn btn-large" id="feedback_button">
+                <button type="button" class="btn btn-default btn-large" id="feedback_button">
                   <i class="icon-vector-comment"></i>&nbsp;&nbsp;Send feedback
                 </button>
               </div>

diff --git a/zproject/settings.py b/zproject/settings.py
@@ -446,6 +446,7 @@
     'common': {
         'source_filenames': (
             'third/bootstrap/css/bootstrap.css',
+            'third/bootstrap/css/bootstrap-btn.css',
             'third/bootstrap/css/bootstrap-responsive.css',
         ),
         'output_filename': 'min/common.css'