diff options
| author | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2022-04-01 15:19:15 +0200 |
|---|---|---|
| committer | John Molakvoæ <skjnldsv@protonmail.com> | 2022-04-21 09:31:06 +0200 |
| commit | a1aaaaa0c86c002a0a406464724b8a0236fe8406 (patch) | |
| tree | d578929dbff3330c6c00f3068453cd5b943d8a52 /apps/theming/css | |
| parent | 738fcba51a4947213b8b240ebbecc948308340cb (diff) | |
| download | nextcloud-server-a1aaaaa0c86c002a0a406464724b8a0236fe8406.tar.gz nextcloud-server-a1aaaaa0c86c002a0a406464724b8a0236fe8406.zip | |
Update and fix theming images
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Diffstat (limited to 'apps/theming/css')
| -rw-r--r-- | apps/theming/css/settings-admin.scss | 14 | ||||
| -rw-r--r-- | apps/theming/css/theming.scss | 28 |
2 files changed, 12 insertions, 30 deletions
diff --git a/apps/theming/css/settings-admin.scss b/apps/theming/css/settings-admin.scss index c4d67917506..5cec0e98199 100644 --- a/apps/theming/css/settings-admin.scss +++ b/apps/theming/css/settings-admin.scss @@ -100,7 +100,8 @@ margin-top: 10px; margin-bottom: 20px; cursor: pointer; - background-image: var(--image-login); + background-color: var(--color-primary); + background-image: var(--image-background, var(--image-background-plain, url('../../../core/img/background.svg'), linear-gradient(40deg, #0082c9 0%, #30b6ff 100%))); #theming-preview-logo { cursor: pointer; @@ -111,7 +112,7 @@ background-position: center; background-repeat: no-repeat; background-size: contain; - background-image: var(--image-logo); + background-image: var(--image-logo, url('../../../core/img/logo/logo.svg')); } } @@ -127,6 +128,15 @@ background-repeat: no-repeat; background-size: contain; } + + #theming-preview-logoheader { + // Only using --image-logoheader to show the custom value only + background-image: var(--image-logoheader); + } + + #theming-preview-favicon { + background-image: var(--image-favicon); + } } /* transition effects for theming value changes */ diff --git a/apps/theming/css/theming.scss b/apps/theming/css/theming.scss index 52337d2105f..a5b55a5a738 100644 --- a/apps/theming/css/theming.scss +++ b/apps/theming/css/theming.scss @@ -45,18 +45,6 @@ $invert: luma($color-primary) > 0.6; } } -.nc-theming-main-background { - background-color: $color-primary; -} - -.nc-theming-main-text { - color: $color-primary-text; -} - -.nc-theming-contrast { - color: $color-primary-text; -} - @if ($invert) { // too bright, use dark text to mix the primary $color-primary-light: mix($color-primary, $color-main-text, 10%); @@ -157,16 +145,6 @@ $invert: luma($color-primary) > 0.6; } } -@if variable_exists('theming-favicon-mime') and $theming-favicon-mime != '' { - #theming .advanced-option-favicon .image-preview { - background-image: $image-favicon; - } -} @else { - #theming .advanced-option-favicon .image-preview { - background-image: none; - } -} - input.primary { background-color: $color-primary-element; border: 1px solid $color-primary-text; @@ -305,9 +283,3 @@ input.primary { border: 1px solid #ebebeb; } } - -@if ($has-legal-links == 'true') { - footer { - height: 92px; - } -} |