diff --git a/src/_sass/gtk/_common.scss b/src/_sass/gtk/_common.scss index 9adfd1c1..4075800f 100644 --- a/src/_sass/gtk/_common.scss +++ b/src/_sass/gtk/_common.scss @@ -1832,10 +1832,11 @@ menubar, } } +$_menu_bg: if($variant=='light', $base_color, $bg_color); + menu, .menu, .context-menu { - $_menu_bg: if($variant=='light', $base_color, $bg_color); padding: 4px 0; border-radius: 0; background-color: $_menu_bg; diff --git a/src/_sass/gtk/apps/_misc.scss b/src/_sass/gtk/apps/_misc.scss index 38d5ede7..e1bfcf58 100644 --- a/src/_sass/gtk/apps/_misc.scss +++ b/src/_sass/gtk/apps/_misc.scss @@ -338,7 +338,11 @@ window.background:not(.csd) { // // Chrome(ium) // -$chrome_borders_color: if($variant == 'light', rgba(black, 0.15), rgba(white, 0.15)); +$chrome_borders_color: darken(white, 10%); +$chrome_bg_color: #fafbfc; +$chrome_fg_color: #5c616c; +$chrome_menu_bg_color: $base_color; +$chrome_menu_fg_color: $fg_color; %circle_chrome { headerbar.titlebar button.titlebutton { @@ -380,8 +384,8 @@ $chrome_borders_color: if($variant == 'light', rgba(black, 0.15), rgba(white, 0. window.background.chromium { // checked-tab & toolbar & button widgets - background-color: $bg_color; - color: $text_color; + background-color: $chrome_bg_color; + color: $chrome_fg_color; @if $titlebutton == 'circle' { @extend %circle_chrome; } @else { @extend %square_chrome; } @@ -406,10 +410,46 @@ window.background.chromium { // overrides standard borders border-image: none; border: 1px solid $chrome_borders_color; + + &:focus { + border-color: $selected_bg_color; + } } // internal region of toolbar's entry widget - > textview.view { background-color: $base_color; } + > textview.view { + background-color: $chrome_bg_color; + color: $chrome_fg_color; + } + + > menubar { background-color: $header_bg; } + + > menu { + color: $chrome_menu_fg_color; + background-color: $chrome_menu_bg_color; + border: 1px solid $solid_borders_color; + + > separator, .separator { + background-color: $solid_borders_color; + color: $solid_borders_color; + border: none; + } + + > menuitem { + color: $chrome_menu_fg_color; + + &:hover { + color: $selected_fg_color; + background-color: $selected_bg_color; + } + + &:disabled { + color: rgba($chrome_menu_fg_color, 0.45); + } + + label { &:disabled { color: rgba($chrome_menu_fg_color, 0.45); } } + } + } } // @@ -535,6 +575,15 @@ list.tilix-session-sidebar { } } +// +// Geary +// +.geary-accounts-editor-pane { + > scrolledwindow.frame { + border: none; + } +} + // // Pamac // diff --git a/src/gtk-3.0/gtk-dark.css b/src/gtk-3.0/gtk-dark.css index cbcb1fa1..c1018e11 100644 --- a/src/gtk-3.0/gtk-dark.css +++ b/src/gtk-3.0/gtk-dark.css @@ -6163,8 +6163,8 @@ window.background.chromium headerbar.titlebar button.titlebutton { } window.background.chromium { - background-color: #32343D; - color: #D3DAE3; + background-color: #fafbfc; + color: #5c616c; } window.background.chromium headerbar.titlebar button.toggle { @@ -6189,18 +6189,56 @@ window.background.chromium headerbar.titlebar button.toggle:checked, window.back window.background.chromium button { border-width: 1px; border-style: solid; - border-color: rgba(255, 255, 255, 0.15); + border-color: #e6e6e6; } window.background.chromium entry.chromium { border-image: none; - border: 1px solid rgba(255, 255, 255, 0.15); + border: 1px solid #e6e6e6; +} + +window.background.chromium entry.chromium:focus { + border-color: #5294e2; } window.background.chromium > textview.view { + background-color: #fafbfc; + color: #5c616c; +} + +window.background.chromium > menubar { background-color: #282A33; } +window.background.chromium > menu { + color: #D3DAE3; + background-color: #282A33; + border: 1px solid #494c59; +} + +window.background.chromium > menu > separator, window.background.chromium > menu .separator { + background-color: #494c59; + color: #494c59; + border: none; +} + +window.background.chromium > menu > menuitem { + color: #D3DAE3; +} + +window.background.chromium > menu > menuitem:hover { + color: #ffffff; + background-color: #5294e2; +} + +window.background.chromium > menu > menuitem:disabled { + color: rgba(211, 218, 227, 0.45); +} + +window.background.chromium > menu > menuitem label:disabled { + color: rgba(211, 218, 227, 0.45); +} + window.background > grid.horizontal > grid.horizontal { background-color: #282A33; box-shadow: inset 0 -1px rgba(255, 255, 255, 0.12); @@ -6310,6 +6348,10 @@ list.tilix-session-sidebar button.tilix-sidebar-close-button:active, list.tilix- background-image: image(#ec1b22); } +.geary-accounts-editor-pane > scrolledwindow.frame { + border: none; +} + window.background.csd > box.vertical > stack > box.horizontal > list { border-right: 1px solid #494c59; } diff --git a/src/gtk-3.0/gtk-light.css b/src/gtk-3.0/gtk-light.css index 85f82e08..cc530285 100644 --- a/src/gtk-3.0/gtk-light.css +++ b/src/gtk-3.0/gtk-light.css @@ -6167,16 +6167,54 @@ window.background.chromium headerbar.titlebar button.toggle:checked, window.back window.background.chromium button { border-width: 1px; border-style: solid; - border-color: rgba(0, 0, 0, 0.15); + border-color: #e6e6e6; } window.background.chromium entry.chromium { border-image: none; - border: 1px solid rgba(0, 0, 0, 0.15); + border: 1px solid #e6e6e6; +} + +window.background.chromium entry.chromium:focus { + border-color: #5294e2; } window.background.chromium > textview.view { + background-color: #fafbfc; + color: #5c616c; +} + +window.background.chromium > menubar { + background-color: #ffffff; +} + +window.background.chromium > menu { + color: #5c616c; background-color: #ffffff; + border: 1px solid #cad5df; +} + +window.background.chromium > menu > separator, window.background.chromium > menu .separator { + background-color: #cad5df; + color: #cad5df; + border: none; +} + +window.background.chromium > menu > menuitem { + color: #5c616c; +} + +window.background.chromium > menu > menuitem:hover { + color: #ffffff; + background-color: #5294e2; +} + +window.background.chromium > menu > menuitem:disabled { + color: rgba(92, 97, 108, 0.45); +} + +window.background.chromium > menu > menuitem label:disabled { + color: rgba(92, 97, 108, 0.45); } window.background > grid.horizontal > grid.horizontal { @@ -6288,6 +6326,10 @@ list.tilix-session-sidebar button.tilix-sidebar-close-button:active, list.tilix- background-image: image(#ec1b22); } +.geary-accounts-editor-pane > scrolledwindow.frame { + border: none; +} + window.background.csd > box.vertical > stack > box.horizontal > list { border-right: 1px solid #cad5df; } diff --git a/src/gtk-3.0/gtk-win-dark.css b/src/gtk-3.0/gtk-win-dark.css index 611957a1..ee906013 100644 --- a/src/gtk-3.0/gtk-win-dark.css +++ b/src/gtk-3.0/gtk-win-dark.css @@ -6386,8 +6386,8 @@ window.maximized.background.chromium headerbar.titlebar button.titlebutton.maxim } window.background.chromium { - background-color: #32343D; - color: #D3DAE3; + background-color: #fafbfc; + color: #5c616c; } window.background.chromium headerbar.titlebar button.toggle { @@ -6412,18 +6412,56 @@ window.background.chromium headerbar.titlebar button.toggle:checked, window.back window.background.chromium button { border-width: 1px; border-style: solid; - border-color: rgba(255, 255, 255, 0.15); + border-color: #e6e6e6; } window.background.chromium entry.chromium { border-image: none; - border: 1px solid rgba(255, 255, 255, 0.15); + border: 1px solid #e6e6e6; +} + +window.background.chromium entry.chromium:focus { + border-color: #5294e2; } window.background.chromium > textview.view { + background-color: #fafbfc; + color: #5c616c; +} + +window.background.chromium > menubar { background-color: #282A33; } +window.background.chromium > menu { + color: #D3DAE3; + background-color: #282A33; + border: 1px solid #494c59; +} + +window.background.chromium > menu > separator, window.background.chromium > menu .separator { + background-color: #494c59; + color: #494c59; + border: none; +} + +window.background.chromium > menu > menuitem { + color: #D3DAE3; +} + +window.background.chromium > menu > menuitem:hover { + color: #ffffff; + background-color: #5294e2; +} + +window.background.chromium > menu > menuitem:disabled { + color: rgba(211, 218, 227, 0.45); +} + +window.background.chromium > menu > menuitem label:disabled { + color: rgba(211, 218, 227, 0.45); +} + window.background > grid.horizontal > grid.horizontal { background-color: #282A33; box-shadow: inset 0 -1px rgba(255, 255, 255, 0.12); @@ -6533,6 +6571,10 @@ list.tilix-session-sidebar button.tilix-sidebar-close-button:active, list.tilix- background-image: image(#ec1b22); } +.geary-accounts-editor-pane > scrolledwindow.frame { + border: none; +} + window.background.csd > box.vertical > stack > box.horizontal > list { border-right: 1px solid #494c59; } diff --git a/src/gtk-3.0/gtk-win-light.css b/src/gtk-3.0/gtk-win-light.css index 2dca14f0..1262149c 100644 --- a/src/gtk-3.0/gtk-win-light.css +++ b/src/gtk-3.0/gtk-win-light.css @@ -6390,16 +6390,54 @@ window.background.chromium headerbar.titlebar button.toggle:checked, window.back window.background.chromium button { border-width: 1px; border-style: solid; - border-color: rgba(0, 0, 0, 0.15); + border-color: #e6e6e6; } window.background.chromium entry.chromium { border-image: none; - border: 1px solid rgba(0, 0, 0, 0.15); + border: 1px solid #e6e6e6; +} + +window.background.chromium entry.chromium:focus { + border-color: #5294e2; } window.background.chromium > textview.view { + background-color: #fafbfc; + color: #5c616c; +} + +window.background.chromium > menubar { + background-color: #ffffff; +} + +window.background.chromium > menu { + color: #5c616c; background-color: #ffffff; + border: 1px solid #cad5df; +} + +window.background.chromium > menu > separator, window.background.chromium > menu .separator { + background-color: #cad5df; + color: #cad5df; + border: none; +} + +window.background.chromium > menu > menuitem { + color: #5c616c; +} + +window.background.chromium > menu > menuitem:hover { + color: #ffffff; + background-color: #5294e2; +} + +window.background.chromium > menu > menuitem:disabled { + color: rgba(92, 97, 108, 0.45); +} + +window.background.chromium > menu > menuitem label:disabled { + color: rgba(92, 97, 108, 0.45); } window.background > grid.horizontal > grid.horizontal { @@ -6511,6 +6549,10 @@ list.tilix-session-sidebar button.tilix-sidebar-close-button:active, list.tilix- background-image: image(#ec1b22); } +.geary-accounts-editor-pane > scrolledwindow.frame { + border: none; +} + window.background.csd > box.vertical > stack > box.horizontal > list { border-right: 1px solid #cad5df; } diff --git a/src/gtk-3.0/gtk-win.css b/src/gtk-3.0/gtk-win.css index 770abbca..a968fed6 100644 --- a/src/gtk-3.0/gtk-win.css +++ b/src/gtk-3.0/gtk-win.css @@ -6406,16 +6406,54 @@ window.background.chromium headerbar.titlebar button.toggle:checked, window.back window.background.chromium button { border-width: 1px; border-style: solid; - border-color: rgba(0, 0, 0, 0.15); + border-color: #e6e6e6; } window.background.chromium entry.chromium { border-image: none; - border: 1px solid rgba(0, 0, 0, 0.15); + border: 1px solid #e6e6e6; +} + +window.background.chromium entry.chromium:focus { + border-color: #5294e2; } window.background.chromium > textview.view { + background-color: #fafbfc; + color: #5c616c; +} + +window.background.chromium > menubar { + background-color: #282A33; +} + +window.background.chromium > menu { + color: #5c616c; background-color: #ffffff; + border: 1px solid #cad5df; +} + +window.background.chromium > menu > separator, window.background.chromium > menu .separator { + background-color: #cad5df; + color: #cad5df; + border: none; +} + +window.background.chromium > menu > menuitem { + color: #5c616c; +} + +window.background.chromium > menu > menuitem:hover { + color: #ffffff; + background-color: #5294e2; +} + +window.background.chromium > menu > menuitem:disabled { + color: rgba(92, 97, 108, 0.45); +} + +window.background.chromium > menu > menuitem label:disabled { + color: rgba(92, 97, 108, 0.45); } window.background > grid.horizontal > grid.horizontal { @@ -6527,6 +6565,10 @@ list.tilix-session-sidebar button.tilix-sidebar-close-button:active, list.tilix- background-image: image(#ec1b22); } +.geary-accounts-editor-pane > scrolledwindow.frame { + border: none; +} + window.background.csd > box.vertical > stack > box.horizontal > list { border-right: 1px solid #cad5df; } diff --git a/src/gtk-3.0/gtk.css b/src/gtk-3.0/gtk.css index 9c7b2397..c5106c62 100644 --- a/src/gtk-3.0/gtk.css +++ b/src/gtk-3.0/gtk.css @@ -6183,16 +6183,54 @@ window.background.chromium headerbar.titlebar button.toggle:checked, window.back window.background.chromium button { border-width: 1px; border-style: solid; - border-color: rgba(0, 0, 0, 0.15); + border-color: #e6e6e6; } window.background.chromium entry.chromium { border-image: none; - border: 1px solid rgba(0, 0, 0, 0.15); + border: 1px solid #e6e6e6; +} + +window.background.chromium entry.chromium:focus { + border-color: #5294e2; } window.background.chromium > textview.view { + background-color: #fafbfc; + color: #5c616c; +} + +window.background.chromium > menubar { + background-color: #282A33; +} + +window.background.chromium > menu { + color: #5c616c; background-color: #ffffff; + border: 1px solid #cad5df; +} + +window.background.chromium > menu > separator, window.background.chromium > menu .separator { + background-color: #cad5df; + color: #cad5df; + border: none; +} + +window.background.chromium > menu > menuitem { + color: #5c616c; +} + +window.background.chromium > menu > menuitem:hover { + color: #ffffff; + background-color: #5294e2; +} + +window.background.chromium > menu > menuitem:disabled { + color: rgba(92, 97, 108, 0.45); +} + +window.background.chromium > menu > menuitem label:disabled { + color: rgba(92, 97, 108, 0.45); } window.background > grid.horizontal > grid.horizontal { @@ -6304,6 +6342,10 @@ list.tilix-session-sidebar button.tilix-sidebar-close-button:active, list.tilix- background-image: image(#ec1b22); } +.geary-accounts-editor-pane > scrolledwindow.frame { + border: none; +} + window.background.csd > box.vertical > stack > box.horizontal > list { border-right: 1px solid #cad5df; } diff --git a/src/metacity-1/metacity-theme-3.xml b/src/metacity-1/metacity-theme-3.xml index 8f503f3b..c585ef91 100644 --- a/src/metacity-1/metacity-theme-3.xml +++ b/src/metacity-1/metacity-theme-3.xml @@ -19,27 +19,27 @@ - - - - - + + + + + - - + + - - - - - + + + + + - - + + @@ -78,41 +78,41 @@ - - - + + + - + - - - + + + - - + + - - - - - + + + + + - - + + - - - + + + @@ -427,9 +427,9 @@