IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

We can add the no-text class automatically in d-button

Browse Source
This commit is contained in:
Robin Ward
2015-07-30 12:31:14 -04:00
parent 62a59ef7c0
commit 8e603503e6
10 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/admin/templates/backups_index.hbs
View File

@@ -21,10 +21,10 @@
<div class="pull-right">
<a {{bind-attr href="backup.link"}} class="btn download" title="{{i18n 'admin.backups.operations.download.title'}}">{{fa-icon "download"}}{{i18n 'admin.backups.operations.download.label'}}</a>
{{#if isOperationRunning}}
{{d-button icon="trash-o" action="destroyBackup" actionParam=backup class="btn-danger no-text" disabled="true" title="admin.backups.operations.is_running"}}
{{d-button icon="trash-o" action="destroyBackup" actionParam=backup class="btn-danger" disabled="true" title="admin.backups.operations.is_running"}}
{{d-button icon="play" action="startRestore" actionParam=backup disabled=restoreDisabled title=restoreTitle label="admin.backups.operations.restore.label"}}
{{else}}
{{d-button icon="trash-o" action="destroyBackup" actionParam=backup class="btn-danger no-text" title="admin.backups.operations.destroy.title"}}
{{d-button icon="trash-o" action="destroyBackup" actionParam=backup class="btn-danger" title="admin.backups.operations.destroy.title"}}
{{d-button icon="play" action="startRestore" actionParam=backup disabled=restoreDisabled title=restoreTitle label="admin.backups.operations.restore.label"}}
{{/if}}
</div>

4
app/assets/javascripts/admin/templates/components/site-setting.hbs
View File

@@ -6,8 +6,8 @@
</div>
{{#if dirty}}
<div class='setting-controls'>
{{d-button class="ok no-text" action="save" icon="check"}}
{{d-button class="cancel no-text" action="cancel" icon="times"}}
{{d-button class="ok" action="save" icon="check"}}
{{d-button class="cancel" action="cancel" icon="times"}}
</div>
{{else if setting.overridden}}
{{d-button action="resetDefault" icon="undo" label="admin.site_settings.reset"}}

4
app/assets/javascripts/admin/templates/components/value-list.hbs
View File

@@ -5,7 +5,7 @@
{{d-button action="removeValue"
actionParam=value
icon="times"
class="btn-small no-text"}}
class="btn-small"}}
{{value}}
</div>
{{/each}}
@@ -14,5 +14,5 @@
<div class='input'>
{{text-field value=newValue placeholderKey=addKey}}
{{d-button action="addValue" icon="plus" class="btn-primary btn-small no-text" disabled=inputInvalid}}
{{d-button action="addValue" icon="plus" class="btn-primary btn-small" disabled=inputInvalid}}
</div>

4
app/assets/javascripts/admin/templates/user_index.hbs
View File

@@ -350,8 +350,8 @@
{{combo-box content=model.customGroups value=model.primary_group_id nameProperty="name" none="admin.groups.no_primary"}}
{{/if}}
{{#if primaryGroupDirty}}
{{d-button icon="check" class="ok no-text" action="savePrimaryGroup"}}
{{d-button icon="times" class="cancel no-text" action="resetPrimaryGroup"}}
{{d-button icon="check" class="ok" action="savePrimaryGroup"}}
{{d-button icon="times" class="cancel" action="resetPrimaryGroup"}}
{{/if}}
</div>
</div>