Fix #11

lassekongo83 · Jan 31, 2019 · 7c106d9 · 7c106d9
1 parent fa64035
commit 7c106d9
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 11 deletions.
diff --git a/src/gtk-2.0/gtkrc b/src/gtk-2.0/gtkrc
@@ -625,7 +625,7 @@ style "xfwm-tabwin"
     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

diff --git a/src/gtk-3.0/_apps.scss b/src/gtk-3.0/_apps.scss
@@ -69,6 +69,37 @@ 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: 12px;
+  // 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: 6px;
+    box-shadow: none;
+
+    &:active, &:checked, &:active:hover, &:checked:hover {
+      background-color: $selected_bg_color;
+    }
+    &:hover {
+      background-color: $selected_bg_color;
+      transition-duration: $shortest_duration;
+    }
+  }
+}
+
 // Temporary fixes for certain XFCE applets using GTK3
 #pulseaudio-button, #indicator-button {
   @extend %panelbutton;
@@ -216,17 +247,15 @@ window.background.chromium {
 
 // Firefox
 #MozillaGtkWidget.background  {
+  &.default-decoration,
   headerbar.titlebar {
-    //Remove the round corners until firefox fixed the white border bleed at the top edges
-    border-radius: 0;
-
     button.titlebutton { @extend %titlebutton; }
   }
 
   > menu > menuitem { border-radius: 0; } // Removed rounded menu corners
   > menu, .menu, .context-menu {
       .separator:not(label),
-      .csd & .separator:not(label) { color: darken($dark_bg_color, 5%); }    
+      .csd & .separator:not(label) { color: darken($dark_bg_color, 5%); }
     }
 
   // box-shadows doesn't work, so a border color is needed on the entries and buttons instead

diff --git a/src/gtk-3.0/gtk-dark.css b/src/gtk-3.0/gtk-dark.css
@@ -1481,7 +1481,7 @@ messagedialog.csd decoration { border-radius: 2px; box-shadow: 0 1px 2px rgba(0,
 
 .solid-csd decoration { border-radius: 0; margin: 4px; background-color: #444240; border: solid 1px #21201f; box-shadow: none; }
 
-.ssd .titlebar.default-decoration button.titlebutton, headerbar button.titlebutton, .titlebar button.titlebutton, #MozillaGtkWidget.background headerbar.titlebar button.titlebutton { min-width: 22px; min-height: 22px; padding: 0; margin: 2px; }
+.ssd .titlebar.default-decoration button.titlebutton, headerbar button.titlebutton, .titlebar button.titlebutton, #MozillaGtkWidget.background.default-decoration button.titlebutton, #MozillaGtkWidget.background headerbar.titlebar button.titlebutton { min-width: 22px; min-height: 22px; padding: 0; margin: 2px; }
 
 .ssd .titlebar { border-width: 0; background-color: #444240; box-shadow: inset 0 1px rgba(255, 255, 255, 0.04); padding: 2px 4px; }
 
@@ -1689,6 +1689,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: 12px; -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: 6px; box-shadow: none; }
+
+#xfwm-tabwin button:active, #xfwm-tabwin button:checked, #xfwm-tabwin button:active:hover, #xfwm-tabwin button:checked:hover { background-color: #fb6f55; }
+
+#xfwm-tabwin button:hover { background-color: #fb6f55; transition-duration: 100ms; }
+
 .gnome-panel-menu-bar, .gnome-panel-menu-bar menubar, .mate-panel-menu-bar, .mate-panel-menu-bar menubar { background-color: #444240; }
 
 .gnome-panel-menu-bar menubar, .gnome-panel-menu-bar #PanelApplet label, .gnome-panel-menu-bar #PanelApplet image, .mate-panel-menu-bar menubar, .mate-panel-menu-bar #PanelApplet label, .mate-panel-menu-bar #PanelApplet image { color: #f2f1f0; }
@@ -1749,8 +1757,6 @@ window.background.chromium menubar { color: #f2f1f0; }
 
 .gedit-search-slider button:last-child, .gedit-search-slider button:hover:last-child { border-left: 0; }
 
-#MozillaGtkWidget.background headerbar.titlebar { border-radius: 0; }
-
 #MozillaGtkWidget.background > menu > menuitem { border-radius: 0; }
 
 #MozillaGtkWidget.background > menu .separator:not(label), .csd #MozillaGtkWidget.background > menu .separator:not(label), #MozillaGtkWidget.background .menu .separator:not(label), .csd #MozillaGtkWidget.background .menu .separator:not(label), #MozillaGtkWidget.background .context-menu .separator:not(label), .csd #MozillaGtkWidget.background .context-menu .separator:not(label) { color: #373534; }

diff --git a/src/gtk-3.0/gtk.css b/src/gtk-3.0/gtk.css
@@ -1491,7 +1491,7 @@ messagedialog.csd decoration { border-radius: 2px; box-shadow: 0 1px 2px rgba(0,
 
 .solid-csd decoration { border-radius: 0; margin: 4px; background-color: #dededc; border: solid 1px #bdbdb9; box-shadow: none; }
 
-.ssd .titlebar.default-decoration button.titlebutton, headerbar button.titlebutton, .titlebar button.titlebutton, #MozillaGtkWidget.background headerbar.titlebar button.titlebutton { min-width: 22px; min-height: 22px; padding: 0; margin: 2px; }
+.ssd .titlebar.default-decoration button.titlebutton, headerbar button.titlebutton, .titlebar button.titlebutton, #MozillaGtkWidget.background.default-decoration button.titlebutton, #MozillaGtkWidget.background headerbar.titlebar button.titlebutton { min-width: 22px; min-height: 22px; padding: 0; margin: 2px; }
 
 .ssd .titlebar { border-width: 0; background-color: #444240; box-shadow: inset 0 1px rgba(255, 255, 255, 0.04); padding: 2px 4px; }
 
@@ -1699,6 +1699,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: 12px; -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: 6px; box-shadow: none; }
+
+#xfwm-tabwin button:active, #xfwm-tabwin button:checked, #xfwm-tabwin button:active:hover, #xfwm-tabwin button:checked:hover { background-color: #fb6f55; }
+
+#xfwm-tabwin button:hover { background-color: #fb6f55; transition-duration: 100ms; }
+
 .gnome-panel-menu-bar, .gnome-panel-menu-bar menubar, .mate-panel-menu-bar, .mate-panel-menu-bar menubar { background-color: #444240; }
 
 .gnome-panel-menu-bar menubar, .gnome-panel-menu-bar #PanelApplet label, .gnome-panel-menu-bar #PanelApplet image, .mate-panel-menu-bar menubar, .mate-panel-menu-bar #PanelApplet label, .mate-panel-menu-bar #PanelApplet image { color: #f2f1f0; }
@@ -1759,8 +1767,6 @@ window.background.chromium menubar { color: #f2f1f0; }
 
 .gedit-search-slider button:last-child, .gedit-search-slider button:hover:last-child { border-left: 0; }
 
-#MozillaGtkWidget.background headerbar.titlebar { border-radius: 0; }
-
 #MozillaGtkWidget.background > menu > menuitem { border-radius: 0; }
 
 #MozillaGtkWidget.background > menu .separator:not(label), .csd #MozillaGtkWidget.background > menu .separator:not(label), #MozillaGtkWidget.background .menu .separator:not(label), .csd #MozillaGtkWidget.background .menu .separator:not(label), #MozillaGtkWidget.background .context-menu .separator:not(label), .csd #MozillaGtkWidget.background .context-menu .separator:not(label) { color: #373534; }