diff --git a/gtk-3.0/_colors.scss b/gtk-3.0/_colors.scss index 6eef962..27969bb 100755 --- a/gtk-3.0/_colors.scss +++ b/gtk-3.0/_colors.scss @@ -76,9 +76,9 @@ $info_color: $lime; $question_color: $cyan; // Panel colors -$panel_bg_color: transparentize(black, 0.3); +$panel_bg_color: transparentize(darken($main_dark_color, 7%), 0.3); $panel_fg_color: white; -$panel_borders_color: transparentize(black, 0.8); +$panel_borders_color: transparentize(darken($main_dark_color, 7%), 0.8); // Disabled state colors $insensitive_fg_color: mix($fg_color, $bg_color, 50%); diff --git a/gtk-3.0/apps/_xfce.scss b/gtk-3.0/apps/_xfce.scss index 61f4312..bf3892e 100644 --- a/gtk-3.0/apps/_xfce.scss +++ b/gtk-3.0/apps/_xfce.scss @@ -1,7 +1,50 @@ +// Xfce Panel .xfce4-panel.panel { - background-color: $base_color; - color: $fg_color; -} + background-color: $panel_bg_color; + + text-shadow: none; + -gtk-icon-shadow: none; + + button.flat { @extend %panelbutton; } + } + + #tasklist-button { + color: transparentize($panel_fg_color, 0.2); + border-radius: 0; + border: none; + background-color: transparentize($panel_bg_color, 1); + + &:hover { + color: lighten($panel_fg_color, 10%); + background-color: transparentize(black, 0.83); + } + + &:checked { + color: white; + background-color: transparentize(black, 0.75); + box-shadow: inset 0 -2px $selected_bg_color; + } + } + + %panelbutton { + color: $panel_fg_color; + border-radius: 0; + border: none; + background-color: transparentize($panel_bg_color, 1); + + &:hover { + border: none; + background-color: lighten($panel_bg_color, 10%); + } + &:active, &:checked { + color: $selected_fg_color; + border: none; + background-color: $selected_bg_color; + + label, image { color: inherit; } + } + } + #whiskermenu-window button { diff --git a/gtk-3.0/gtk-dark.css b/gtk-3.0/gtk-dark.css index 3315917..63e7452 100755 --- a/gtk-3.0/gtk-dark.css +++ b/gtk-3.0/gtk-dark.css @@ -5637,8 +5637,37 @@ window.background.budgie-settings-window.csd > box.horizontal > stack > scrolled background-color: #161925; } .xfce4-panel.panel { - background-color: #181b28; - color: #C3C7D1; } + background-color: rgba(16, 16, 19, 0.7); + text-shadow: none; + -gtk-icon-shadow: none; } + +#tasklist-button { + color: rgba(255, 255, 255, 0.8); + border-radius: 0; + border: none; + background-color: rgba(16, 16, 19, 0); } + #tasklist-button:hover { + color: white; + background-color: rgba(0, 0, 0, 0.17); } + #tasklist-button:checked { + color: white; + background-color: rgba(0, 0, 0, 0.25); + box-shadow: inset 0 -2px #f7b922; } + +.xfce4-panel.panel button.flat { + color: white; + border-radius: 0; + border: none; + background-color: rgba(16, 16, 19, 0); } + .xfce4-panel.panel button.flat:hover { + border: none; + background-color: rgba(39, 40, 47, 0.7); } + .xfce4-panel.panel button.flat:active, .xfce4-panel.panel button.flat:checked { + color: #fefefe; + border: none; + background-color: #f7b922; } + .xfce4-panel.panel button.flat:active label, .xfce4-panel.panel button.flat:active image, .xfce4-panel.panel button.flat:checked label, .xfce4-panel.panel button.flat:checked image { + color: inherit; } #whiskermenu-window button { background-color: transparent; @@ -6005,7 +6034,7 @@ ConversationListView { * LightDm * ***********/ #panel_window { - background-color: rgba(0, 0, 0, 0.7); + background-color: rgba(16, 16, 19, 0.7); color: white; font-weight: bold; box-shadow: inset 0 -1px rgba(0, 0, 0, 0.7); } diff --git a/gtk-3.0/gtk.css b/gtk-3.0/gtk.css index 8879ea7..8fc073e 100755 --- a/gtk-3.0/gtk.css +++ b/gtk-3.0/gtk.css @@ -5662,8 +5662,37 @@ window.background.budgie-settings-window.csd > box.horizontal > stack > scrolled background-color: #e6e6e6; } .xfce4-panel.panel { - background-color: #ebf0f5; - color: #31363d; } + background-color: rgba(16, 16, 19, 0.7); + text-shadow: none; + -gtk-icon-shadow: none; } + +#tasklist-button { + color: rgba(255, 255, 255, 0.8); + border-radius: 0; + border: none; + background-color: rgba(16, 16, 19, 0); } + #tasklist-button:hover { + color: white; + background-color: rgba(0, 0, 0, 0.17); } + #tasklist-button:checked { + color: white; + background-color: rgba(0, 0, 0, 0.25); + box-shadow: inset 0 -2px #f7b922; } + +.xfce4-panel.panel button.flat { + color: white; + border-radius: 0; + border: none; + background-color: rgba(16, 16, 19, 0); } + .xfce4-panel.panel button.flat:hover { + border: none; + background-color: rgba(39, 40, 47, 0.7); } + .xfce4-panel.panel button.flat:active, .xfce4-panel.panel button.flat:checked { + color: #fefefe; + border: none; + background-color: #f7b922; } + .xfce4-panel.panel button.flat:active label, .xfce4-panel.panel button.flat:active image, .xfce4-panel.panel button.flat:checked label, .xfce4-panel.panel button.flat:checked image { + color: inherit; } #whiskermenu-window button { background-color: transparent; @@ -6030,7 +6059,7 @@ ConversationListView { * LightDm * ***********/ #panel_window { - background-color: rgba(0, 0, 0, 0.7); + background-color: rgba(16, 16, 19, 0.7); color: white; font-weight: bold; box-shadow: inset 0 -1px rgba(0, 0, 0, 0.7); }