From 5bb08cbddb6a82547144828f62955eb88045fc5e Mon Sep 17 00:00:00 2001 From: EliverLara Date: Sun, 5 Dec 2021 14:10:22 -0600 Subject: [PATCH] Gtk-4: Fix error buttons style --- gtk-4.0/gtk-dark.css | 34 ++--- gtk-4.0/gtk.css | 34 ++--- gtk-4.0/widgets/_infobars.scss | 228 ++++++++++++++++----------------- 3 files changed, 138 insertions(+), 158 deletions(-) diff --git a/gtk-4.0/gtk-dark.css b/gtk-4.0/gtk-dark.css index 85868fc..9a2e869 100755 --- a/gtk-4.0/gtk-dark.css +++ b/gtk-4.0/gtk-dark.css @@ -2528,7 +2528,7 @@ infobar { color: #C3C7D1; background-color: #161925; border-bottom: 1px solid #030305; - box-shadow: 0 1px 0 0 rgba(0, 0, 0, 0.05), 0 1px 2px 0 rgba(0, 0, 0, 0.15); } + box-shadow: none; } .info, .warning, .question, .error { text-shadow: none; @@ -2569,29 +2569,21 @@ infobar { color: rgba(195, 199, 209, 0.5); box-shadow: none; } -.info { - background-color: #71f79f; } - .info:backdrop { - background-color: #a1fac0; - color: rgba(254, 254, 254, 0.5); } +.info, .info:backdrop { + color: #71f79f; + background-color: transparent; } -.warning { - background-color: #cc5500; } - .warning:backdrop { - background-color: #ff6a00; - color: rgba(254, 254, 254, 0.5); } +.warning, .warning:backdrop { + color: #cc5500; + background-color: transparent; } -.question { - background-color: #00c1e4; } - .question:backdrop { - background-color: #18dcff; - color: rgba(254, 254, 254, 0.5); } +.question, .question:backdrop { + color: #00c1e4; + background-color: transparent; } -.error { - background-color: #e6133e; } - .error:backdrop { - background-color: #ef3d61; - color: rgba(254, 254, 254, 0.5); } +.error, .error:backdrop { + color: #e6133e; + background-color: transparent; } /************* * Level Bar * diff --git a/gtk-4.0/gtk.css b/gtk-4.0/gtk.css index 9610d33..dcbf6c3 100755 --- a/gtk-4.0/gtk.css +++ b/gtk-4.0/gtk.css @@ -2528,7 +2528,7 @@ infobar { color: #C3C7D1; background-color: #161925; border-bottom: 1px solid #030305; - box-shadow: 0 1px 0 0 rgba(0, 0, 0, 0.05), 0 1px 2px 0 rgba(0, 0, 0, 0.15); } + box-shadow: none; } .info, .warning, .question, .error { text-shadow: none; @@ -2569,29 +2569,21 @@ infobar { color: rgba(195, 199, 209, 0.5); box-shadow: none; } -.info { - background-color: #71f79f; } - .info:backdrop { - background-color: #a1fac0; - color: rgba(254, 254, 254, 0.5); } +.info, .info:backdrop { + color: #71f79f; + background-color: transparent; } -.warning { - background-color: #cc5500; } - .warning:backdrop { - background-color: #ff6a00; - color: rgba(254, 254, 254, 0.5); } +.warning, .warning:backdrop { + color: #cc5500; + background-color: transparent; } -.question { - background-color: #00c1e4; } - .question:backdrop { - background-color: #18dcff; - color: rgba(254, 254, 254, 0.5); } +.question, .question:backdrop { + color: #00c1e4; + background-color: transparent; } -.error { - background-color: #e6133e; } - .error:backdrop { - background-color: #ef3d61; - color: rgba(254, 254, 254, 0.5); } +.error, .error:backdrop { + color: #e6133e; + background-color: transparent; } /************* * Level Bar * diff --git a/gtk-4.0/widgets/_infobars.scss b/gtk-4.0/widgets/_infobars.scss index 1193ea6..5ec5f4f 100644 --- a/gtk-4.0/widgets/_infobars.scss +++ b/gtk-4.0/widgets/_infobars.scss @@ -1,119 +1,115 @@ /************** * GtkInfoBar * **************/ -%infobar, -infobar { - text-shadow: none; - color: $fg_color; - background-color: $bg_color; - border-bottom:1px solid darken($bg_color,10%); - box-shadow: 0 1px 0 0 transparentize(black, 0.95), - 0 1px 2px 0 transparentize(black, 0.85); - -} - -%color_infobar { - - @extend %infobar; - - text-shadow: none; - color: $selected_fg_color; - border:none; - - .label { - color: $selected_fg_color; - - &:backdrop { - color: $backdrop_selected_fg_color; - } - } - - button { - border-radius: 2px; - border: none; - background: transparentize($base_color, 0.02); - color: $fg_color; - box-shadow: 0 1px 0 0 transparentize(black, 0.8); - - .label { - color: $fg_color; - } - - &:active { - background: $base_color; - color: $fg_color; - - box-shadow: 0 1px 2px 0 transparentize(black, 0.6); - - &:backdrop { - background: transparentize($base_color, 0.2); - color: transparentize($fg_color, 0.5); - box-shadow: none; - } - } - - &:hover, - &:focus { - box-shadow: 0 1px 2px 0 transparentize(black, 0.6); - } - - &:disabled { - background: transparentize($base_color, 0.4); - color: transparentize($fg_color, 0.5); - box-shadow: none; - - &:backdrop { - background: transparentize($base_color, 0.5); - color: transparentize($fg_color, 0.5); - box-shadow: none; - } - } - - &:backdrop { - background: transparentize($base_color, 0.2); - color: transparentize($fg_color, 0.5); - box-shadow: none; - } - } -} - -.info { - @extend %color_infobar; - background-color: $info_color; - - &:backdrop { - background-color:lighten($info_color,10%); - color: $backdrop_selected_fg_color; - } -} - -.warning { - @extend %color_infobar; - background-color: $warning_color; - - &:backdrop { - background-color:lighten($warning_color,10%); - color: $backdrop_selected_fg_color; - } -} - -.question { - @extend %color_infobar; - background-color: $question_color; - - &:backdrop { - background-color:lighten($question_color,10%); - color: $backdrop_selected_fg_color; - } - -} - -.error { - @extend %color_infobar; - background-color: $error_color; - - &:backdrop { - background-color:lighten($error_color,10%); - color: $backdrop_selected_fg_color; - } -} + %infobar, + infobar { + text-shadow: none; + color: $fg_color; + background-color: $bg_color; + border-bottom:1px solid darken($bg_color,10%); + box-shadow: none; + + } + + %color_infobar { + + @extend %infobar; + + text-shadow: none; + color: $selected_fg_color; + border:none; + + .label { + color: $selected_fg_color; + + &:backdrop { + color: $backdrop_selected_fg_color; + } + } + + button { + border-radius: 2px; + border: none; + background: transparentize($base_color, 0.02); + color: $fg_color; + box-shadow: 0 1px 0 0 transparentize(black, 0.8); + + .label { + color: $fg_color; + } + + &:active { + background: $base_color; + color: $fg_color; + + box-shadow: 0 1px 2px 0 transparentize(black, 0.6); + + &:backdrop { + background: transparentize($base_color, 0.2); + color: transparentize($fg_color, 0.5); + box-shadow: none; + } + } + + &:hover, + &:focus { + box-shadow: 0 1px 2px 0 transparentize(black, 0.6); + } + + &:disabled { + background: transparentize($base_color, 0.4); + color: transparentize($fg_color, 0.5); + box-shadow: none; + + &:backdrop { + background: transparentize($base_color, 0.5); + color: transparentize($fg_color, 0.5); + box-shadow: none; + } + } + + &:backdrop { + background: transparentize($base_color, 0.2); + color: transparentize($fg_color, 0.5); + box-shadow: none; + } + } + } + + .info { + @extend %color_infobar; + + &, &:backdrop { + color: $info_color; + background-color: transparent; + } + } + + .warning { + @extend %color_infobar; + + &, &:backdrop { + color: $warning_color; + background-color: transparent; + } + } + + .question { + @extend %color_infobar; + + &, &:backdrop { + color: $question_color; + background-color: transparent; + } + + } + + .error { + @extend %color_infobar; + + &, &:backdrop { + color: $error_color; + background-color: transparent; + } + } + \ No newline at end of file