Update zuki-themes

lassekongo83 · May 27, 2020 · e965413 · e965413
1 parent 1959a74
commit e965413
Show file tree

Hide file tree

Showing 40 changed files with 16,238 additions and 5,826 deletions.
diff --git a/gtk/src/Zukitre-dark/gtk-2.0/gtkrc b/gtk/src/Zukitre-dark/gtk-2.0/gtkrc
@@ -1033,84 +1033,6 @@ style "iconview" {
   }
 }
 
-style "xfce-header" {
-  base[NORMAL] = shade (1.18, @bg_color)
-  engine "murrine" {}
-}
-
-style "xfwm-tabwin"
-{
-  Xfwm4TabwinWidget::border-width       = 0
-  Xfwm4TabwinWidget::icon-size          = 64
-  Xfwm4TabwinWidget::listview-icon-size = 24
-  Xfwm4TabwinWidget::preview-size       = 128
-  Xfwm4TabwinWidget::alpha              = 0.8
-  Xfwm4TabwinWidget::border-radius      = 12
-
-  bg[NORMAL]   = shade (0.15, @text_color)
-  bg[ACTIVE]   = shade (0.65, @selected_bg_color)
-  bg[PRELIGHT] = shade (0.75, @selected_bg_color)
-  bg[SELECTED] = shade (0.55, @bg_color)
-
-  fg[NORMAL]   = shade (0.8, @fg_color)
-  fg[ACTIVE]   = @selected_fg_color
-  fg[PRELIGHT] = @selected_fg_color
-
-  engine "murrine" {
-    roundness  = 2
-    textstyle  = 1
-    text_shade = 0.25
-  }
-}
-
-style "xfwm-tabwin-button" {
-  font_name = "bold"
-}
-
-style "xfdesktop-icon-view" {
-  XfdesktopIconView::label-alpha                = 0
-  XfdesktopIconView::selected-label-alpha       = 80
-  XfdesktopIconView::shadow-x-offset            = 0
-  XfdesktopIconView::shadow-y-offset            = 1
-  XfdesktopIconView::selected-shadow-x-offset   = 0
-  XfdesktopIconView::selected-shadow-y-offset   = 1
-  XfdesktopIconView::shadow-color               = shade(1.5, @tooltip_bg_color)
-  XfdesktopIconView::selected-shadow-color      = shade(1.8, @tooltip_bg_color)
-  XfdesktopIconView::shadow-blur-radius         = 2
-  XfdesktopIconView::cell-spacing               = 2
-  XfdesktopIconView::cell-padding               = 6
-  XfdesktopIconView::cell-text-width-proportion = 1.9
-
-  fg[NORMAL] = shade (0.9, @selected_fg_color)
-  fg[ACTIVE] = @selected_fg_color
-
-  engine "murrine" {}
-}
-
-style "xfsm-logout" {
-  GtkDialog::content-area-border  = 12
-  GtkDialog::content-area-spacing = 6
-  GtkDialog::action-area-spacing  = 0
-
-  bg_pixmap[NORMAL] = "xfsmlogout.png"
-
-  bg[NORMAL]   = @bg_color
-  bg[SELECTED] = shade (1.18, @bg_color) # Border around the dialog
-  fg[NORMAL]   = @fg_color
-
-  engine "murrine" {}
-}
-
-style "xfsm-label" {
-  font_name = "14"
-
-  engine "murrine" {}
-}
-
-style "xfsm-button" = "button" {
-  engine "murrine" {}
-}
-
 style "calendar" {
   fg[NORMAL]   = "#FFFFFF"
   fg[PRELIGHT] = "#FFFFFF"
@@ -1202,16 +1124,6 @@ widget_class "*.<GtkList>.<GtkButton>"     style "treeview-header"
 widget_class "*.<GtkCList>.<GtkButton>"    style "treeview-header"
 widget_class "*GnmSimpleCanvas*"           style "treeview-header" # Gnumeric treeview-headers
 
-# Xfce specific theming
-widget_class "*ExoIconView*"                              style "iconview"
-widget_class "*XfceHeading*"                              style "xfce-header"
-widget "xfwm4-tabwin*"                                    style "xfwm-tabwin"
-widget "xfwm4-tabwin*GtkButton*"                          style "xfwm-tabwin-button"
-widget_class "*XfsmLogoutDialog*"                         style "xfsm-logout"
-widget_class "*XfsmLogoutDialog*GtkVBox.GtkVBox.GtkLabel" style "xfsm-label"
-widget_class "*XfsmLogoutDialog*GtkButton*"               style "xfsm-button"
-widget_class "*XfdesktopIconView*"                        style "xfdesktop-icon-view"
-
 widget_class "*<OsScrollbar>" style "overlay-scrollbar"
 widget_class "*<OsThumb>"     style "overlay-scrollbar"
 
@@ -1264,6 +1176,3 @@ widget_class "*<GtkListItem>*"     style "fg-is-text-color-workaround"
 # Only match GtkCList and not the parent widgets, because that would also change the headers.
 widget_class "*<GtkCList>"         style "fg-is-text-color-workaround"
 widget_class "*<EelEditableLabel>" style "fg-is-text-color-workaround"
-
-# panel theming
-include "xfce-panel.rc"
diff --git a/gtk/src/Zukitre/gtk-2.0/gtkrc b/gtk/src/Zukitre/gtk-2.0/gtkrc
@@ -1015,7 +1015,6 @@ style "toolbar-separator" {
   GtkWidget::separator-width      = 7
   GtkWidget::separator-height     = 1
 
-
   engine "murrine" {
     contrast       = 1.0
     separatorstyle = 0
@@ -1032,84 +1031,6 @@ style "iconview" {
   }
 }
 
-style "xfce-header" {
-  base[NORMAL] = shade (1.18, @bg_color)
-  engine "murrine" {}
-}
-
-style "xfwm-tabwin"
-{
-  Xfwm4TabwinWidget::border-width       = 0
-  Xfwm4TabwinWidget::icon-size          = 64
-  Xfwm4TabwinWidget::listview-icon-size = 24
-  Xfwm4TabwinWidget::preview-size       = 128
-  Xfwm4TabwinWidget::alpha              = 0.8
-  Xfwm4TabwinWidget::border-radius      = 12
-
-  bg[NORMAL]   = shade (0.15, @text_color)
-  bg[ACTIVE]   = shade (0.65, @selected_bg_color)
-  bg[PRELIGHT] = shade (0.75, @selected_bg_color)
-  bg[SELECTED] = shade (0.55, @bg_color)
-
-  fg[NORMAL]   = shade (0.8, @base_color)
-  fg[ACTIVE]   = @base_color
-  fg[PRELIGHT] = @base_color
-
-  engine "murrine" {
-    roundness  = 2
-    textstyle  = 1
-    text_shade = 0.25
-  }
-}
-
-style "xfwm-tabwin-button" {
-  font_name = "bold"
-}
-
-style "xfdesktop-icon-view" {
-  XfdesktopIconView::label-alpha                = 0
-  XfdesktopIconView::selected-label-alpha       = 80
-  XfdesktopIconView::shadow-x-offset            = 0
-  XfdesktopIconView::shadow-y-offset            = 1
-  XfdesktopIconView::selected-shadow-x-offset   = 0
-  XfdesktopIconView::selected-shadow-y-offset   = 1
-  XfdesktopIconView::shadow-color               = shade(1.5, @tooltip_bg_color)
-  XfdesktopIconView::selected-shadow-color      = shade(1.8, @tooltip_bg_color)
-  XfdesktopIconView::shadow-blur-radius         = 2
-  XfdesktopIconView::cell-spacing               = 2
-  XfdesktopIconView::cell-padding               = 6
-  XfdesktopIconView::cell-text-width-proportion = 1.9
-
-  fg[NORMAL] = shade (0.9, @selected_fg_color)
-  fg[ACTIVE] = @selected_fg_color
-
-  engine "murrine" {}
-}
-
-style "xfsm-logout" {
-  GtkDialog::content-area-border  = 12
-  GtkDialog::content-area-spacing = 6
-  GtkDialog::action-area-spacing  = 0
-
-  bg_pixmap[NORMAL] = "xfsmlogout.png"
-
-  bg[NORMAL]   = @bg_color
-  bg[SELECTED] = shade (1.18, @bg_color) # Border around the dialog
-  fg[NORMAL]   = @fg_color
-
-  engine "murrine" {}
-}
-
-style "xfsm-label" {
-  font_name = "14"
-
-  engine "murrine" {}
-}
-
-style "xfsm-button" = "button" {
-  engine "murrine" {}
-}
-
 style "calendar" {
   fg[NORMAL]   = "#FFFFFF"
   fg[PRELIGHT] = "#FFFFFF"
@@ -1201,16 +1122,6 @@ widget_class "*.<GtkList>.<GtkButton>"     style "treeview-header"
 widget_class "*.<GtkCList>.<GtkButton>"    style "treeview-header"
 widget_class "*GnmSimpleCanvas*"           style "treeview-header" # Gnumeric treeview-headers
 
-# Xfce specific theming
-widget_class "*ExoIconView*"                              style "iconview"
-widget_class "*XfceHeading*"                              style "xfce-header"
-widget "xfwm4-tabwin*"                                    style "xfwm-tabwin"
-widget "xfwm4-tabwin*GtkButton*"                          style "xfwm-tabwin-button"
-widget_class "*XfsmLogoutDialog*"                         style "xfsm-logout"
-widget_class "*XfsmLogoutDialog*GtkVBox.GtkVBox.GtkLabel" style "xfsm-label"
-widget_class "*XfsmLogoutDialog*GtkButton*"               style "xfsm-button"
-widget_class "*XfdesktopIconView*"                        style "xfdesktop-icon-view"
-
 widget_class "*<OsScrollbar>" style "overlay-scrollbar"
 widget_class "*<OsThumb>"     style "overlay-scrollbar"
 
@@ -1263,6 +1174,3 @@ widget_class "*<GtkListItem>*"     style "fg-is-text-color-workaround"
 # Only match GtkCList and not the parent widgets, because that would also change the headers.
 widget_class "*<GtkCList>"         style "fg-is-text-color-workaround"
 widget_class "*<EelEditableLabel>" style "fg-is-text-color-workaround"
-
-# panel theming
-include "xfce-panel.rc"
diff --git a/gtk/src/Zukitre/gtk-3.0/README.md b/gtk/src/Zukitre/gtk-3.0/README.md
@@ -15,12 +15,10 @@ It is very likely your change will happen in the `_common.scss` file. That's whe
 | _colors-public.scss | SCSS colors exported through gtk to allow for 3rd party apps color mixing.
 | _drawing.scss       | drawing helper mixings/functions to allow easier definition of widget drawing under specific context. This is why the theme isn't 15000 LOC.
 | _common.scss        | actual definitions of style for each widget. This is where you are likely to add/remove your changes.
-| _apps.scss          | Application specific styles.
-| _variables.scss     | Some commonly used variables.
+| _custom.scss        | some larger tweaks to the adwaita base. (xfce, titlebuttons, etc.)
 
 You can read about SASS at http://sass-lang.com/documentation/. Once you make your changes to the the scss files, use `./parse-sass.sh` to generate the CSS files.
 
 ### How to edit the assets
 
 The assets are created in the `assets.svg` file and then rendered with `./render-assets.sh` by fetching the object id name from `assets.txt`. If you're going to edit an image in inkscape make sure the object id is the same when you're saving. If you're going to create a new asset you need to add the object id in assets.txt.
-
diff --git a/gtk/src/Zukitre/gtk-3.0/_colors-public.scss b/gtk/src/Zukitre/gtk-3.0/_colors-public.scss
@@ -6,58 +6,61 @@
 // Sass thinks we're using the colors in the variables as strings and may shoot
 // warning, it's innocuous and can be defeated by using "" + $var
 
-//widget text/foreground color
+// widget text/foreground color
 @define-color theme_fg_color #{"" +$fg_color};
 
-//text color for entries, views and content in general
+// text color for entries, views and content in general
 @define-color theme_text_color #{"" +$text_color};
 
 //widget base background color
 @define-color theme_bg_color #{"" +$bg_color};
 
-//text widgets and the like base background color
+// text widgets and the like base background color
 @define-color theme_base_color #{"" +$base_color};
 
-//base background color of selections
+// base background color of selections
 @define-color theme_selected_bg_color #{"" +$selected_bg_color};
 
-//text/foreground color of selections
+// text/foreground color of selections
 @define-color theme_selected_fg_color #{"" +$selected_fg_color};
 
-//base background color of insensitive widgets
+// base background color of insensitive widgets
 @define-color insensitive_bg_color #{"" +$insensitive_bg_color};
 
-//text foreground color of insensitive widgets
+// text foreground color of insensitive widgets
 @define-color insensitive_fg_color #{"" +$insensitive_fg_color};
 
-//insensitive text widgets and the like base background color
+// insensitive text widgets and the like base background color
 @define-color insensitive_base_color #{"" +$base_color};
 
-//widget text/foreground color on backdrop windows
+// widget text/foreground color on backdrop windows
 @define-color theme_unfocused_fg_color #{"" +$backdrop_fg_color};
 
-//text color for entries, views and content in general on backdrop windows
+// text color for entries, views and content in general on backdrop windows
 @define-color theme_unfocused_text_color #{"" +$text_color};
 
-//widget base background color on backdrop windows
+// widget base background color on backdrop windows
 @define-color theme_unfocused_bg_color #{"" +$backdrop_bg_color};
 
-//text widgets and the like base background color on backdrop windows
+// text widgets and the like base background color on backdrop windows
 @define-color theme_unfocused_base_color #{"" +$backdrop_base_color};
 
-//base background color of selections on backdrop windows
+// base background color of selections on backdrop windows
 @define-color theme_unfocused_selected_bg_color #{"" +$selected_bg_color};
 
-//text/foreground color of selections on backdrop windows
+// text/foreground color of selections on backdrop windows
 @define-color theme_unfocused_selected_fg_color #{"" + $selected_fg_color};
 
-//widgets main borders color
+// insensitive color on backdrop windows
+@define-color unfocused_insensitive_color #{"" + $backdrop_insensitive_color};
+
+// widgets main borders color
 @define-color borders #{"" +$borders_color};
 
-//widgets main borders color on backdrop windows
+// widgets main borders color on backdrop windows
 @define-color unfocused_borders #{"" +$backdrop_borders_color};
 
-//these are pretty self explicative
+// these are pretty self explicative
 @define-color warning_color #{"" +$warning_color};
 @define-color error_color #{"" +$error_color};
 @define-color success_color #{"" +$success_color};