diff --git a/Zukitre/gtk-2.0/gtkrc b/Zukitre/gtk-2.0/gtkrc index feb2835..cbb8590 100755 --- a/Zukitre/gtk-2.0/gtkrc +++ b/Zukitre/gtk-2.0/gtkrc @@ -643,18 +643,18 @@ style "xfwm-tabwin" Xfwm4TabwinWidget::listview-icon-size = 16 Xfwm4TabwinWidget::preview-size = 512 Xfwm4TabwinWidget::alpha = 0.8 - Xfwm4TabwinWidget::border-radius = 10 + Xfwm4TabwinWidget::border-radius = 4 bg[NORMAL] = shade (0.35, @bg_color_dark) bg[ACTIVE] = shade (0.65, @selected_bg_color) bg[PRELIGHT] = shade (0.85, @selected_bg_color) - bg[SELECTED] = shade (0.45, @bg_color_dark) + bg[SELECTED] = shade (0.45, @selected_bg_color) fg[NORMAL] = shade (0.8, @base_color) fg[ACTIVE] = @base_color fg[PRELIGHT] = @base_color engine "murrine" { - roundness = 6 + roundness = 2 contrast = 0.8 highlight_shade = 1.00 lightborder_shade = 1.0 diff --git a/Zukitre/gtk-3.0/_other.scss b/Zukitre/gtk-3.0/_other.scss index 277d93f..e3696b1 100644 --- a/Zukitre/gtk-3.0/_other.scss +++ b/Zukitre/gtk-3.0/_other.scss @@ -68,6 +68,36 @@ XfceHeading, } } +// Xfwm4's alt-tab dialog, aka "tabwin" +#xfwm-tabwin { + padding: 12px; + background-image: none; + background-color: transparentize(black, 0.2); + color: shade($selected_fg_color, 0.65); + text-shadow: 0px 1px transparentize(black, 0.2); + border-radius: 4px; + // Set the application icon- and preview-size to 64px + -XfwmTabwinWidget-icon-size: 64px; + -XfwmTabwinWidget-preview-size: 64px; + + button { + background-image: none; + color: $selected_fg_color; + font-weight: bold; + text-shadow: 0px 1px transparentize(black, 0.2); + border: none; + border-radius: 2px; + box-shadow: none; + + &:active, &:checked, &:active:hover, &:checked:hover { + background-color: $selected_bg_color; + } + &:hover { + background-color: $selected_bg_color; + } + } +} + // Temporary fixes for certain XFCE applets using GTK3 #pulseaudio-button, #indicator-button { @extend %panelbutton; diff --git a/Zukitre/gtk-3.0/gtk-contained-dark.css b/Zukitre/gtk-3.0/gtk-contained-dark.css index 56dbe10..81aec15 100644 --- a/Zukitre/gtk-3.0/gtk-contained-dark.css +++ b/Zukitre/gtk-3.0/gtk-contained-dark.css @@ -1828,6 +1828,14 @@ XfceHeading, .XfceHeading { margin: 0; padding: 0; border-width: 0; background-i .xfce4-panel menu button:disabled > .label { color: inherit; } +#xfwm-tabwin { padding: 12px; background-image: none; background-color: rgba(0, 0, 0, 0.8); color: shade(#ffffff, 0.65); text-shadow: 0px 1px rgba(0, 0, 0, 0.8); border-radius: 4px; -XfwmTabwinWidget-icon-size: 64px; -XfwmTabwinWidget-preview-size: 64px; } + +#xfwm-tabwin button { background-image: none; color: #ffffff; font-weight: bold; text-shadow: 0px 1px rgba(0, 0, 0, 0.8); border: none; border-radius: 2px; box-shadow: none; } + +#xfwm-tabwin button:active, #xfwm-tabwin button:checked, #xfwm-tabwin button:active:hover, #xfwm-tabwin button:checked:hover { background-color: #3399ff; } + +#xfwm-tabwin button:hover { background-color: #3399ff; } + /* Mate/Gnome Flashback Panel */ .gnome-panel-menu-bar, .gnome-panel-menu-bar menubar, .mate-panel-menu-bar, .mate-panel-menu-bar menubar { background-color: #273238; } diff --git a/Zukitre/gtk-3.0/gtk-contained.css b/Zukitre/gtk-3.0/gtk-contained.css index a9c9062..ef0e1fe 100644 --- a/Zukitre/gtk-3.0/gtk-contained.css +++ b/Zukitre/gtk-3.0/gtk-contained.css @@ -1872,6 +1872,14 @@ XfceHeading, .XfceHeading { margin: 0; padding: 0; border-width: 0; background-i .xfce4-panel menu button:disabled > .label { color: inherit; } +#xfwm-tabwin { padding: 12px; background-image: none; background-color: rgba(0, 0, 0, 0.8); color: shade(#ffffff, 0.65); text-shadow: 0px 1px rgba(0, 0, 0, 0.8); border-radius: 4px; -XfwmTabwinWidget-icon-size: 64px; -XfwmTabwinWidget-preview-size: 64px; } + +#xfwm-tabwin button { background-image: none; color: #ffffff; font-weight: bold; text-shadow: 0px 1px rgba(0, 0, 0, 0.8); border: none; border-radius: 2px; box-shadow: none; } + +#xfwm-tabwin button:active, #xfwm-tabwin button:checked, #xfwm-tabwin button:active:hover, #xfwm-tabwin button:checked:hover { background-color: #3399ff; } + +#xfwm-tabwin button:hover { background-color: #3399ff; } + /* Mate/Gnome Flashback Panel */ .gnome-panel-menu-bar, .gnome-panel-menu-bar menubar, .mate-panel-menu-bar, .mate-panel-menu-bar menubar { background-color: #273238; } diff --git a/Zukitwo/gtk-2.0/gtkrc b/Zukitwo/gtk-2.0/gtkrc index 92b288d..96fcaec 100755 --- a/Zukitwo/gtk-2.0/gtkrc +++ b/Zukitwo/gtk-2.0/gtkrc @@ -584,18 +584,18 @@ style "xfwm-tabwin" Xfwm4TabwinWidget::listview-icon-size = 16 Xfwm4TabwinWidget::preview-size = 512 Xfwm4TabwinWidget::alpha = 0.8 - Xfwm4TabwinWidget::border-radius = 10 + Xfwm4TabwinWidget::border-radius = 7 bg[NORMAL] = shade (0.35, @bg_color_dark) bg[ACTIVE] = shade (0.65, @selected_bg_color) bg[PRELIGHT] = shade (0.85, @selected_bg_color) - bg[SELECTED] = shade (0.45, @bg_color_dark) + bg[SELECTED] = shade (0.45, @selected_bg_color) fg[NORMAL] = shade (0.8, @base_color) fg[ACTIVE] = @base_color fg[PRELIGHT] = @base_color engine "murrine" { - roundness = 6 + roundness = 4 contrast = 0.8 highlight_shade = 1.00 lightborder_shade = 1.0 diff --git a/Zukitwo/gtk-3.0/_other.scss b/Zukitwo/gtk-3.0/_other.scss index 5d6a38e..967b544 100644 --- a/Zukitwo/gtk-3.0/_other.scss +++ b/Zukitwo/gtk-3.0/_other.scss @@ -81,6 +81,36 @@ XfceHeading, } } +// Xfwm4's alt-tab dialog, aka "tabwin" +#xfwm-tabwin { + padding: 12px; + background-image: none; + background-color: transparentize(black, 0.2); + color: shade($selected_fg_color, 0.65); + text-shadow: 0px 1px transparentize(black, 0.2); + border-radius: 7px; + // Set the application icon- and preview-size to 64px + -XfwmTabwinWidget-icon-size: 64px; + -XfwmTabwinWidget-preview-size: 64px; + + button { + background-image: none; + color: $selected_fg_color; + font-weight: bold; + text-shadow: 0px 1px transparentize(black, 0.2); + border: none; + border-radius: 4px; + box-shadow: none; + + &:active, &:checked, &:active:hover, &:checked:hover { + background-color: $selected_bg_color; + } + &:hover { + background-color: $selected_bg_color; + } + } +} + // Temporary fixes for certain XFCE applets using GTK3 #pulseaudio-button, #indicator-button { @extend %panelbutton; diff --git a/Zukitwo/gtk-3.0/gtk-contained-dark.css b/Zukitwo/gtk-3.0/gtk-contained-dark.css index edaef2d..058fd18 100644 --- a/Zukitwo/gtk-3.0/gtk-contained-dark.css +++ b/Zukitwo/gtk-3.0/gtk-contained-dark.css @@ -1820,6 +1820,14 @@ XfceHeading, .XfceHeading { margin: 0; padding: 0; border-width: 0; background-i .xfce4-panel menu button:disabled > .label { color: inherit; } +#xfwm-tabwin { padding: 12px; background-image: none; background-color: rgba(0, 0, 0, 0.8); color: shade(#ffffff, 0.65); text-shadow: 0px 1px rgba(0, 0, 0, 0.8); border-radius: 7px; -XfwmTabwinWidget-icon-size: 64px; -XfwmTabwinWidget-preview-size: 64px; } + +#xfwm-tabwin button { background-image: none; color: #ffffff; font-weight: bold; text-shadow: 0px 1px rgba(0, 0, 0, 0.8); border: none; border-radius: 4px; box-shadow: none; } + +#xfwm-tabwin button:active, #xfwm-tabwin button:checked, #xfwm-tabwin button:active:hover, #xfwm-tabwin button:checked:hover { background-color: #3399ff; } + +#xfwm-tabwin button:hover { background-color: #3399ff; } + /* Mate/Gnome Flashback Panel */ .gnome-panel-menu-bar, .gnome-panel-menu-bar menubar, .mate-panel-menu-bar, .mate-panel-menu-bar menubar { background-color: #2b3137; } diff --git a/Zukitwo/gtk-3.0/gtk-contained.css b/Zukitwo/gtk-3.0/gtk-contained.css index 03353d3..6dbc4d0 100644 --- a/Zukitwo/gtk-3.0/gtk-contained.css +++ b/Zukitwo/gtk-3.0/gtk-contained.css @@ -1864,6 +1864,14 @@ XfceHeading, .XfceHeading { margin: 0; padding: 0; border-width: 0; background-i .xfce4-panel menu button:disabled > .label { color: inherit; } +#xfwm-tabwin { padding: 12px; background-image: none; background-color: rgba(0, 0, 0, 0.8); color: shade(#ffffff, 0.65); text-shadow: 0px 1px rgba(0, 0, 0, 0.8); border-radius: 7px; -XfwmTabwinWidget-icon-size: 64px; -XfwmTabwinWidget-preview-size: 64px; } + +#xfwm-tabwin button { background-image: none; color: #ffffff; font-weight: bold; text-shadow: 0px 1px rgba(0, 0, 0, 0.8); border: none; border-radius: 4px; box-shadow: none; } + +#xfwm-tabwin button:active, #xfwm-tabwin button:checked, #xfwm-tabwin button:active:hover, #xfwm-tabwin button:checked:hover { background-color: #3399ff; } + +#xfwm-tabwin button:hover { background-color: #3399ff; } + /* Mate/Gnome Flashback Panel */ .gnome-panel-menu-bar, .gnome-panel-menu-bar menubar, .mate-panel-menu-bar, .mate-panel-menu-bar menubar { background-color: #2b3137; }