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

FIX: Always show overriden colors filter (#11755)

This commit is contained in:
Bianca Nenciu 2021-01-20 10:40:05 +02:00 committed by GitHub
parent 8b10fc2f8c
commit 3d7bb15be8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
app/assets/javascripts/admin/addon/templates/customize-colors-show.hbs
View File

@ -41,31 +41,34 @@
<br>
<div class="admin-controls">
{{#if model.theme_id}}
{{inline-edit-checkbox action=(action "applyUserSelectable") labelKey="admin.customize.theme.color_scheme_user_selectable" checked=model.user_selectable modelId=model.id}}
{{else}}
<label>
{{input type="checkbox" checked=model.user_selectable}}
{{i18n "admin.customize.theme.color_scheme_user_selectable"}}
</label>
{{/if}}
{{#unless model.theme_id}}
<div class="pull-right">
<label>
{{input type="checkbox" checked=onlyOverridden}}
{{i18n "admin.settings.show_overriden"}}
</label>
</div>
{{/unless}}
<div>
{{#if model.theme_id}}
{{inline-edit-checkbox action=(action "applyUserSelectable") labelKey="admin.customize.theme.color_scheme_user_selectable" checked=model.user_selectable modelId=model.id}}
{{else}}
<label>
{{input type="checkbox" checked=model.user_selectable}}
{{i18n "admin.customize.theme.color_scheme_user_selectable"}}
</label>
{{/if}}
</div>
</div>
{{#if colors.length}}
<table class="table colors">
<thead>
<tr>
<th>
</th>
<th></th>
<th class="hex">{{i18n "admin.customize.color"}}</th>
<th class="overriden">
{{#unless model.theme_id}}
<label>
{{input type="checkbox" checked=onlyOverridden}}
{{i18n "admin.settings.show_overriden"}}
</label>
{{/unless}}
</th>
<th></th>
</tr>
</thead>
<tbody>

4
app/assets/stylesheets/common/admin/customize.scss
View File

@ -520,6 +520,10 @@
margin-left: auto;
}
}
.admin-controls {
display: block;
}
}
.colors {
thead th {