paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-03 05:23:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

settings: Change .btn => .button components.

Browse Source 
This changes all of the old bootstrap .btn buttons in the settings UI
to the new .button classes that they should be.
This commit is contained in:
Brock Whittaker
2017-07-17 16:39:05 -07:00
committed by Tim Abbott
parent 8cabce9f5e
commit 0d3ea50379
5 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
frontend_tests/node_tests/templates.js
View File

@@ -105,7 +105,7 @@ function render(template_name, args) {
html += render("admin-realm-domains-list", args);
html += "</table>";
var button = $(html).find('.btn');
var button = $(html).find('.button');
var domain = $(html).find('.domain');
var row = button.closest('tr');
var subdomains_checkbox = row.find('.allow-subdomains');

11
static/templates/settings/account-settings.handlebars
View File

@@ -31,8 +31,8 @@
</div>
</div>
<div class="modal-footer">
<button id='change_email_button' class="btn btn-success" data-dismiss="modal">{{t "Change" }}</button>
<button class="btn btn-primary" data-dismiss="modal">{{t "Close" }}</button>
<button id='change_email_button' class="button rounded sea-green" data-dismiss="modal">{{t "Change" }}</button>
<button class="button white rounded" data-dismiss="modal">{{t "Close" }}</button>
</div>
</div>
</form>
@@ -136,8 +136,7 @@
</div>
<div class="modal-footer">
<button class="button" data-dismiss="modal">{{t "Cancel" }}</button>
<button class="button btn-danger" id="do_deactivate_self_button">{{t "Deactivate now" }}</button>
<button class="button btn-danger rounded" id="do_deactivate_self_button">{{t "Deactivate now" }}</button>
</div>
</div>
@@ -175,10 +174,10 @@
<div id="show_api_key_box">
<p>{{t "Your API key:" }}</p>
<p><b><span id="api_key_value"></span></b></p>
<button type="submit" class="btn btn-primary regenerate_api_key">
<button type="submit" class="button white rounded regenerate_api_key">
{{t "Generate new API key" }}
</button>
<a id="download_zuliprc" download="{{zuliprc}}" class="btn btn-success">
<a id="download_zuliprc" download="{{zuliprc}}" class="button sea-green">
{{t "Download .zuliprc" }}
</a>
<div id="user_api_key_error text-error">

2
static/templates/settings/admin-realm-domains-list.handlebars
View File

@@ -2,6 +2,6 @@
<tr>
<td class="domain">{{domain}}</td>
<td><input type="checkbox" class="allow-subdomains" {{#if allow_subdomains}}checked{{/if}}></input></td>
<td><button class="btn btn-danger btn-sm delete_realm_domain">{{t "Remove" }}</button></td>
<td><button class="button btn-danger small rounded delete_realm_domain">{{t "Remove" }}</button></td>
</tr>
{{/with}}

2
static/templates/settings/emoji-settings-admin.handlebars
View File

@@ -28,7 +28,7 @@
<p id="emoji-file-name"></p>
<input type="file" name="emoji_file_input" class="notvisible"
id="emoji_file_input" value="{{t 'Upload emoji' }}"/>
<button class="btn btn-default display-none" id="emoji_image_clear_button">{{t "Clear emoji image" }}</button>
<button class="button white rounded display-none" id="emoji_image_clear_button">{{t "Clear emoji image" }}</button>
<button class="button" id="emoji_upload_button">{{t "Upload emoji" }}</button>
<p id="emoji_file_input_error" class="text-error"></p>
</div>

2
static/templates/settings/realm-domains-modal.handlebars
View File

@@ -16,7 +16,7 @@
<tr id="add-realm-domain-widget">
<td><input type="text" class="new-realm-domain" placeholder="acme.com"></input></td>
<td><input type="checkbox" class="new-realm-domain-allow-subdomains"></input></td>
<td><button type="button" class="btn btn-primary" id="submit-add-realm-domain">{{t "Add" }}</button></td>
<td><button type="button" class="button sea-green small rounded" id="submit-add-realm-domain">{{t "Add" }}</button></td>
</tr>
</tfoot>
</table>