Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

UX: settings are misaligned when translations are too long #23308

Merged
merged 1 commit into from Aug 29, 2023
Merged

UX: settings are misaligned when translations are too long #23308

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 10 additions & 10 deletions app/assets/javascripts/admin/addon/templates/customize-colors-show.hbs
View file
Open in desktop
Expand Up @@ -47,16 +47,7 @@
</div>

<div class="admin-controls">
{{#unless this.model.theme_id}}
<div class="pull-right">
<label>
<Input @type="checkbox" @checked={{this.onlyOverridden}} />
{{i18n "admin.settings.show_overriden"}}
</label>
</div>
{{/unless}}

<div>
<div class="pull-left">
{{#if this.model.theme_id}}
<InlineEditCheckbox
@action={{action "applyUserSelectable"}}
Expand All @@ -71,6 +62,15 @@
</label>
{{/if}}
</div>

{{#unless this.model.theme_id}}
<div class="pull-right">
<label>
<Input @type="checkbox" @checked={{this.onlyOverridden}} />
{{i18n "admin.settings.show_overriden"}}
</label>
</div>
{{/unless}}
</div>

{{#if this.colors.length}}
Expand Down
7 changes: 7 additions & 0 deletions app/assets/stylesheets/common/admin/customize.scss
View file
Open in desktop
Expand Up @@ -180,13 +180,20 @@
}

&.color-scheme .admin-controls {
display: flex;
padding: 1em;
label {
margin-bottom: 0;
input[type="checkbox"] {
margin-top: 0;
}
}
.pull-left {
width: 70%;
}
.pull-right {
width: 30%;
}
}
}
.add-component-button {
Expand Down