upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-08 16:26:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

feat(theming): Provide CSS variable for favorite color and adjust for dark mode

Browse source 
Co-authored-by: Simon L <szaimen@e.mail.de>
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
This commit is contained in:
Ferdinand Thiessen 2024-03-06 14:37:59 +01:00
parent 834f70fd7a
commit 4b8868a7f1
No known key found for this signature in database
GPG key ID: 45FAE7268762B400
8 changed files with 8 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/files/src/components/FileEntry/FavoriteIcon.vue
View file

@ -65,7 +65,7 @@ export default defineComponent({
<style lang="scss" scoped>
.favorite-marker-icon {
color: #a08b00;
color: var(--color-favorite);
// Override NcIconSvgWrapper defaults (clickable area)
min-width: unset !important;
min-height: unset !important;

1
apps/theming/css/default.css
View file

@ -37,6 +37,7 @@
--color-info-rgb: 0,113,173;
--color-info-hover: #197fb5;
--color-info-text: #006499;
--color-favorite: #A37200;
--color-loading-light: #cccccc;
--color-loading-dark: #444444;
--color-box-shadow-rgb: 77,77,77;

17
apps/theming/css/theming.css
View file

@ -1,17 +0,0 @@
/* Error: Undefined variable.
* ,
* 38 | $invert: luma($color-primary) > 0.6;
* | ^^^^^^^^^^^^^^
* '
* apps/theming/css/theming.scss 38:15 root stylesheet */
body::before {
font-family: "Source Code Pro", "SF Mono", Monaco, Inconsolata, "Fira Mono",
"Droid Sans Mono", monospace, monospace;
white-space: pre;
display: block;
padding: 1em;
margin-bottom: 1em;
border-bottom: 2px solid black;
content: "Error: Undefined variable.\a \2577 \a 38 \2502 $invert: luma($color-primary) > 0.6;\a \2502 ^^^^^^^^^^^^^^\a \2575 \a apps/theming/css/theming.scss 38:15 root stylesheet";
}

1
apps/theming/lib/Themes/DarkTheme.php
View file

@ -113,6 +113,7 @@ class DarkTheme extends DefaultTheme implements ITheme {
'--color-info-rgb' => join(',', $this->util->hexToRGB($colorInfo)),
'--color-info-hover' => $this->util->lighten($colorInfo, 10),
'--color-info-text' => $colorInfo,
'--color-favorite' => '#ffde00',
// used for the icon loading animation
'--color-loading-light' => '#777',

1
apps/theming/lib/Themes/DefaultTheme.php
View file

@ -165,6 +165,7 @@ class DefaultTheme implements ITheme {
'--color-info-rgb' => join(',', $this->util->hexToRGB($colorInfo)),
'--color-info-hover' => $this->util->mix($colorInfo, $colorMainBackground, 80),
'--color-info-text' => $this->util->darken($colorInfo, 4),
'--color-favorite' => '#A37200',
// used for the icon loading animation
'--color-loading-light' => '#cccccc',

2
apps/theming/lib/Themes/HighContrastTheme.php
View file

@ -110,6 +110,8 @@ class HighContrastTheme extends DefaultTheme implements ITheme {
'--color-success-hover' => $this->util->darken($colorSuccess, 7),
'--color-success-text' => $this->util->darken($colorSuccess, 14),
'--color-favorite' => '#936B06',
'--color-scrollbar' => $this->util->darken($colorMainBackground, 25),
// used for the icon loading animation

1
apps/theming/tests/Themes/AccessibleThemeTestCase.php
View file

@ -64,6 +64,7 @@ class AccessibleThemeTestCase extends TestCase {
'--color-info-hover',
'--color-success',
'--color-success-hover',
'--color-favorite',
],
[
'--color-main-background',

2
apps/weather_status/src/App.vue
View file

@ -590,7 +590,7 @@ export default {
// Set color to primary element for current / active favorite address
.favorite-color {
color: #a08b00;
color: var(--color-favorite);
}
.weather-status-menu-item__subheader {