🔢 Add css variables for blur background #33610
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Member
juliusknorr
commented
Aug 18, 2022
•
- Add css variables for blurred background and core background image
- --color-main-background-blur
- --filter-background-blur
- --image-main-background
- Move dashboard to new variables
This was referenced Aug 18, 2022
skjnldsv
reviewed
Aug 18, 2022
| @@ -59,6 +59,9 @@ public function getCSSVariables(): array { | |||
| $variables['--color-background-dark'] = $this->util->darken($colorMainBackground, 30); | |||
| $variables['--color-background-darker'] = $this->util->darken($colorMainBackground, 30); | |||
|
|
|||
| $variables['--color-main-background-blur'] = $colorMainBackground; | |||
| $variables['--filter-background-blur'] = 'none'; | |||
skjnldsv
reviewed
Aug 18, 2022
| @@ -190,26 +192,30 @@ public function getCSSVariables(): array { | |||
| '--primary-invert-if-bright' => $this->util->invertTextColor($this->primaryColor) ? 'invert(100%)' : 'no', | |||
| '--background-invert-if-dark' => 'no', | |||
| '--background-invert-if-bright' => 'invert(100%)', | |||
|
|
|||
| '--image-main-background' => "url('" . $this->urlGenerator->imagePath('core', 'app-background.jpg') . "')", | |||
There was a problem hiding this comment.
It will be overwriten further down with the theming image. Taking the customised dashboard image into account will be a follow up.
There was a problem hiding this comment.
Ah right I get it now!
Could use a tad more comments 😉
skjnldsv
reviewed
Aug 18, 2022
| } | ||
| $variables["--image-$image"] = "url('".$this->imageManager->getImageUrl($image)."')"; | ||
| $variables["--image-$image"] = "url('" . $imageUrl . "')"; |
There was a problem hiding this comment.
Duplicate of the line 216, no?
There was a problem hiding this comment.
No, --image-main-background has a fallback to the cloud image, while the other one --image-background only represents just the theming image.
jancborchardt
approved these changes
Aug 19, 2022
skjnldsv
approved these changes
Aug 19, 2022
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
7269c7a to
57233fd
Compare
|
/compile |
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
|
Fixed tests |
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.