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

Minor CSS fixes for Select2

This commit is contained in:
Robin Ward 2014-05-28 12:12:31 -04:00
parent f8a05195a1
commit 0542761de4
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/templates/user/preferences.js.handlebars
View File

@ -145,7 +145,7 @@
<label class="control-label">{{i18n user.email_settings}}</label>
{{preference-checkbox labelKey="user.email_digests.title" checked=email_digests}}
{{#if email_digests}}
<div class='controls control-dropdown'>
<div class='controls controls-dropdown'>
{{combobox valueAttribute="value" content=digestFrequencies value=digest_after_days}}
</div>
{{/if}}

2
app/assets/stylesheets/common/base/combobox.scss
View File

@ -1,4 +1,4 @@
.category-combobox {
.category-combobox, .select2-drop {
.badge-category {
display: inline-block;
}

3
app/assets/stylesheets/desktop/discourse.scss
View File

@ -321,6 +321,9 @@ body {
background-color: transparent;
}
}
.controls-dropdown {
margin-bottom: 10px;
}
.control-group {
margin-bottom: 9px;
&.warning {