From 711c7f3290dad80506b09cc77fa36084b358d032 Mon Sep 17 00:00:00 2001 From: vinceliuice <vinceliuice@hotmail.com> Date: Fri, 16 Feb 2018 19:17:16 +0800 Subject: [PATCH] update --- src/gtk-3.0/gtk-dark.css | 23 +++++++++++++++++---- src/gtk-3.0/gtk-light.css | 19 ++++++++++++++++-- src/gtk-3.0/sass/_applications.scss | 31 ++++++++++++++++++++++++++--- src/gtk-3.0/sass/_common.scss | 2 +- 4 files changed, 65 insertions(+), 10 deletions(-) diff --git a/src/gtk-3.0/gtk-dark.css b/src/gtk-3.0/gtk-dark.css index ff0c323..d369721 100644 --- a/src/gtk-3.0/gtk-dark.css +++ b/src/gtk-3.0/gtk-dark.css @@ -65,7 +65,7 @@ textview text { .view text:hover, iconview text:hover, textview text:hover { - background-color: rgba(255, 255, 255, 0.005); } + background-color: #2c2c2c; } .view:selected, iconview:selected, .view:selected:focus, iconview:selected:focus, .view text:selected, iconview text:selected, @@ -4427,7 +4427,7 @@ window.background:not(.csd) > widget > button > button { padding: 4px 6px; } window.background:not(.csd) > menu, window.background:not(.csd) .menu { - background-color: #242424; + background-color: #404040; border-radius: 0; border: none; } window.background:not(.csd) > menu .separator:not(label), .csd window.background:not(.csd) > menu .separator:not(label), @@ -4450,7 +4450,7 @@ window.background:not(.csd) > menu > menuitem > check { #MozillaGtkWidget.background scrolledwindow { background-color: #333333; } #MozillaGtkWidget.background scrollbar { - background-color: #666666; } + background-color: transparent; } #MozillaGtkWidget.background scrollbar slider { background-color: gray; } #MozillaGtkWidget.background scrollbar slider:hover { @@ -4468,7 +4468,7 @@ window.background:not(.csd) > menu > menuitem > check { #MozillaGtkWidget.background *:checked button { color: #dedede; } #MozillaGtkWidget.background > window.background > menu { - background-color: #242424; + background-color: #404040; border-radius: 0; border-color: rgba(255, 255, 255, 0.12); } #MozillaGtkWidget.background > window.background > menu > separator { @@ -4546,6 +4546,21 @@ window.background:not(.solid-csd) > notebook:not(.frame) { border: none; box-shadow: none; } +window > box.vertical > box.horizontal > toolbar, window > box.vertical > box.horizontal > .inline-toolbar { + background-color: transparent; + box-shadow: none; } + window > box.vertical > box.horizontal > toolbar toolitem > box label, window > box.vertical > box.horizontal > .inline-toolbar toolitem > box label, + window > box.vertical > box.horizontal > toolbar toolitem > box entry, + window > box.vertical > box.horizontal > .inline-toolbar toolitem > box entry { + min-height: 20px; + padding-top: 2px; + padding-bottom: 2px; + font-size: 90%; } + window > box.vertical > box.horizontal > toolbar toolitem > box > label, window > box.vertical > box.horizontal > .inline-toolbar toolitem > box > label { + color: #dedede; } +window > box.vertical > box.horizontal > widget { + background-color: transparent; } + UnityDecoration { -UnityDecoration-extents: 28px 1 1 1; -UnityDecoration-input-extents: 10px; diff --git a/src/gtk-3.0/gtk-light.css b/src/gtk-3.0/gtk-light.css index e74363c..c55a96b 100644 --- a/src/gtk-3.0/gtk-light.css +++ b/src/gtk-3.0/gtk-light.css @@ -65,7 +65,7 @@ textview text { .view text:hover, iconview text:hover, textview text:hover { - background-color: rgba(0, 0, 0, 0.005); } + background-color: #f7f7f7; } .view:selected, iconview:selected, .view:selected:focus, iconview:selected:focus, .view text:selected, iconview text:selected, @@ -4452,7 +4452,7 @@ window.background:not(.csd) > menu > menuitem > check { #MozillaGtkWidget.background scrolledwindow { background-color: #f5f5f5; } #MozillaGtkWidget.background scrollbar { - background-color: #ffffff; } + background-color: transparent; } #MozillaGtkWidget.background scrollbar slider { background-color: #979797; } #MozillaGtkWidget.background scrollbar slider:hover { @@ -4548,6 +4548,21 @@ window.background:not(.solid-csd) > notebook:not(.frame) { border: none; box-shadow: none; } +window > box.vertical > box.horizontal > toolbar, window > box.vertical > box.horizontal > .inline-toolbar { + background-color: transparent; + box-shadow: none; } + window > box.vertical > box.horizontal > toolbar toolitem > box label, window > box.vertical > box.horizontal > .inline-toolbar toolitem > box label, + window > box.vertical > box.horizontal > toolbar toolitem > box entry, + window > box.vertical > box.horizontal > .inline-toolbar toolitem > box entry { + min-height: 20px; + padding-top: 2px; + padding-bottom: 2px; + font-size: 90%; } + window > box.vertical > box.horizontal > toolbar toolitem > box > label, window > box.vertical > box.horizontal > .inline-toolbar toolitem > box > label { + color: #242424; } +window > box.vertical > box.horizontal > widget { + background-color: transparent; } + UnityDecoration { -UnityDecoration-extents: 28px 1 1 1; -UnityDecoration-input-extents: 10px; diff --git a/src/gtk-3.0/sass/_applications.scss b/src/gtk-3.0/sass/_applications.scss index b4e60ab..9b02ecf 100644 --- a/src/gtk-3.0/sass/_applications.scss +++ b/src/gtk-3.0/sass/_applications.scss @@ -1485,7 +1485,7 @@ window.background:not(.csd) { > menu, .menu { // context-menus - background-color: $base_color; + background-color: if($variant == 'light', $base_color, lighten($bg_color, 5%)); border-radius: 0; border: none; @@ -1517,7 +1517,7 @@ window.background:not(.csd) { scrolledwindow { background-color: $bg_color; } scrollbar { - background-color: if($variant == 'light', $base_color, lighten($bg_color, 20%)); + background-color: transparent; slider { background-color: mix($fg_color, $bg_color, 45%); &:hover { background-color: mix($fg_color, $bg_color, 60%); } @@ -1534,7 +1534,7 @@ window.background:not(.csd) { } > window.background > menu { // context-menus - background-color: $base_color; + background-color: if($variant == 'light', $base_color, lighten($bg_color, 5%)); border-radius: 0; border-color: $borders_color; @@ -1658,6 +1658,31 @@ window.background:not(.solid-csd) { } } +// /************ +// * Synaptic * +// ************/ + +window > box.vertical > box.horizontal { + > toolbar { + background-color: transparent; + box-shadow: none; + + toolitem > box { + label, + entry { + min-height: 20px; + padding-top: 2px; + padding-bottom: 2px; + font-size: 90%; + } + + > label { color: $fg_color; } + } + } + + > widget { background-color: transparent; } +} + // // Wingpanel Popover // diff --git a/src/gtk-3.0/sass/_common.scss b/src/gtk-3.0/sass/_common.scss index 25335db..399a2e7 100644 --- a/src/gtk-3.0/sass/_common.scss +++ b/src/gtk-3.0/sass/_common.scss @@ -79,7 +79,7 @@ $wm_radius: 6px; background-color: $base_color; transition: all 200ms $ease-out-quad; - &:hover { background-color: if($variant=='light', rgba(black, 0.005), rgba(white, 0.005)); } + &:hover { background-color: if($variant=='light', darken($base_color, 3%), lighten($base_color, 3%)); } &:selected { &, &:focus {