diff --git a/scss/linux/_menu.scss b/scss/linux/_menu.scss new file mode 100644 index 0000000000..668ffa0e0c --- /dev/null +++ b/scss/linux/_menu.scss @@ -0,0 +1,13 @@ +@each $cls, $icon in $menu-icons { + .zotero-menuitem-#{$cls} { + // If icon starts with "light-dark:", use light and dark icon + @if str-slice($icon, 0, 11) == "light-dark:" { + @include focus-states using ($color) { + @include svgicon-menu(str-slice($icon, 12), $color, "16"); + } + } + @else { + @include svgicon-menu($icon, "universal", "16", false, false, false); + } + } +}; diff --git a/scss/linux/_menupopup.scss b/scss/linux/_menupopup.scss index dad0774f40..e35b7111b8 100644 --- a/scss/linux/_menupopup.scss +++ b/scss/linux/_menupopup.scss @@ -1,10 +1,7 @@ menupopup, panel, #search-mode-popup { - --panel-padding-block: 0; - --panel-border-radius: 6px; - --panel-background: var(--material-toolbar); - --menuitem-hover-background-color: var(--fill-quinary); - --menuitem-disabled-hover-background-color: var(--fill-quinary); - @include light-dark(--panel-border-color, #dddddd, #1c1c1c); + --panel-padding-block: initial; + --panel-border-color: initial; + --panel-border-radius: 3px; } menupopup { @@ -16,5 +13,5 @@ menupopup { } :is(panel, menupopup)::part(content) { - padding: 6px 0px 6px 0px; + padding: 3px 0; } diff --git a/scss/linux/_titleBar.scss b/scss/linux/_titleBar.scss index 9f9fcb0cd7..3ef9a37263 100644 --- a/scss/linux/_titleBar.scss +++ b/scss/linux/_titleBar.scss @@ -15,6 +15,10 @@ -moz-appearance: -moz-window-titlebar; } +#zotero-title-bar { + border-top: 1px solid var(--toolbar-field-border-color); +} + #toolbar-menubar { pointer-events: none; visibility: visible; diff --git a/scss/zotero-unix.scss b/scss/zotero-unix.scss index c403463a3e..2969579acd 100644 --- a/scss/zotero-unix.scss +++ b/scss/zotero-unix.scss @@ -8,6 +8,7 @@ @import "linux/editable"; @import "linux/errorReport"; @import "linux/feedSettings"; +@import "linux/menu"; @import "linux/menupopup"; @import "linux/tabBar"; @import "linux/titleBar";