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

REFACTOR: Project's convention is to use dash for classes.

This commit is contained in:
Guo Xiang Tan 2016-11-29 15:20:46 +08:00
parent 8a18c5be1f
commit 943e605add
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/assets/javascripts/admin/templates/group.hbs
View File

@ -101,8 +101,8 @@
{{/unless}} {{/unless}}
{{#unless model.automatic}} {{#unless model.automatic}}
<div class="flair_inputs"> <div class="flair-inputs">
<div class="flair_left"> <div class="flair-left">
<div> <div>
<label for="flair_url">{{i18n 'admin.groups.flair_url'}}</label> <label for="flair_url">{{i18n 'admin.groups.flair_url'}}</label>
{{text-field name="flair_url" value=model.flair_url placeholderKey="admin.groups.flair_url_placeholder"}} {{text-field name="flair_url" value=model.flair_url placeholderKey="admin.groups.flair_url_placeholder"}}
@ -110,13 +110,13 @@
<div> <div>
<label for="flair_bg_color">{{i18n 'admin.groups.flair_bg_color'}}</label> <label for="flair_bg_color">{{i18n 'admin.groups.flair_bg_color'}}</label>
{{text-field name="flair_bg_color" class="flair_bg_color" value=model.flair_bg_color placeholderKey="admin.groups.flair_bg_color_placeholder"}} {{text-field name="flair_bg_color" class="flair-bg-color" value=model.flair_bg_color placeholderKey="admin.groups.flair_bg_color_placeholder"}}
</div> </div>
{{#if flairPreviewIcon}} {{#if flairPreviewIcon}}
<div> <div>
<label for="flair_color">{{i18n 'admin.groups.flair_color'}}</label> <label for="flair_color">{{i18n 'admin.groups.flair_color'}}</label>
{{text-field name="flair_color" class="flair_color" value=model.flair_color placeholderKey="admin.groups.flair_color_placeholder"}} {{text-field name="flair_color" class="flair-color" value=model.flair_color placeholderKey="admin.groups.flair_color_placeholder"}}
</div> </div>
{{/if}} {{/if}}
@ -127,7 +127,7 @@
</div> </div>
{{#if flairPreviewIcon}} {{#if flairPreviewIcon}}
<div class="flair_right"> <div class="flair-right">
<div> <div>
<label>{{i18n 'admin.groups.flair_preview'}} Icon</label> <label>{{i18n 'admin.groups.flair_preview'}} Icon</label>
<div class="avatar-flair-preview"> <div class="avatar-flair-preview">

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

@ -705,11 +705,11 @@ section.details {
} }
} }
.form-horizontal { .form-horizontal {
.flair_inputs { .flair-inputs {
margin-top: 30px; margin-top: 30px;
margin-bottom: 30px; margin-bottom: 30px;
.flair_left { .flair-left {
float: left; float: left;
width: 60%; width: 60%;
input[name=flair_url] { input[name=flair_url] {
@ -717,7 +717,7 @@ section.details {
} }
} }
.flair_right { .flair-right {
float: left; float: left;
margin-left: 30px; margin-left: 30px;
} }
@ -725,7 +725,7 @@ section.details {
} }
} }
.row.groups { .row.groups {
input[type='text'].flair_bg_color, input[type='text'].flair_color { input[type='text'].flair-bg-color, input[type='text'].flair-color {
width: 200px; width: 200px;
} }
} }