diff --git a/common/common.css b/common/common.css index a24e0c9..2d925fb 100644 --- a/common/common.css +++ b/common/common.css @@ -10,7 +10,8 @@ /* Based on adw-gtk version 4.7 and 4.9 */ @define-color disabled_fg_color mix(mix(@window_fg_color, @window_bg_color, 0.5), @error_color, 0.15); - +@define-color info_fg_color @popover_fg_color; +@define-color info_bg_color @popover_bg_color; .background { color: @window_fg_color; background-color: @window_bg_color; } @@ -18,18 +19,27 @@ dnd { color: @window_fg_color; } *:disabled, :dir(rtl):disabled, :dir(ltr):disabled, /* specificity bump hopefully */ -button:disabled, .button:disabled, .view:disabled, tab:disabled, check:disabled, radio:disabled, entry:disabled, row:disabled, menuitem:disabled, label:disabled +button:disabled, .button:disabled, .view:disabled, tab:disabled, entry:disabled, row:disabled, menuitem:disabled, label:disabled, +check:disabled, radio:disabled, +check:disabled:hover, radio:disabled:hover, +check:disabled:selected, radio:disabled:selected, +check:disabled:active, radio:disabled:active, +.view:disabled:selected, .view:disabled:active, .view:disabled:hover { color: @disabled_fg_color; } +label { + padding: 0 0.5em; +} + /* selections */ selection, .view:selected:focus, .view:selected, iconview:selected, calendar:selected, .nautilus-window notebook:selected, .nautilus-window notebook > stack:selected:not(:only-child), .nautilus-window notebook > stack:not(:only-child) searchbar:selected, -.view text:selected, iconview text:selected, textview text:selected, row:selected, row.has-open-popup, +.view text:selected, iconview text:selected, textview text:selected, row:selected, row.has-open-popup, row.activatable:focus .view > :selected /*this is weirdly needed for nemo when renaming files, there's probably a better solution */ { background-color: alpha(@accent_bg_color,0.7); color: @accent_fg_color; } @@ -45,7 +55,7 @@ selection:focus-within { background-color: alpha(@accent_bg_color,1); } } -list > row { +list > row, listview > row { padding: 0.3em; } @@ -61,20 +71,23 @@ list.rich-list > row, stacksidebar row { min-height: 2em; } -list > row.activatable:hover { +list > row.activatable:hover, +listview > row.activatable:hover { background-color: alpha(currentColor, 0.1); } -list > row.activatable:hover:selected { - background-color: mix(@accent_bg_color, @accent_fg_color, 0.1); +list > row.activatable:hover:selected, +listview > row.activatable:hover:selected { + background-color: @accent_bg_color; } - -list > row.activatable:active { +list > row.activatable:active, +listview > row.activatable:active { background-color: alpha(@accent_bg_color, 0.1); } -list > row.activatable:active:hover { +list > row.activatable:active:hover, +listview > row.activatable:active:hover { background-color: alpha(@accent_bg_color, 0.2); } @@ -110,9 +123,7 @@ button, arrow, tab, .button { } -button > label, tab label { - padding: 0 0.5em; -} + toolbar button, arrow { padding: 0.2em; @@ -130,6 +141,7 @@ scrollbar button, calendar button { arrow { min-height: 7px; min-width: 7px; + padding: 0.3em; } button arrow { @@ -485,6 +497,13 @@ stackswitcher > button { min-width: 1.6em; } +stackswitcher { +margin: 0.3em; +} +headerbar stackswitcher { +margin: 0 0.3em; +} + tab button { padding: 1px; min-width: 0.7em; @@ -567,6 +586,25 @@ accelerator:dir(rtl) { /* searchbar */ /* infobar */ +infobar { + background-color: mix(@info_bg_color, @window_bg_color, 0.5); + padding: 0.5em; + } + +infobar label { color: mix(@info_fg_color, @window_fg_color, 0.5);} + +infobar button {margin: 1px 0.4em;} + +infobar.info, infobar.question { background-color: @info_bg_color;} +infobar.info label, infobar.question label { color: @info_fg_color;} + +infobar.warning { background-color: @warning_bg_color;} +infobar.warning label {color: @warning_fg_color;} + +infobar.error { background-color: @error_bg_color; } +infobar.error label {color: @error_fg_color;} + + /* statusbar */ @@ -601,6 +639,8 @@ arrow.up{ /* revealer */ + + /* expander, expander-widget */ expander, expander > title arrow, expander > arrow { @@ -759,7 +799,7 @@ margin: 0; /* link */ -.link > label { +.link > label, link { text-decoration: underline; } @@ -790,6 +830,16 @@ popover > contents, window.background.csd.popup { /* popovers defined in each gtk-3.0 or gtk-4.0 because they conflict each other */ +popover button, popover arrow { + color: @popover_fg_color; +} +popover .view { + background-color: transparent; + color: @popover_fg_color; +} + + + /* window controls */ @@ -914,9 +964,17 @@ spinner:checked {animation: spin 1s linear infinite;} /* tooltip */ +tooltip, tooltip.background { + background-color: alpha(@info_bg_color, 0.8); + color: @info_fg_color; + border: 1px dashed alpha(@info_fg_color, 0.5); + padding: 0.5em; + /*background-clip: border-box;*/ +} + /* gridview, flowbox */ -flowboxchild { +flowboxchild, flowbox > child { padding: 1px; } @@ -925,8 +983,10 @@ flowboxchild:selected { color: @accent_fg_color; } - - +gridview > child { + padding: 0.3em; + +} /* banner */ diff --git a/gtk-3.0/gtk.css b/gtk-3.0/gtk.css index ea3e813..edea66d 100644 --- a/gtk-3.0/gtk.css +++ b/gtk-3.0/gtk.css @@ -53,6 +53,9 @@ decoration:backdrop { 0 0 0 1px @headerbar_backdrop_color; } +tooltip.background decoration { + box-shadow: 0 0.25em 0.5em 0 alpha(black, 0.5); +} /* calendar */ diff --git a/gtk-4.0/gtk.css b/gtk-4.0/gtk.css index c2b4ea8..62dcc7e 100644 --- a/gtk-4.0/gtk.css +++ b/gtk-4.0/gtk.css @@ -23,7 +23,7 @@ popover, popover.background { background-color: transparent; } -popover > contents, popover > arrow { +popover > contents { border: 1px solid mix(@popover_bg_color, @popover_fg_color, 0.5); background-color: @popover_bg_color; color: @popover_fg_color; @@ -67,6 +67,9 @@ background-color: unset; 0 0 0 1px @headerbar_backdrop_color; } +tooltip.background { + box-shadow: 0 0.25em 0.5em 0 alpha(black, 0.5); /* apparently, this is useless */ +} /* calendar */