Skip to content

fix(theming): unwanted variables and colours calc fixes #38063

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

Merged
skjnldsv merged 6 commits into from
May 5, 2023
Merged

fix(theming): unwanted variables and colours calc fixes #38063

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c6ebb0d
fix(theming): calc primary element from current main background
skjnldsv May 4, 2023
74461a9
fix(theming): ensure image background is not defined if admin disable…
skjnldsv May 4, 2023
4d3b49b
fix(theming): replace `color-primary-text-dark` with `color-primary-e…
skjnldsv May 4, 2023
9ab7a19
fix(theming): remove unnecessary `color-primary-element-default-hover…
skjnldsv May 4, 2023
b603a3e
fix(theming): do not show the image default background on user themin…
skjnldsv May 4, 2023
4c71d8f
fix(theming): replace elementColor dark value with better contrast `#…
skjnldsv May 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix(theming): do not show the image default background on user themin… 
…g if disabled

Signed-off-by: John Molakvoæ <[email protected]>
  • Loading branch information
@skjnldsv
skjnldsv committed May 4, 2023
commit b603a3eac7962dde4e34abc54980cdff02f02b53
2 changes: 1 addition & 1 deletion apps/theming/src/components/BackgroundSettings.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ export default {
&__default {
background-color: var(--color-primary-default);
background-image: var(--image-background-default);
background-image: var(--image-background-plain, var(--image-background-default));
}
&__filepicker, &__default, &__color {
Expand Down
4 changes: 2 additions & 2 deletions dist/theming-admin-theming.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/theming-admin-theming.js.map
View file
Open in desktop

Large diffs are not rendered by default.

Loading