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

minor fixes to select-box

This commit is contained in:
Joffrey JAFFEUX 2017-09-09 00:49:33 +02:00 committed by GitHub
parent 8825581d98
commit 5b9819f4ed
4 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/assets/javascripts/discourse/components/category-notification-options.js.es6
View File

@ -1,5 +1,6 @@
import NotificationOptionsComponent from "discourse/components/notification-options"; import NotificationOptionsComponent from "discourse/components/notification-options";
import { observes } from "ember-addons/ember-computed-decorators"; import { observes } from "ember-addons/ember-computed-decorators";
import computed from "ember-addons/ember-computed-decorators";
import { iconHTML } from "discourse-common/lib/icon-library"; import { iconHTML } from "discourse-common/lib/icon-library";
export default NotificationOptionsComponent.extend({ export default NotificationOptionsComponent.extend({
@ -12,7 +13,12 @@ export default NotificationOptionsComponent.extend({
value: Em.computed.alias("category.notification_level"), value: Em.computed.alias("category.notification_level"),
generatedHeadertext: iconHTML("caret-down").htmlSafe(), @computed("value")
icon() {
return `${this._super()}${iconHTML("caret-down")}`.htmlSafe();
},
generatedHeadertext: null,
@observes("value") @observes("value")
_notificationLevelChanged() { _notificationLevelChanged() {

5
app/assets/stylesheets/common/components/categories-admin-actions.scss Normal file
View File

@ -0,0 +1,5 @@
.categories-admin-actions.categories-admin-actions.categories-admin-actions {
.select-box-body {
min-width: auto;
}
}

1
app/assets/stylesheets/common/components/dropdown-select-box.scss
View File

@ -37,7 +37,6 @@
align-self: center; align-self: center;
margin-right: 0; margin-right: 0;
opacity: 1; opacity: 1;
color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 40%));
} }
} }

4
app/assets/stylesheets/common/components/topic-notification-options-button.scss
View File

@ -8,7 +8,7 @@
.reason { .reason {
line-height: 16px; line-height: 16px;
margin: 0 0 0 5px; margin: 0 0 0 10px;
} }
} }
} }
@ -21,7 +21,7 @@
display: inline-flex; display: inline-flex;
justify-content: flex-start; justify-content: flex-start;
align-items: center; align-items: center;
margin: 5px 0; margin: 0;
.topic-notification-options, .reason { .topic-notification-options, .reason {
display: inline-flex; display: inline-flex;