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

UX: fix color scheme setting reset position (#21365)

This commit is contained in:
Kris 2023-05-03 13:37:23 -04:00 committed by GitHub
parent 856755a383
commit 4f306cf88f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
app/assets/javascripts/discourse/app/templates/preferences/interface.hbs
View File

@ -64,23 +64,23 @@
</div> </div>
</div> </div>
{{/if}} {{/if}}
{{#if this.previewingColorScheme}}
{{#if this.previewingColorScheme}}
<DButton
@action={{action "undoColorSchemePreview"}}
@label="user.color_schemes.undo"
@icon="undo"
@class="btn-default btn-small undo-preview"
/>
{{/if}}
<div class="controls color-scheme-checkbox">
<PreferenceCheckbox
@labelKey="user.color_scheme_default_on_all_devices"
@checked={{this.makeColorSchemeDefault}}
/>
</div>
{{/if}}
</div> </div>
{{#if this.previewingColorScheme}}
{{#if this.previewingColorScheme}}
<DButton
@action={{action "undoColorSchemePreview"}}
@label="user.color_schemes.undo"
@icon="undo"
@class="btn-default btn-small undo-preview"
/>
{{/if}}
<div class="controls color-scheme-checkbox">
<PreferenceCheckbox
@labelKey="user.color_scheme_default_on_all_devices"
@checked={{this.makeColorSchemeDefault}}
/>
</div>
{{/if}}
{{#if this.showDarkColorSchemeSelector}} {{#if this.showDarkColorSchemeSelector}}
<div class="instructions"> <div class="instructions">
{{i18n "user.color_schemes.dark_instructions"}} {{i18n "user.color_schemes.dark_instructions"}}

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

@ -641,7 +641,7 @@
} }
.undo-preview { .undo-preview {
margin-bottom: 1em; margin: 1em 0;
} }
.save-button { .save-button {