Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Styling on screened ip addresses page

This commit is contained in:
Neil Lalonde 2013-10-23 12:55:06 -04:00
parent 3db7529ad4
commit 237312dbde
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/assets/javascripts/admin/templates/logs/screened_ip_addresses_list_item.js.handlebars
View File

@ -18,15 +18,15 @@
<div class="col created_at">{{unboundAgeWithTooltip created_at}}</div> <div class="col created_at">{{unboundAgeWithTooltip created_at}}</div>
<div class="col actions"> <div class="col actions">
{{#unless editing}} {{#unless editing}}
<button {{action destroy this}}><i class="icon icon-trash"></i> {{i18n admin.logs.delete}}</button> <button class="btn btn-danger" {{action destroy this}}><i class="icon icon-trash"></i> {{i18n admin.logs.delete}}</button>
<button {{action edit this}}><i class="icon icon-pencil"></i> {{i18n admin.logs.edit}}</button> <button class="btn" {{action edit this}}><i class="icon icon-pencil"></i> {{i18n admin.logs.edit}}</button>
{{#if isBlocked}} {{#if isBlocked}}
<button {{action allow this}}><i {{bindAttr class=":icon doNothingIcon"}}></i> {{i18n admin.logs.screened_ips.actions.do_nothing}}</button> <button class="btn" {{action allow this}}><i {{bindAttr class=":icon doNothingIcon"}}></i> {{i18n admin.logs.screened_ips.actions.do_nothing}}</button>
{{else}} {{else}}
<button {{action block this}}><i {{bindAttr class=":icon blockIcon"}}></i> {{i18n admin.logs.screened_ips.actions.block}}</button> <button class="btn" {{action block this}}><i {{bindAttr class=":icon blockIcon"}}></i> {{i18n admin.logs.screened_ips.actions.block}}</button>
{{/if}} {{/if}}
{{else}} {{else}}
<button {{action save this}}>{{i18n admin.logs.save}}</button> <button class="btn" {{action save this}}>{{i18n admin.logs.save}}</button>
<a {{action cancel this}}>{{i18n cancel}}</a> <a {{action cancel this}}>{{i18n cancel}}</a>
{{/unless}} {{/unless}}
</div> </div>

9
app/assets/stylesheets/common/admin/admin_base.scss
View File

@ -733,6 +733,12 @@ table.api-keys {
input.ember-text-field { input.ember-text-field {
padding: 1px 4px; padding: 1px 4px;
} }
.btn {
padding: 2px 8px;
.icon {
margin-right: 2px;
}
}
} }
.screened-emails, .screened-urls, .screened-ip-addresses { .screened-emails, .screened-urls, .screened-ip-addresses {
@ -760,8 +766,9 @@ table.api-keys {
width: 130px; width: 130px;
} }
} }
.actions { .col.actions {
width: 275px; width: 275px;
padding-top: 4px;
a { a {
text-decoration: underline; text-decoration: underline;
} }