Skip to content

[stable26] fix(theming): unwanted variables and colours calc fixes #38098

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
juliusknorr merged 6 commits into from
May 10, 2023
Merged

[stable26] fix(theming): unwanted variables and colours calc fixes #38098

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
b6a5e35
fix(theming): calc primary element from current main background
skjnldsv May 4, 2023
c90ffa9
fix(theming): ensure image background is not defined if admin disable…
skjnldsv May 4, 2023
45d28c3
fix(theming): replace `color-primary-text-dark` with `color-primary-e…
skjnldsv May 4, 2023
76dbb06
fix(theming): remove unnecessary `color-primary-element-default-hover…
skjnldsv May 4, 2023
1c38324
fix(theming): do not show the image default background on user themin…
skjnldsv May 4, 2023
8914b50
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): remove unnecessary `color-primary-element-default-hover… 
…` variable

Signed-off-by: John Molakvoæ <[email protected]>
  • Loading branch information
@skjnldsv @juliusknorr
skjnldsv authored and juliusknorr committed May 9, 2023
commit 76dbb0643337677def269f5f03e169188a9e17d6
6 changes: 2 additions & 4 deletions apps/theming/lib/Themes/CommonThemeTrait.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ protected function generatePrimaryVariables(string $colorMainBackground, string
$isBrightColor = $this->util->isBrightColor($colorMainBackground);
$colorPrimaryElement = $this->util->elementColor($this->primaryColor, $isBrightColor);
$colorPrimaryLight = $this->util->mix($colorPrimaryElement, $colorMainBackground, -80);
$colorPrimaryElementDefault = $this->util->elementColor($this->defaultPrimaryColor);
$colorPrimaryElementLight = $this->util->mix($colorPrimaryElement, $colorMainBackground, -80);

// primary related colours
Expand All @@ -67,15 +66,14 @@ protected function generatePrimaryVariables(string $colorMainBackground, string
'--color-primary-element' => $colorPrimaryElement,
'--color-primary-element-hover' => $this->util->mix($colorPrimaryElement, $colorMainBackground, 60),
'--color-primary-element-text' => $this->util->invertTextColor($colorPrimaryElement) ? '#000000' : '#ffffff',

// used for hover/focus states
'--color-primary-element-light' => $colorPrimaryElementLight,
'--color-primary-element-light-hover' => $this->util->mix($colorPrimaryElementLight, $colorMainText, 90),
'--color-primary-element-light-text' => $this->util->mix($colorPrimaryElement, $this->util->invertTextColor($colorPrimaryElementLight) ? '#000000' : '#ffffff', -20),
// mostly used for disabled states
'--color-primary-element-text-dark' => $this->util->darken($this->util->invertTextColor($colorPrimaryElement) ? '#000000' : '#ffffff', 7),

// default global primary element hover. To be used with --color-primary-default
'--color-primary-element-default-hover' => $this->util->mix($colorPrimaryElementDefault, $colorMainBackground, 60),

// to use like this: background-image: var(--gradient-primary-background);
'--gradient-primary-background' => 'linear-gradient(40deg, var(--color-primary) 0%, var(--color-primary-hover) 100%)',
];
Expand Down
18 changes: 16 additions & 2 deletions apps/theming/src/components/admin/ColorPickerField.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,22 @@ export default {
width: 230px !important;
border-radius: var(--border-radius-large) !important;
background-color: var(--color-primary-default) !important;
&:hover {
background-color: var(--color-primary-element-default-hover) !important;

// emulated hover state because it would not make sense
// to create a dedicated global variable for the color-primary-default
&:hover::after {
background-color: white;
content: "";
position: absolute;
width: 100%;
height: 100%;
opacity: .2;
filter: var(--primary-invert-if-bright);
}

// Above the ::after
&::v-deep * {
z-index: 1;
}
}
}
Expand Down