diff --git a/Changelog.txt b/Changelog.txt index 69f6c9e..799f3a3 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -109,3 +109,5 @@ v0.9.2 (all themes; not Legacy) : Return to slimmer entry borders, new assets an v0.9.3 (all themes; Legacy support terminated) : Fixes to the gnome-shell theme as well as to the dark variant for better visibility of pressed buttons on the toolbar. v0.9.4 (all themes) : Added code for GNOME 3.18 increased compatibility, removed shadows for toolbar buttons for a cleaner look. + +v0.9.5 (all themes) : Fixes for MATE and LXDE panels, MATE menu is now BLACK, fixes to toolbar buttons as well as notebook header color. diff --git a/Windows 10 Dark/gtk-2.0/Apps/gnome-panel.rc b/Windows 10 Dark/gtk-2.0/Apps/gnome-panel.rc index b11d9f8..68346fe 100644 --- a/Windows 10 Dark/gtk-2.0/Apps/gnome-panel.rc +++ b/Windows 10 Dark/gtk-2.0/Apps/gnome-panel.rc @@ -10,11 +10,11 @@ style "panel" = "dark" bg_pixmap[NORMAL] = "Panel/panel.png" base[NORMAL] = "#000000" base[ACTIVE] = "#000000" - bg[NORMAL] = "#1e1e1e" + bg[NORMAL] = "#1e1e1e" bg[PRELIGHT] = "#066dc1" bg[SELECTED] = "#066dc1" text[NORMAL] = @fg_color_dark - text[ACTIVE] = "#ffffff" + text[ACTIVE] = @fg_color_dark engine "murrine" { diff --git a/Windows 10 Dark/gtk-2.0/Apps/mate.rc b/Windows 10 Dark/gtk-2.0/Apps/mate.rc new file mode 100644 index 0000000..e80420f --- /dev/null +++ b/Windows 10 Dark/gtk-2.0/Apps/mate.rc @@ -0,0 +1,16 @@ +style "mate-menu" +{ + bg[NORMAL] = "#000000" + bg[PRELIGHT] = "#1f1f1f" + bg[SELECTED] = "#004D8C" + bg[INSENSITIVE] = "#1f1f1f" + fg[NORMAL] = "#ffffff" + fg[PRELIGHT] = "#ffffff" + text[NORMAL] = @fg_color_dark + xthickness = 0 + ythickness = 0 +} + +widget_class "*-menu*" style "mate-menu" +widget "*-menu*" style "mate-menu" +class "*-menu*" style "mate-menu" diff --git a/Windows 10 Dark/gtk-2.0/Apps/mintmenu.rc b/Windows 10 Dark/gtk-2.0/Apps/mintmenu.rc index 2905f40..a57d758 100644 --- a/Windows 10 Dark/gtk-2.0/Apps/mintmenu.rc +++ b/Windows 10 Dark/gtk-2.0/Apps/mintmenu.rc @@ -2,7 +2,7 @@ style "mintmenu-style" { bg_pixmap[NORMAL] = "Panel/bc.png" fg[NORMAL] = @fg_color_dark - fg[ACTIVE] = shade (1.02, @fg_color) + fg[ACTIVE] = shade (1.02, @fg_color_dark) fg[PRELIGHT] = @selected_fg_color bg[PRELIGHT] = "#0f7bd1" bg[ACTIVE] = "#0f7bd1" diff --git a/Windows 10 Dark/gtk-2.0/Apps/xfce.rc b/Windows 10 Dark/gtk-2.0/Apps/xfce.rc index a03dac6..943a6f8 100644 --- a/Windows 10 Dark/gtk-2.0/Apps/xfce.rc +++ b/Windows 10 Dark/gtk-2.0/Apps/xfce.rc @@ -19,17 +19,6 @@ style "darktree" } widget "whiskermenu-window*TreeView*" style "darktree" -widget "matemenu-window*" style "darkback" - -style "darktree" -{ - base[NORMAL] = "#000000" - base[ACTIVE] = "#0b5a98" - text[NORMAL] = "#ccc" - text[ACTIVE] = "#fff" -} -widget "matemenu-window*TreeView*" style "darktree" - #Xfce-desktop text settings style "xfdesktop-icon-view" { XfdesktopIconView::label-alpha = 0 @@ -41,14 +30,3 @@ fg[ACTIVE] = "#ffffff" } widget_class "*XfdesktopIconView*" style "xfdesktop-icon-view" - -style "panel" -{ -bg[NORMAL] = "#000000" -xthickness = 0 -ythickness = 0 -} - -widget_class "*Panel*" style "panel" -widget "*Panel*" style "panel" -class "*Panel*" style "panel" diff --git a/Windows 10 Dark/gtk-2.0/gtkrc b/Windows 10 Dark/gtk-2.0/gtkrc index ab0ed26..7450df8 100644 --- a/Windows 10 Dark/gtk-2.0/gtkrc +++ b/Windows 10 Dark/gtk-2.0/gtkrc @@ -3,7 +3,7 @@ # date: January 27th, 2016 # description: Windows 10 Dark Granite color -gtk-color-scheme = "bg_color:#1F1F1F\nfg_color:#c9c9c9\nbase_color:#1f1f1f\ntext_color:#c9c9c9\nselected_bg_color:#004D8C\nselected_fg_color:#b5b5b5\ntooltip_bg_color:#1F1F1F\ntooltip_fg_color:#ffffff\ntitlebar_bg_color:#1F1F1F\ntitlebar_fg_color:#ffffff\nmenubar_bg_color:#1F1F1F\nmenubar_fg_color:#ffffff\ntoolbar_bg_color:#1f1f1f\ntoolbar_fg_color:#c9c9c9\nmenu_bg_color:#1f1f1f\nmenu_fg_color:#ffffff\npanel_bg_color:#1F1F1F\npanel_fg_color:#ffffff\nlink_color:#224ba0\nbg_color_dark:#000000\nfg_color_dark:#ffffff\ncheckradio_fg_color:#4c4c4c\nwindow-color:#0070da" +gtk-color-scheme = "bg_color:#1F1F1F\nfg_color:#c9c9c9\nbase_color:#1f1f1f\ntext_color:#c9c9c9\nselected_bg_color:#004D8C\nselected_fg_color:#b5b5b5\ntooltip_bg_color:#1F1F1F\ntooltip_fg_color:#ffffff\ntitlebar_bg_color:#1F1F1F\ntitlebar_fg_color:#ffffff\nmenubar_bg_color:#1F1F1F\nmenubar_fg_color:#ffffff\ntoolbar_bg_color:#1f1f1f\ntoolbar_fg_color:#c9c9c9\nmenu_bg_color:#1f1f1f\nmenu_fg_color:#ffffff\npanel_bg_color:#1F1F1F\npanel_fg_color:#ffffff\nlink_color:#224ba0\nbg_color_dark:#000000\nfg_color_dark:#ffffff\ncheckradio_fg_color:#4c4c4c" # Scrollbar colors gtk-color-scheme = "scrollthrough_bg_color:#e6e6e6\nscrollpress_bg_color:#808080\nscrollhover_bg_color:#cfcfcf\nscrollnorm_bg_color:#c6c6c6" @@ -828,4 +828,5 @@ include "Apps/ff.rc" include "Apps/gnome-panel.rc" #include "Apps/panel-menus.rc" include "Apps/mintmenu.rc" +include "Apps/mate.rc" include "Apps/xfce.rc" diff --git a/Windows 10 Dark/gtk-3.0/apps/gnome-applications.css b/Windows 10 Dark/gtk-3.0/apps/gnome-applications.css index bd2ccc7..e5f24ae 100644 --- a/Windows 10 Dark/gtk-3.0/apps/gnome-applications.css +++ b/Windows 10 Dark/gtk-3.0/apps/gnome-applications.css @@ -81,7 +81,7 @@ WnckPager, WnckTasklist { * nautilus * ************/ .nautilus-canvas-item { - border-radius: 2px; + border-radius: 0px; } .nautilus-desktop.nautilus-canvas-item { @@ -233,7 +233,7 @@ GeditWindow .pane-separator:hover { .gedit-document-panel .list-row .button { padding: 1px; border-image: none; - border-radius: 2px; + border-radius: 0px; border-style: solid; border-color: transparent; border-width: 1px; @@ -301,7 +301,7 @@ GeditStatusMenuButton.button:active { GeditViewFrame .gedit-search-slider { padding: 4px; - border-radius: 0 0 2px 2px; + border-radius: 0 0 0px 0px; border-width: 0 1px 1px 1px; border-style: solid; border-color: shade(@theme_base_color, 0.8); diff --git a/Windows 10 Dark/gtk-3.0/apps/granite-widgets.css b/Windows 10 Dark/gtk-3.0/apps/granite-widgets.css index 777a30a..8cc9405 100644 --- a/Windows 10 Dark/gtk-3.0/apps/granite-widgets.css +++ b/Windows 10 Dark/gtk-3.0/apps/granite-widgets.css @@ -43,7 +43,7 @@ } .dynamic-notebook .notebook tab .entry { - border-radius: 2px; + border-radius: 0px; padding: 4px 3px; } diff --git a/Windows 10 Dark/gtk-3.0/apps/nemo.css b/Windows 10 Dark/gtk-3.0/apps/nemo.css index 095232b..3a17578 100644 --- a/Windows 10 Dark/gtk-3.0/apps/nemo.css +++ b/Windows 10 Dark/gtk-3.0/apps/nemo.css @@ -7,7 +7,7 @@ NemoPathbarButton { background-image: none; color: @toolbar_fg_color; - -NemoPathbarButton-border-radius: 2px; + -NemoPathbarButton-border-radius: 0px; } NemoPathbarButton:active { diff --git a/Windows 10 Dark/gtk-3.0/gtk-widgets-assets.css b/Windows 10 Dark/gtk-3.0/gtk-widgets-assets.css index 16eacc3..e037fbe 100644 --- a/Windows 10 Dark/gtk-3.0/gtk-widgets-assets.css +++ b/Windows 10 Dark/gtk-3.0/gtk-widgets-assets.css @@ -1,5 +1,4 @@ /*Windows 10 Dark Assets */ -/*Artwork by Maxime Doyen */ /******************* * check and radio * diff --git a/Windows 10 Dark/gtk-3.0/gtk-widgets.css b/Windows 10 Dark/gtk-3.0/gtk-widgets.css index 48157eb..09a3ed0 100644 --- a/Windows 10 Dark/gtk-3.0/gtk-widgets.css +++ b/Windows 10 Dark/gtk-3.0/gtk-widgets.css @@ -1170,7 +1170,7 @@ GtkModelButton.button:selected { .notebook.header { border-width: 0; - background-color: shade(@theme_base_color, 0.85); + background-color: @theme_base_color; } .notebook.header.frame { @@ -2358,7 +2358,7 @@ GtkColorButton.button { .primary-toolbar .button:insensitive, .toolbar .button:insensitive { border-color: transparent; - background-color: shade(@toolbar_bg_color, 0.9); + background-color: @toolbar_bg_color; background-image: none; } @@ -2702,10 +2702,10 @@ GtkColorButton.button { .toolbar .button.raised.linked:active, .toolbar .raised.linked .button:active, .toolbar .linked .button:active { - box-shadow: inset -1px 0 shade(@toolbar_bg_color, 0.9), - inset 1px 0 alpha(@dark_shadow, 0.07), - inset 0 1px alpha(@dark_shadow, 0.08), - inset 0 -1px alpha(@dark_shadow, 0.05); + box-shadow: inset 0 0 shade(@toolbar_bg_color, 0.9), + inset 0 0 alpha(@dark_shadow, 0.07), + inset 0 0 alpha(@dark_shadow, 0.08), + inset 0 0 alpha(@dark_shadow, 0.05); } .primary-toolbar .button.raised.linked:insensitive, @@ -2713,7 +2713,7 @@ GtkColorButton.button { .toolbar .button.raised.linked:insensitive, .toolbar .raised.linked .button:insensitive, .toolbar .linked .button:insensitive { - box-shadow: inset -1px 0 shade(@toolbar_bg_color, 0.85); + box-shadow: inset 0 0 shade(@toolbar_bg_color, 0.85); } /* remove box shadow from last-child and only-child */ diff --git a/Windows 10 Dark/index.theme b/Windows 10 Dark/index.theme index 18f3b43..0d9ddcf 100644 --- a/Windows 10 Dark/index.theme +++ b/Windows 10 Dark/index.theme @@ -3,7 +3,7 @@ Type=X-GNOME-Metatheme Name=Windows 10 Dark Comment=Windows 10 UI for Linux OSes Comment=Author : Christian Medel (Elbullazul) -Version=v0.9.2 +Version=v0.9.5 Encoding=UTF-8 [X-GNOME-Metatheme] diff --git a/Windows 10 Dark/openbox-3/bullet.xbm b/Windows 10 Dark/openbox-3/bullet.xbm index 88481ec..c2a4c6a 100644 --- a/Windows 10 Dark/openbox-3/bullet.xbm +++ b/Windows 10 Dark/openbox-3/bullet.xbm @@ -1,4 +1,4 @@ -#define bullet_width 4 +#define bullet_width 5 #define bullet_height 7 static unsigned char bullet_bits[] = { - 0x01, 0x03, 0x07, 0x0f, 0x07, 0x03, 0x01 }; + 0x03, 0x06, 0x0c, 0x18, 0x0c, 0x06, 0x03 }; diff --git a/Windows 10 Dark/openbox-3/desk.xbm b/Windows 10 Dark/openbox-3/desk.xbm deleted file mode 100644 index 568d9f5..0000000 --- a/Windows 10 Dark/openbox-3/desk.xbm +++ /dev/null @@ -1,5 +0,0 @@ -#define desk_width 10 -#define desk_height 10 -static unsigned char desk_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x00, 0x78, 0x00, 0x78, 0x00, - 0x78, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; diff --git a/Windows 10 Dark/openbox-3/desk_toggled.xbm b/Windows 10 Dark/openbox-3/desk_toggled.xbm deleted file mode 100644 index 99a9559..0000000 --- a/Windows 10 Dark/openbox-3/desk_toggled.xbm +++ /dev/null @@ -1,5 +0,0 @@ -#define desk_toggled_width 10 -#define desk_toggled_height 10 -static unsigned char desk_toggled_bits[] = { - 0xff, 0x03, 0xff, 0x03, 0x03, 0x03, 0x7b, 0x03, 0x7b, 0x03, 0x7b, 0x03, - 0x7b, 0x03, 0x03, 0x03, 0xff, 0x03, 0xff, 0x03}; diff --git a/Windows 10 Dark/openbox-3/max_disabled.xbm b/Windows 10 Dark/openbox-3/max_disabled.xbm deleted file mode 100644 index 6d030af..0000000 --- a/Windows 10 Dark/openbox-3/max_disabled.xbm +++ /dev/null @@ -1,4 +0,0 @@ -#define max_width 6 -#define max_height 6 -static unsigned char max_bits[] = { - 0x3f, 0x3f, 0x21, 0x21, 0x21, 0x3f }; diff --git a/Windows 10 Dark/openbox-3/shade.xbm b/Windows 10 Dark/openbox-3/shade.xbm deleted file mode 100644 index e1bee45..0000000 --- a/Windows 10 Dark/openbox-3/shade.xbm +++ /dev/null @@ -1,5 +0,0 @@ -#define shade_width 10 -#define shade_height 10 -static unsigned char shade_bits[] = { - 0xff, 0x03, 0xff, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, - 0x03, 0x03, 0x03, 0x03, 0xff, 0x03, 0xff, 0x03}; diff --git a/Windows 10 Dark/openbox-3/shade_toggled.xbm b/Windows 10 Dark/openbox-3/shade_toggled.xbm deleted file mode 100644 index ed29685..0000000 --- a/Windows 10 Dark/openbox-3/shade_toggled.xbm +++ /dev/null @@ -1,5 +0,0 @@ -#define shade_width 10 -#define shade_height 10 -static unsigned char shade_bits[] = { - 0xff, 0x03, 0xff, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; diff --git a/Windows 10 Dark/openbox-3/themerc b/Windows 10 Dark/openbox-3/themerc index 49db2a7..018ae6f 100644 --- a/Windows 10 Dark/openbox-3/themerc +++ b/Windows 10 Dark/openbox-3/themerc @@ -96,6 +96,8 @@ window.client.padding.width: 0 !! Miscellaneous settings border.color: #171717 +window.active.title.separator.color: #1f1f1f +window.inactive.title.separator.color: #1f1f1f !! fonts window.active.label.text.font: Sans:bold:size=10 diff --git a/Windows 10 Light/cinnamon/cinnamon.css b/Windows 10 Light/cinnamon/cinnamon.css index 72cfc68..d1d4536 100644 --- a/Windows 10 Light/cinnamon/cinnamon.css +++ b/Windows 10 Light/cinnamon/cinnamon.css @@ -1557,7 +1557,7 @@ background: #111; .window-list-box { spacing: 6px; - padding-top: -1px; + padding-top: 0; } .window-list-item-label { diff --git a/Windows 10 Light/gtk-2.0/Apps/gnome-panel.rc b/Windows 10 Light/gtk-2.0/Apps/gnome-panel.rc index daa71f7..b7882bc 100644 --- a/Windows 10 Light/gtk-2.0/Apps/gnome-panel.rc +++ b/Windows 10 Light/gtk-2.0/Apps/gnome-panel.rc @@ -9,13 +9,13 @@ style "panel" = "dark" bg_pixmap[NORMAL] = "Panel/panel.png" base[NORMAL] = "#000000" - bg[NORMAL] = "#151515" + bg[NORMAL] = "#151515" bg[PRELIGHT] = "#1f1f1f" bg[SELECTED] = "#004D8C" text[NORMAL] = @fg_color_dark engine "murrine" { - colorize_scrollbar = TRUE + colorize_scrollbar = FALSE } } diff --git a/Windows 10 Light/gtk-2.0/Apps/mate.rc b/Windows 10 Light/gtk-2.0/Apps/mate.rc new file mode 100644 index 0000000..e80420f --- /dev/null +++ b/Windows 10 Light/gtk-2.0/Apps/mate.rc @@ -0,0 +1,16 @@ +style "mate-menu" +{ + bg[NORMAL] = "#000000" + bg[PRELIGHT] = "#1f1f1f" + bg[SELECTED] = "#004D8C" + bg[INSENSITIVE] = "#1f1f1f" + fg[NORMAL] = "#ffffff" + fg[PRELIGHT] = "#ffffff" + text[NORMAL] = @fg_color_dark + xthickness = 0 + ythickness = 0 +} + +widget_class "*-menu*" style "mate-menu" +widget "*-menu*" style "mate-menu" +class "*-menu*" style "mate-menu" diff --git a/Windows 10 Light/gtk-2.0/Apps/xfce.rc b/Windows 10 Light/gtk-2.0/Apps/xfce.rc index c452df0..943a6f8 100644 --- a/Windows 10 Light/gtk-2.0/Apps/xfce.rc +++ b/Windows 10 Light/gtk-2.0/Apps/xfce.rc @@ -30,14 +30,3 @@ fg[ACTIVE] = "#ffffff" } widget_class "*XfdesktopIconView*" style "xfdesktop-icon-view" - -style "panel" -{ -bg[NORMAL] = "#000000" -xthickness = 0 -ythickness = 0 -} - -widget_class "*Panel*" style "panel" -widget "*Panel*" style "panel" -class "*Panel*" style "panel" diff --git a/Windows 10 Light/gtk-2.0/gtkrc b/Windows 10 Light/gtk-2.0/gtkrc index 6f780d4..0bf8185 100644 --- a/Windows 10 Light/gtk-2.0/gtkrc +++ b/Windows 10 Light/gtk-2.0/gtkrc @@ -3,7 +3,7 @@ # date: January 27th, 2016 # description: Windows 10 Default white color -gtk-color-scheme = "bg_color:#ffffff\nfg_color:#4c4c4c\nbase_color:#ffffff\ntext_color:#4c4c4c\nselected_bg_color:#cce8ff\nselected_fg_color:#262626\ntooltip_bg_color:#ffffff\ntooltip_fg_color:#4c4c4c\ntitlebar_bg_color:#ffffff\ntitlebar_fg_color:#4c4c4c\nmenubar_bg_color:#ffffff\nmenubar_fg_color:#4c4c4c\ntoolbar_bg_color:#ffffff\ntoolbar_fg_color:#4c4c4c\nmenu_bg_color:#ffffff\nmenu_fg_color:#4c4c4c\npanel_bg_color:#b5adad\npanel_fg_color:#ffffff\nlink_color:#224ba0\nprogressbar_color:#06B025\nbg_color_dark:#000000\nfg_color_dark:#b7b7b7" +gtk-color-scheme = "bg_color:#ffffff\nfg_color:#4c4c4c\nbase_color:#ffffff\ntext_color:#4c4c4c\nselected_bg_color:#cce8ff\nselected_fg_color:#262626\ntooltip_bg_color:#ffffff\ntooltip_fg_color:#4c4c4c\ntitlebar_bg_color:#ffffff\ntitlebar_fg_color:#4c4c4c\nmenubar_bg_color:#ffffff\nmenubar_fg_color:#4c4c4c\ntoolbar_bg_color:#ffffff\ntoolbar_fg_color:#4c4c4c\nmenu_bg_color:#ffffff\nmenu_fg_color:#4c4c4c\npanel_bg_color:#b5adad\npanel_fg_color:#ffffff\nlink_color:#224ba0\nbg_color_dark:#000000\nfg_color_dark:#b7b7b7" # Default Style @@ -815,4 +815,5 @@ include "Apps/ff.rc" include "Apps/gnome-panel.rc" #include "Apps/panel-menus.rc" include "Apps/mintmenu.rc" +include "Apps/mate.rc" include "Apps/xfce.rc" diff --git a/Windows 10 Light/gtk-3.0/assets-3.18/checkbox-checked-hover.svg b/Windows 10 Light/gtk-3.0/assets-3.18/checkbox-checked-hover.svg deleted file mode 100755 index f199776..0000000 --- a/Windows 10 Light/gtk-3.0/assets-3.18/checkbox-checked-hover.svg +++ /dev/null @@ -1,347 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Windows 10 Light/gtk-3.0/assets-3.18/checkbox-checked-insensitive.svg b/Windows 10 Light/gtk-3.0/assets-3.18/checkbox-checked-insensitive.svg deleted file mode 100755 index ea20611..0000000 --- a/Windows 10 Light/gtk-3.0/assets-3.18/checkbox-checked-insensitive.svg +++ /dev/null @@ -1,142 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Windows 10 Light/gtk-3.0/assets-3.18/checkbox-checked.svg b/Windows 10 Light/gtk-3.0/assets-3.18/checkbox-checked.svg deleted file mode 100755 index 67886e4..0000000 --- a/Windows 10 Light/gtk-3.0/assets-3.18/checkbox-checked.svg +++ /dev/null @@ -1,146 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Windows 10 Light/gtk-3.0/assets-3.18/checkbox-checked@2.svg b/Windows 10 Light/gtk-3.0/assets-3.18/checkbox-checked@2.svg deleted file mode 100755 index defd71f..0000000 --- a/Windows 10 Light/gtk-3.0/assets-3.18/checkbox-checked@2.svg +++ /dev/null @@ -1,147 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Windows 10 Light/gtk-3.0/assets-3.18/checkbox-mixed-hover.svg b/Windows 10 Light/gtk-3.0/assets-3.18/checkbox-mixed-hover.svg deleted file mode 100644 index 7edf6f0..0000000 --- a/Windows 10 Light/gtk-3.0/assets-3.18/checkbox-mixed-hover.svg +++ /dev/null @@ -1,358 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Windows 10 Light/gtk-3.0/assets-3.18/checkbox-mixed-insensitive.svg b/Windows 10 Light/gtk-3.0/assets-3.18/checkbox-mixed-insensitive.svg deleted file mode 100644 index acc9d4d..0000000 --- a/Windows 10 Light/gtk-3.0/assets-3.18/checkbox-mixed-insensitive.svg +++ /dev/null @@ -1,172 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Windows 10 Light/gtk-3.0/assets-3.18/checkbox-mixed.svg b/Windows 10 Light/gtk-3.0/assets-3.18/checkbox-mixed.svg deleted file mode 100644 index 17762a8..0000000 --- a/Windows 10 Light/gtk-3.0/assets-3.18/checkbox-mixed.svg +++ /dev/null @@ -1,151 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Windows 10 Light/gtk-3.0/assets-3.18/checkbox-unchecked-insensitive.svg b/Windows 10 Light/gtk-3.0/assets-3.18/checkbox-unchecked-insensitive.svg deleted file mode 100755 index 31aa745..0000000 --- a/Windows 10 Light/gtk-3.0/assets-3.18/checkbox-unchecked-insensitive.svg +++ /dev/null @@ -1,295 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Windows 10 Light/gtk-3.0/assets-3.18/checkbox-unchecked.svg b/Windows 10 Light/gtk-3.0/assets-3.18/checkbox-unchecked.svg deleted file mode 100755 index d63566f..0000000 --- a/Windows 10 Light/gtk-3.0/assets-3.18/checkbox-unchecked.svg +++ /dev/null @@ -1,294 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Windows 10 Light/gtk-3.0/assets-3.18/checkbox-unchecked@2.svg b/Windows 10 Light/gtk-3.0/assets-3.18/checkbox-unchecked@2.svg deleted file mode 100755 index c3e12c7..0000000 --- a/Windows 10 Light/gtk-3.0/assets-3.18/checkbox-unchecked@2.svg +++ /dev/null @@ -1,295 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Windows 10 Light/gtk-3.0/assets-3.18/radio-mixed-insensitive.svg b/Windows 10 Light/gtk-3.0/assets-3.18/radio-mixed-insensitive.svg deleted file mode 100644 index 578e5cd..0000000 --- a/Windows 10 Light/gtk-3.0/assets-3.18/radio-mixed-insensitive.svg +++ /dev/null @@ -1,172 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Windows 10 Light/gtk-3.0/assets-3.18/radio-mixed.svg b/Windows 10 Light/gtk-3.0/assets-3.18/radio-mixed.svg deleted file mode 100644 index 2c81c79..0000000 --- a/Windows 10 Light/gtk-3.0/assets-3.18/radio-mixed.svg +++ /dev/null @@ -1,113 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - diff --git a/Windows 10 Light/gtk-3.0/assets-3.18/radio-selected-focus.svg b/Windows 10 Light/gtk-3.0/assets-3.18/radio-selected-focus.svg deleted file mode 100755 index b569fcc..0000000 --- a/Windows 10 Light/gtk-3.0/assets-3.18/radio-selected-focus.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - diff --git a/Windows 10 Light/gtk-3.0/assets-3.18/radio-selected-insensitive.svg b/Windows 10 Light/gtk-3.0/assets-3.18/radio-selected-insensitive.svg deleted file mode 100755 index 77d26eb..0000000 --- a/Windows 10 Light/gtk-3.0/assets-3.18/radio-selected-insensitive.svg +++ /dev/null @@ -1,147 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Windows 10 Light/gtk-3.0/assets-3.18/radio-selected.svg b/Windows 10 Light/gtk-3.0/assets-3.18/radio-selected.svg deleted file mode 100755 index b569fcc..0000000 --- a/Windows 10 Light/gtk-3.0/assets-3.18/radio-selected.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - diff --git a/Windows 10 Light/gtk-3.0/assets-3.18/radio-unselected-insensitive.svg b/Windows 10 Light/gtk-3.0/assets-3.18/radio-unselected-insensitive.svg deleted file mode 100755 index ebe776d..0000000 --- a/Windows 10 Light/gtk-3.0/assets-3.18/radio-unselected-insensitive.svg +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - diff --git a/Windows 10 Light/gtk-3.0/assets-3.18/radio-unselected.svg b/Windows 10 Light/gtk-3.0/assets-3.18/radio-unselected.svg deleted file mode 100755 index 8bed86e..0000000 --- a/Windows 10 Light/gtk-3.0/assets-3.18/radio-unselected.svg +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - diff --git a/Windows 10 Light/gtk-3.0/gtk-widgets-assets.css b/Windows 10 Light/gtk-3.0/gtk-widgets-assets.css index 16eacc3..e037fbe 100644 --- a/Windows 10 Light/gtk-3.0/gtk-widgets-assets.css +++ b/Windows 10 Light/gtk-3.0/gtk-widgets-assets.css @@ -1,5 +1,4 @@ /*Windows 10 Dark Assets */ -/*Artwork by Maxime Doyen */ /******************* * check and radio * diff --git a/Windows 10 Light/gtk-3.0/gtk-widgets.css b/Windows 10 Light/gtk-3.0/gtk-widgets.css index d40ceda..ec8e502 100644 --- a/Windows 10 Light/gtk-3.0/gtk-widgets.css +++ b/Windows 10 Light/gtk-3.0/gtk-widgets.css @@ -1170,7 +1170,7 @@ GtkModelButton.button:selected { .notebook.header { border-width: 0; - background-color: shade(@theme_base_color, 0.85); + background-color: @theme_base_color; } .notebook.header.frame { @@ -2358,7 +2358,7 @@ GtkColorButton.button { .primary-toolbar .button:insensitive, .toolbar .button:insensitive { border-color: transparent; - background-color: shade(@toolbar_bg_color, 0.9); + background-color: @toolbar_bg_color; background-image: none; } @@ -2702,10 +2702,10 @@ GtkColorButton.button { .toolbar .button.raised.linked:active, .toolbar .raised.linked .button:active, .toolbar .linked .button:active { - box-shadow: inset -1px 0 shade(@toolbar_bg_color, 0.9), - inset 1px 0 alpha(@dark_shadow, 0.07), - inset 0 1px alpha(@dark_shadow, 0.08), - inset 0 -1px alpha(@dark_shadow, 0.05); + box-shadow: inset 0 0 shade(@toolbar_bg_color, 0.9), + inset 0 0 alpha(@dark_shadow, 0.07), + inset 0 0 alpha(@dark_shadow, 0.08), + inset 0 0 alpha(@dark_shadow, 0.05); } .primary-toolbar .button.raised.linked:insensitive, @@ -2713,7 +2713,7 @@ GtkColorButton.button { .toolbar .button.raised.linked:insensitive, .toolbar .raised.linked .button:insensitive, .toolbar .linked .button:insensitive { - box-shadow: inset -1px 0 shade(@toolbar_bg_color, 0.85); + box-shadow: inset 0 0 shade(@toolbar_bg_color, 0.85); } /* remove box shadow from last-child and only-child */ diff --git a/Windows 10 Light/index.theme b/Windows 10 Light/index.theme index 316f7d3..9f597af 100644 --- a/Windows 10 Light/index.theme +++ b/Windows 10 Light/index.theme @@ -3,7 +3,7 @@ Type=X-GNOME-Metatheme Name=Windows 10 Default Comment=Windows 10 UI for Linux OSes Comment=Author : Christian Medel (Elbullazul) -Version=v0.9.2 +Version=v0.9.5 Encoding=UTF-8 [X-GNOME-Metatheme] diff --git a/Windows 10 Light/openbox-3/bullet.xbm b/Windows 10 Light/openbox-3/bullet.xbm index 88481ec..c2a4c6a 100644 --- a/Windows 10 Light/openbox-3/bullet.xbm +++ b/Windows 10 Light/openbox-3/bullet.xbm @@ -1,4 +1,4 @@ -#define bullet_width 4 +#define bullet_width 5 #define bullet_height 7 static unsigned char bullet_bits[] = { - 0x01, 0x03, 0x07, 0x0f, 0x07, 0x03, 0x01 }; + 0x03, 0x06, 0x0c, 0x18, 0x0c, 0x06, 0x03 }; diff --git a/Windows 10 Light/openbox-3/desk.xbm b/Windows 10 Light/openbox-3/desk.xbm deleted file mode 100644 index 568d9f5..0000000 --- a/Windows 10 Light/openbox-3/desk.xbm +++ /dev/null @@ -1,5 +0,0 @@ -#define desk_width 10 -#define desk_height 10 -static unsigned char desk_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x00, 0x78, 0x00, 0x78, 0x00, - 0x78, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; diff --git a/Windows 10 Light/openbox-3/desk_toggled.xbm b/Windows 10 Light/openbox-3/desk_toggled.xbm deleted file mode 100644 index 99a9559..0000000 --- a/Windows 10 Light/openbox-3/desk_toggled.xbm +++ /dev/null @@ -1,5 +0,0 @@ -#define desk_toggled_width 10 -#define desk_toggled_height 10 -static unsigned char desk_toggled_bits[] = { - 0xff, 0x03, 0xff, 0x03, 0x03, 0x03, 0x7b, 0x03, 0x7b, 0x03, 0x7b, 0x03, - 0x7b, 0x03, 0x03, 0x03, 0xff, 0x03, 0xff, 0x03}; diff --git a/Windows 10 Light/openbox-3/max_disabled.xbm b/Windows 10 Light/openbox-3/max_disabled.xbm deleted file mode 100644 index 6d030af..0000000 --- a/Windows 10 Light/openbox-3/max_disabled.xbm +++ /dev/null @@ -1,4 +0,0 @@ -#define max_width 6 -#define max_height 6 -static unsigned char max_bits[] = { - 0x3f, 0x3f, 0x21, 0x21, 0x21, 0x3f }; diff --git a/Windows 10 Light/openbox-3/shade.xbm b/Windows 10 Light/openbox-3/shade.xbm deleted file mode 100644 index e1bee45..0000000 --- a/Windows 10 Light/openbox-3/shade.xbm +++ /dev/null @@ -1,5 +0,0 @@ -#define shade_width 10 -#define shade_height 10 -static unsigned char shade_bits[] = { - 0xff, 0x03, 0xff, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, - 0x03, 0x03, 0x03, 0x03, 0xff, 0x03, 0xff, 0x03}; diff --git a/Windows 10 Light/openbox-3/shade_toggled.xbm b/Windows 10 Light/openbox-3/shade_toggled.xbm deleted file mode 100644 index ed29685..0000000 --- a/Windows 10 Light/openbox-3/shade_toggled.xbm +++ /dev/null @@ -1,5 +0,0 @@ -#define shade_width 10 -#define shade_height 10 -static unsigned char shade_bits[] = { - 0xff, 0x03, 0xff, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; diff --git a/Windows 10 Light/openbox-3/themerc b/Windows 10 Light/openbox-3/themerc index 195a349..8e33666 100644 --- a/Windows 10 Light/openbox-3/themerc +++ b/Windows 10 Light/openbox-3/themerc @@ -14,8 +14,8 @@ menu.bullet.image.color: #4c4c4c menu.bullet.selected.image.color: #464646 menu.items.active.bg: flat border -menu.items.active.bg.color: #ffffff -menu.items.active.bg.border.color: #ffffff +menu.items.active.bg.color: #bddefb +menu.items.active.bg.border.color: #9ed1f9 menu.items.active.text.color: #4c4c4c !! General window settings @@ -73,11 +73,11 @@ window.inactive.button.pressed.bg.color: parentrelative !#buttons new window.active.button.disabled.bg: flat window.active.button.disabled.bg.color: #ffffff -window.active.button.disabled.image.color: #4c4c4c +window.active.button.disabled.image.color: #b3b3b3 window.inactive.button.disabled.bg: flat window.inactive.button.disabled.bg.color: #ffffff -window.inactive.button.disabled.image.color: #4c4c4c +window.inactive.button.disabled.image.color: #b3b3b3 window.active.button.toggled.bg: flat window.active.button.toggled.bg.color: #ffffff @@ -96,6 +96,8 @@ window.client.padding.width: 0 !! Miscellaneous settings border.color: #ededed +window.active.title.separator.color: #ffffff +window.inactive.title.separator.color: #ffffff !! fonts window.active.label.text.font: Sans:bold:size=10 @@ -103,3 +105,8 @@ window.inactive.label.text.font: Sans:bold:size=10 menu.items.font: Sans:size=10 menu.title.text.font: Sans:bold:size=10 +!!OSD +osd.hilight.bg: flat border +osd.hilight.bg.color: #bddefb +osd.hilight.bg.border.color: #9ed1f9 +osd.inactive.label.text.color:#b3b3b3