From 1cf28eac2023b336daf6b415d0a498a69d5fea56 Mon Sep 17 00:00:00 2001 From: vinceliuice Date: Wed, 17 Apr 2024 08:14:42 +0800 Subject: [PATCH] Fixed #153 --- src/sass/_colors.scss | 13 ++++++++++++ src/sass/gtk/_common-4.0.scss | 38 ++++++++++++++++++++++++----------- 2 files changed, 39 insertions(+), 12 deletions(-) diff --git a/src/sass/_colors.scss b/src/sass/_colors.scss index f9f8000f..e8366fa0 100644 --- a/src/sass/_colors.scss +++ b/src/sass/_colors.scss @@ -7,6 +7,19 @@ @return unquote("alpha(#{$c}, #{$a})"); } +@function gtkmix($c1,$c2,$r) { + $ratio: 1 - $r / 100%; // match SCSS mix() + @return unquote("mix(#{$c1},#{$c2},#{$ratio})"); +} + +@function gtkshade($c,$s) { + @return unquote("shade(#{$c},#{$s})"); +} + +@function gtkcolor($c) { + @return unquote("@#{$c}"); +} + @function on($color, $state: 'primary') { // Allow 'light' or 'dark' to $color @if ($color == 'light') { $color: $white; } diff --git a/src/sass/gtk/_common-4.0.scss b/src/sass/gtk/_common-4.0.scss index d95c408c..68e04b5c 100644 --- a/src/sass/gtk/_common-4.0.scss +++ b/src/sass/gtk/_common-4.0.scss @@ -3543,19 +3543,33 @@ frame { statusbar & > border { border: none; } // for backward compatibility } -actionbar > revealer > box { - padding: $space-size; - border-spacing: 0; - box-shadow: inset 0 1px $border; - background-color: $base; - background-clip: border-box; - border: none; +actionbar { + &.toolbar { // reset + background-color: transparent; + padding: 0; + border-spacing: 0; + border: none; + box-shadow: none; - button, entry, - menubutton, menubutton > button, - splitbutton, splitbutton > button, - spinbutton { - margin: 0; + > revealer > box { + background-color: $base-alt; + } + } + + > revealer > box { + padding: $space-size; + border-spacing: 0; + box-shadow: inset 0 1px $border; + background-color: $base; + background-clip: border-box; + border: none; + + button, entry, + menubutton, menubutton > button, + splitbutton, splitbutton > button, + spinbutton { + margin: 0; + } } }