Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 7 additions & 0 deletions apps/theming/css/default.css
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,15 @@
--clickable-area-large: 48px;
--clickable-area-small: 24px;
--default-grid-baseline: 4px;

--header-height: 50px;
--header-menu-item-height: 44px;
/* An alpha mask to be applied to all icons on the navigation bar (header menu).
* Icons are have a size of 20px but usually we use MDI which have a content of 16px so 2px padding top bottom,
* for better gradient we set those 2px (10% of height) as start and stop positions, this is also somewhat size agnostic as we only depend on the percentage.
*/
--header-menu-icon-mask: linear-gradient(var(--color-background-plain-text) 10%, color-mix(in srgb, var(--color-background-plain-text), 25% transparent) 90%) alpha;

--navigation-width: 300px;
--sidebar-min-width: 300px;
--sidebar-max-width: 500px;
Expand Down
9 changes: 8 additions & 1 deletion apps/theming/lib/Themes/DefaultTheme.php
Original file line number Diff line number Diff line change
Expand Up @@ -191,9 +191,16 @@ public function getCSSVariables(): array {

'--default-grid-baseline' => '4px',

// various structure data
// header / navigation bar
'--header-height' => '50px',
'--header-menu-item-height' => '44px',
/* An alpha mask to be applied to all icons on the navigation bar (header menu).
* Icons are have a size of 20px but usually we use MDI which have a content of 16px so 2px padding top bottom,
* for better gradient we set those 2px (10% of height) as start and stop positions, this is also somewhat size agnostic as we only depend on the percentage.
*/
'--header-menu-icon-mask' => 'linear-gradient(var(--color-background-plain-text) 10%, color-mix(in srgb, var(--color-background-plain-text), 25% transparent) 90%) alpha',

// various structure data
'--navigation-width' => '300px',
'--sidebar-min-width' => '300px',
'--sidebar-max-width' => '500px',
Expand Down
3 changes: 3 additions & 0 deletions apps/theming/lib/Themes/HighContrastTheme.php
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,9 @@ public function getCSSVariables(): array {
'--color-border' => $this->util->darken($colorMainBackground, 50),
'--color-border-dark' => $this->util->darken($colorMainBackground, 50),
'--color-border-maxcontrast' => $this->util->darken($colorMainBackground, 56),

// remove the gradient from the app icons
'--header-menu-icon-mask' => 'none',
]
);
}
Expand Down
2 changes: 1 addition & 1 deletion core/css/header.css.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 1 addition & 3 deletions core/css/header.scss
Original file line number Diff line number Diff line change
Expand Up @@ -85,10 +85,8 @@
max-height: calc(100vh - #{variables.$header-height} - 8px);
}

/* Header menu */
#header {
/* Header menu */
$header-menu-entry-height: 44px;

.header-end > div > .menu {
background-color: var(--color-main-background);
filter: drop-shadow(0 1px 5px var(--color-box-shadow));
Expand Down
2 changes: 1 addition & 1 deletion core/css/server.css.map

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions core/src/components/AppMenuIcon.vue
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ $unread-indicator-size: 10px;
height: $icon-size;
width: $icon-size;
filter: var(--background-image-invert-if-bright);
mask: var(--header-menu-icon-mask);
}

&__unread {
Expand Down
2 changes: 2 additions & 0 deletions core/src/views/AccountMenu.vue
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,8 @@ export default defineComponent({
--account-menu-outline: var(--border-width-input) solid color-mix(in srgb, var(--color-background-plain-text), transparent 75%);
outline: var(--account-menu-outline);
position: fixed;
// do not apply the alpha mask on the avatar div
mask: none !important;

&:hover {
--account-menu-outline: none;
Expand Down
4 changes: 2 additions & 2 deletions dist/core-main.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/core-main.js.map

Large diffs are not rendered by default.

Loading