github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-23 09:17:08 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #2208 from riking/notext

Browse Source 
Add no-text class to buttons with no text
This commit is contained in:
Régis Hanol 2014-03-30 18:12:35 +02:00
commit 956b14a4ab
4 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/assets/javascripts/admin/templates/user_index.js.handlebars
View File

@ -58,8 +58,8 @@
<div class='controls'> <div class='controls'>
{{#if primaryGroupDirty}} {{#if primaryGroupDirty}}
<div> <div>
<button class='btn ok' {{action savePrimaryGroup}}><i class='fa fa-check'></i></button> <button class='btn ok no-text' {{action savePrimaryGroup}}><i class='fa fa-check'></i></button>
<button class='btn cancel' {{action resetPrimaryGroup}}><i class='fa fa-times'></i></button> <button class='btn cancel no-text' {{action resetPrimaryGroup}}><i class='fa fa-times'></i></button>
</div> </div>
{{/if}} {{/if}}
</div> </div>
@ -226,8 +226,8 @@
{{#if dirty}} {{#if dirty}}
<div> <div>
<button class='btn ok' {{action saveTrustLevel target="content"}}><i class='fa fa-check'></i></button> <button class='btn ok no-text' {{action saveTrustLevel target="content"}}><i class='fa fa-check'></i></button>
<button class='btn cancel' {{action restoreTrustLevel target="content"}}><i class='fa fa-times'></i></button> <button class='btn cancel no-text' {{action restoreTrustLevel target="content"}}><i class='fa fa-times'></i></button>
</div> </div>
{{/if}} {{/if}}
</div> </div>

2
app/assets/javascripts/discourse/templates/discovery/topics.js.handlebars
View File

@ -1,6 +1,6 @@
{{#if selected}} {{#if selected}}
<div id='bulk-select'> <div id='bulk-select'>
<button class='btn' {{action showBulkActions}}><i class="fa fa-wrench"></i></button> <button class='btn no-text' {{action showBulkActions}}><i class="fa fa-wrench"></i></button>
</div> </div>
{{/if}} {{/if}}

4
app/assets/javascripts/discourse/templates/topic.js.handlebars
View File

@ -22,8 +22,8 @@
{{/if}} {{/if}}
{{textField id='edit-title' value=newTitle}} {{textField id='edit-title' value=newTitle}}
<button class='btn btn-primary btn-small' {{action finishedEditingTopic}}><i class='fa fa-check'></i></button> <button class='btn btn-primary btn-small no-text' {{action finishedEditingTopic}}><i class='fa fa-check'></i></button>
<button class='btn btn-small' {{action cancelEditingTopic}}><i class='fa fa-times'></i></button> <button class='btn btn-small no-text' {{action cancelEditingTopic}}><i class='fa fa-times'></i></button>
{{else}} {{else}}
<h1> <h1>
<span class="private-message-glyph"><i class='fa fa-envelope'></i></span> <span class="private-message-glyph"><i class='fa fa-envelope'></i></span>

3
app/assets/stylesheets/desktop/topic-list.scss
View File

@ -542,9 +542,6 @@ ol.category-breadcrumb {
right: 20px; right: 20px;
padding: 5px; padding: 5px;
background-color: $primary_background_color; background-color: $primary_background_color;
button {
padding: 3px 0 3px 6px;
}
} }
button.dismiss-read { button.dismiss-read {