From 62b8f970d677d33a5577459310abcce6c0e8ab76 Mon Sep 17 00:00:00 2001 From: Satyajit Sahoo Date: Mon, 17 Jun 2013 14:23:45 +0530 Subject: [PATCH 01/13] Change focus style --- gtk-2.0/gtkrc | 2 +- gtk-3.0/gtk-widgets.css | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gtk-2.0/gtkrc b/gtk-2.0/gtkrc index d2bcba9..cc24b29 100644 --- a/gtk-2.0/gtkrc +++ b/gtk-2.0/gtkrc @@ -118,7 +118,7 @@ style "murrine-default" { colorize_scrollbar = FALSE comboboxstyle = 0 # 0 = normal combobox, 1 = colorized combobox below arrow contrast = 0.8 - focusstyle = 3 # 0 = none, 1 = grey dotted, 2 = colored with fill, 3 = colored glow + focusstyle = 1 # 0 = none, 1 = grey dotted, 2 = colored with fill, 3 = colored glow glazestyle = 0 # 0 = flat highlight, 1 = curved highlight, 2 = concave, 3 = top curved highlight, 4 = beryl highlight glowstyle = 0 gradient_shades = { 1.0, 1.0, 1.0, 1.0 } diff --git a/gtk-3.0/gtk-widgets.css b/gtk-3.0/gtk-widgets.css index 7d4976c..57217ed 100644 --- a/gtk-3.0/gtk-widgets.css +++ b/gtk-3.0/gtk-widgets.css @@ -330,7 +330,7 @@ GtkAssistant .sidebar { border-left-width: 0; } -/*leftmost button */ +/* leftmost button */ .linked .entry:first-child, .linked .button:first-child, .linked .button:active:first-child, @@ -2310,4 +2310,4 @@ GtkViewport.frame { .view:selected:focus { background-color: @theme_selected_bg_color; color: @theme_selected_fg_color; -} +} \ No newline at end of file From 677c03991ca92c262dff1db8926f31be3099475f Mon Sep 17 00:00:00 2001 From: Satyajit Sahoo Date: Wed, 19 Jun 2013 06:57:13 +0530 Subject: [PATCH 02/13] Dropped support for Granite widgets It's too complicated to make wingpanel and popovers look good. Most other granite widgets look fine in Greybird. So better to drop the additional code to reduce workload. --- gtk-3.0/apps/granite-widgets.css | 405 ------------------------------- gtk-3.0/gtk.css | 1 - 2 files changed, 406 deletions(-) delete mode 100644 gtk-3.0/apps/granite-widgets.css diff --git a/gtk-3.0/apps/granite-widgets.css b/gtk-3.0/apps/granite-widgets.css deleted file mode 100644 index d27c13d..0000000 --- a/gtk-3.0/apps/granite-widgets.css +++ /dev/null @@ -1,405 +0,0 @@ -/******************** - * dynamic notebook * - ********************/ -.dynamic-notebook { - background-color: shade(@theme_bg_color, 1.08); - background-image: none; -} - -.dynamic-notebook GtkLabel, -.dynamic-notebook GtkImage { - color: alpha(@theme_fg_color, 0.5); -} - -.dynamic-notebook .notebook { - -GtkNotebook-tab-overlap: 3px; - -GtkNotebook-initial-gap: 12px; - - border-width: 1px 0 0 0; - border-color: shade(@theme_bg_color, 0.8); - border-radius: 0; - padding: 0; -} - -.dynamic-notebook .notebook tab { - padding: 3px; - border-color: shade(@theme_bg_color, 0.85); - border-radius: 2px; - background-color: shade(@theme_bg_color, 0.9); - background-image: none; -} - -.dynamic-notebook .notebook tab:nth-child(first) { - border-width: 0 1px 0 1px; -} - -.dynamic-notebook .notebook tab:active { - border-width: 1px; - border-color: shade(@theme_bg_color, 0.8); - border-radius: 2px; - background-color: shade(@theme_bg_color, 1.08); - color: @theme_fg_color; -} - -.dynamic-notebook .notebook tab .entry { - border-radius: 2px; - padding: 4px 3px; -} - -.dynamic-notebook .button:hover, -.dynamic-notebook .button:hover:active, -.dynamic-notebook .notebook .button, -.dynamic-notebook .notebook .button:hover, -.dynamic-notebook .notebook .button:hover:active { - border-color: shade(@theme_bg_color, 0.7); - background-color: shade(@theme_bg_color, 1.10); - background-image: none; -} - -.dynamic-notebook .button:hover:active, -.dynamic-notebook .notebook .button:hover:active { - border-color: shade(@theme_bg_color, 0.7); - color: shade(@theme_fg_color, 0.7); -} - -/**************** - * content view * - ****************/ -.content-view-window { - border-width: 1px; - border-style: solid; - border-color: shade(@theme_base_color, 0.8); - border-radius: 2px; - background-color:@theme_base_color; - color: @theme_text_color; -} - -.content-view, -.content-view GtkViewport { - background-color: @theme_base_color; -} - -.content-view * { - background-color: transparent; - background-image: none; -} - -.content-view .entry { - background-color: @theme_base_color; - background-image: none; - color: @theme_text_color; -} - -.content-view .button { - border-width: 1px; - border-style: solid; - border-color: shade(@theme_base_color, 0.8); - border-radius: 2px; - background-color: shade(@theme_base_color, 1.08); - background-image: none; - color: @theme_text_color; -} - -.content-view .button:hover { - border-color: shade(@theme_base_color, 0.7); - background-color: shade(@theme_base_color, 1.10); - background-image: none; -} - -.content-view .button:active { - border-color: shade(@theme_base_color, 0.8); - background-color: shade(@theme_base_color, 0.95); - background-image: none; -} - -.content-view .button:active:hover { - border-color: shade(@theme_base_color, 0.7); - color: shade(@theme_text_color, 0.7); -} - -.content-view .button:insensitive { - background-color: shade(@theme_base_color, 0.9); - background-image: none; -} - -.content-view .help_button * { - color: @theme_text_color; -} - -.content-view .toolbar { - -GtkWidget-window-dragging: true; - - padding: 1px; - border-width: 0 0 1px 0; - border-style: solid; - border-color: shade(@theme_base_color, 0.8); - background-color: @theme_base_color; - background-image: none; -} - -/************** - * sourcelist * - *************/ -.source-list, -.source-list.view { - border-radius: 0; - background-color: @theme_bg_color; - color: mix(@theme_fg_color, @theme_bg_color, 0.1); -} - -.source-list { - -GtkTreeView-horizontal-separator: 1; - -GtkTreeView-vertical-separator: 1; -} - -.source-list.view:selected, -.source-list.view:prelight:selected { - background-color: @theme_selected_bg_color; - color: @theme_selected_fg_color; -} - -.source-list.view:prelight { - background-color: shade(@theme_bg_color, 1.08); -} - -.source-list.badge, -.source-list.badge:prelight, -.source-list.badge:selected, -.source-list.badge:prelight:selected { - margin: 0 3px; - padding: 0 6px; - border-width: 0; - border-radius: 10px; - background-color: @theme_selected_bg_color; - background-image: none; - color: @theme_selected_fg_color; -} - -/************* - * statusbar * - *************/ -GraniteWidgetsStatusBar { - padding: 1px; - background-color: @theme_bg_color; - background-image: none; - box-shadow: inset 0 1px shade(@theme_bg_color, 0.8); -} - -/*********** - * popover * - ***********/ -GraniteWidgetsPopOver { - -GraniteWidgetsPopOver-arrow-width: 21; - -GraniteWidgetsPopOver-arrow-height: 12; - -GraniteWidgetsPopOver-border-radius: 2px; - -GraniteWidgetsPopOver-border-width: 1; - -GraniteWidgetsPopOver-shadow-size: 12; - - margin: 0; - border-style: solid; - border-color: shade(@menu_bg_color, 0.8); - color: @menu_fg_color; -} - -.popover_bg { - background-color: transparent; - background-image: -gtk-gradient(linear, - left top, left bottom, - from (@menu_bg_color), - to (@menu_bg_color)); -} - -GraniteWidgetsPopOver .sidebar.view, -GraniteWidgetsPopOver * { - background-color: transparent; - color: @menu_fg_color; -} - -GraniteWidgetsPopOver .sidebar.view:selected, -GraniteWidgetsPopOver .sidebar.view:selected:focus, -GraniteWidgetsPopOver *:selected, -GraniteWidgetsPopOver *:selected:focus { - background-color: @theme_selected_bg_color; - color: @theme_selected_fg_color; -} - -GraniteWidgetsPopOver .button { - border-color: shade(@menu_bg_color, 0.8); - background-color: shade(@menu_bg_color, 1.08); - background-image: none; - color: @menu_fg_color; - -} - -GraniteWidgetsPopOver .button:hover { - border-color: shade(@menu_bg_color, 0.7); - background-color: shade(@menu_bg_color, 1.10); - background-image: none; - color: shade(@menu_fg_color, 0.7); -} - -GraniteWidgetsPopOver .button:active { - border-color: shade(@menu_bg_color, 0.8); - background-color: shade(@menu_bg_color, 0.95); - background-image: none; -} - -GraniteWidgetsPopOver .button:active:hover { - border-color: shade(@menu_bg_color, 0.7); - color: shade(@menu_fg_color, 0.7); -} - -GraniteWidgetsPopOver .entry { - border-color: shade(@menu_bg_color, 0.7); - background-color: @menu_bg_color; - background-image: none; - color: @menu_fg_color; -} - -GraniteWidgetsPopOver .entry:active, -GraniteWidgetsPopOver .entry:focus { - border-color: shade(@menu_bg_color, 0.7); -} - -GraniteWidgetsPopOver *.separator { - border-color: shade(@menu_bg_color, 0.9); - color: transparent; -} - -.button.app { - border-width: 0; - border-radius: 2px; - background-color: transparent; -} - -.button.app:hover { - border-color: shade(@theme_selected_bg_color, 0.9); - background-color: @theme_selected_bg_color; - background-image: none; - color: @theme_selected_fg_color; -} - -.button.app:focus { - border-color: shade(@theme_selected_bg_color, 0.9); - background-color: @theme_selected_bg_color; - background-image: none; - color: @theme_selected_fg_color; -} - -/******** - * gala * - *******/ -.gala-workspaces-background { - border-width: 1px 0 0 0; - border-color: shade(@panel_bg_color, 0.8); - background-color: @panel_bg_color; - background-image: none; -} - -.gala-workspace-selected { - border-width: 1px; - border-radius: 2px; - border-color: shade(@theme_selected_bg_color, 0.9); - background-color: @theme_selected_bg_color; - background-image: none; -} - -/********* - * files * - ********/ -.files-overlay-bar { - margin: 3px; - padding: 3px 6px; - border-width: 0; - border-radius: 2px; - background-color: @theme_tooltip_bg_color; -} - -.files-overlay-bar* { - color: @theme_tooltip_fg_color; -} - -/********* - * noise * - ********/ -.album-list-view, -.album-list-view * { - border-color: shade(@theme_bg_color, 0.8); - border-radius: 0; - background-color: @theme_base_color; - color: @theme_fg_color; -} - -.album-list-view GtkTreeView { - -GtkTreeView-vertical-separator: 1; - -GtkTreeView-grid-line-width: 0; - - background-color: @theme_base_color; - color: @theme_fg_color; -} - -.album-list-view GtkTreeView row:nth-child(even) { - border-width: 0; - border-style: none; - background-color: shade(@theme_base_color, 0.97); -} - - -.album-list-view GtkTreeView row:nth-child(odd) { - border-width: 0; - border-style: none; - background-color: shade(@theme_base_color, 1.0); -} - -.album-list-view GtkTreeView row:selected { - background-color: @selected_bg_color; - color: @selected_fg_color; -} - -/********** - * notify * - **********/ -.notify { - border-width: 1px; - border-style: solid; - border-color: shade(@theme_base_color, 0.7); - border-radius: 2px; - background-color: @theme_base_color; - color: @theme_text_color; -} - -.notify .low { -} - -.notify .critical { -} - -/********* - * panel * - ********/ -.panel { - background-color: @panel_bg_color; - color: @panel_fg_color; -} - -.shadow { - background-color: transparent; - background-image: -gtk-gradient(linear, - left top, left bottom, - from (rgba(0, 0, 0, 0.3)), - to (transparent)); -} - -.composited-indicator, -.wingpanel-app-button, -.wingpanel-indicator-button { - padding: 0 2px; - background-color: transparent; - color: @panel_fg_color; -} - -.composited-indicator.menuitem:active, -.composited-indicator.menuitem:prelight { - border-style: none; - background-image: none; -} diff --git a/gtk-3.0/gtk.css b/gtk-3.0/gtk.css index 5ebbbab..76461f9 100644 --- a/gtk-3.0/gtk.css +++ b/gtk-3.0/gtk.css @@ -60,5 +60,4 @@ @import url("gtk-widgets.css"); @import url("gtk-widgets-assets.css"); @import url("apps/gnome-applications.css"); -@import url("apps/granite-widgets.css"); @import url("apps/unity.css"); From 06d7975a147988a2bf105a40e8b499a9ac3baffb Mon Sep 17 00:00:00 2001 From: Satyajit Sahoo Date: Thu, 20 Jun 2013 02:45:09 +0530 Subject: [PATCH 03/13] Updated README --- README | 2 +- gtk-3.0/gtk-widgets.css | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README b/README index 12618d5..b363f7c 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -Numix is a modern looking flat theme for Gnome. It supports Gnome, Unity, Pantheon, XFCE and Openbox. The theme is compatible with GTK 3.6 and 3.8. It also includes a GTK 2.0 theme using Murrine engine. +Numix is a modern looking flat theme for Gnome. It supports Gnome, Unity, XFCE and Openbox. The theme is compatible with GTK 3.6 and 3.8. It also includes a GTK 2.0 theme using Murrine engine. --- diff --git a/gtk-3.0/gtk-widgets.css b/gtk-3.0/gtk-widgets.css index 57217ed..d5a5132 100644 --- a/gtk-3.0/gtk-widgets.css +++ b/gtk-3.0/gtk-widgets.css @@ -2310,4 +2310,4 @@ GtkViewport.frame { .view:selected:focus { background-color: @theme_selected_bg_color; color: @theme_selected_fg_color; -} \ No newline at end of file +} From a7eacd12c107f99850c4c0149c2aab4a901a45db Mon Sep 17 00:00:00 2001 From: Satyajit Sahoo Date: Thu, 20 Jun 2013 07:54:33 +0530 Subject: [PATCH 04/13] Corrected wrong class names --- gtk-3.0/apps/gnome-applications.css | 2 +- gtk-3.0/apps/unity.css | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gtk-3.0/apps/gnome-applications.css b/gtk-3.0/apps/gnome-applications.css index 8b91733..f8b4589 100644 --- a/gtk-3.0/apps/gnome-applications.css +++ b/gtk-3.0/apps/gnome-applications.css @@ -258,4 +258,4 @@ GeditFloatingSlider .not-found { ***********************/ CcShellItemView.view { background-color: @theme_bg_color; -} +} \ No newline at end of file diff --git a/gtk-3.0/apps/unity.css b/gtk-3.0/apps/unity.css index 6f83abb..a74d293 100644 --- a/gtk-3.0/apps/unity.css +++ b/gtk-3.0/apps/unity.css @@ -8,8 +8,8 @@ UnityPanelWidget, color: @panel_fg_color; } -.unity-panel.panel, -.unity-panel .panel { +.unity-panel.menubar, +.unity-panel .menubar { } .unity-panel.menuitem, @@ -18,10 +18,10 @@ UnityPanelWidget, color: @panel_fg_color; } -.unity-panel.panel.menuitem:hover, -.unity-panel.panel .menuitem *:hover { +.unity-panel.menubar.menuitem:hover, +.unity-panel.menubar .menuitem *:hover { border-color: mix(@panel_bg_color, @panel_fg_color, 0.23); background-color: mix(@panel_bg_color, @panel_fg_color, 0.21); background-image: none; color: shade(@panel_fg_color, 1.08); -} +} \ No newline at end of file From 87d19a6ae0f8e4348b007373768448346425fec0 Mon Sep 17 00:00:00 2001 From: Satyajit Sahoo Date: Sat, 22 Jun 2013 00:36:26 +0530 Subject: [PATCH 05/13] Reworked linked buttons --- gtk-3.0/gtk-widgets.css | 578 +++++++++++++++++++--------------------- 1 file changed, 279 insertions(+), 299 deletions(-) diff --git a/gtk-3.0/gtk-widgets.css b/gtk-3.0/gtk-widgets.css index d5a5132..31e2975 100644 --- a/gtk-3.0/gtk-widgets.css +++ b/gtk-3.0/gtk-widgets.css @@ -174,9 +174,6 @@ GtkAssistant .sidebar { -GtkWidget-focus-line-width: 0; padding: 3px 2px; -} - -.button { border-width: 1px; border-style: solid; border-color: shade(@theme_bg_color, 0.8); @@ -249,240 +246,6 @@ GtkAssistant .sidebar { color: shade(@theme_selected_fg_color, 0.9); } -/* linked buttons */ -.linked .button, -.toolbar .button.raised.linked, -.toolbar .raised.linked .button, -.inline-toolbar.toolbar .button, -.inline-toolbar.toolbar GtkToolButton > .button { - box-shadow: inset -1px 0 shade(@theme_bg_color, 0.9); -} - -.linked .button:active, -.toolbar .button.raised.linked:active, -.toolbar .raised.linked .button:active, -.inline-toolbar.toolbar .button:active, -.inline-toolbar.toolbar GtkToolButton > .button:active { - box-shadow: inset -1px 0 shade(@theme_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); -} - -.linked .button:insensitive, -.toolbar .button.raised.linked:insensitive, -.toolbar .raised.linked .button:insensitive, -.inline-toolbar.toolbar .button:insensitive, -.inline-toolbar.toolbar GtkToolButton > .button:insensitive { - box-shadow: inset -1px 0 shade(@theme_bg_color, 0.9); -} - -/* remove box shadow from last-child and only-child */ -.linked .button:last-child, -.toolbar .button.raised.linked:last-child, -.toolbar .raised.linked .button:last-child, -.inline-toolbar.toolbar .button:last-child, -.inline-toolbar.toolbar GtkToolButton:last-child > .button, -.linked .button:only-child, -.toolbar .button.raised.linked:only-child, -.toolbar .raised.linked .button:only-child, -.inline-toolbar.toolbar .button:only-child, -.inline-toolbar.toolbar GtkToolButton:only-child > .button, -.linked .button:insensitive:last-child, -.toolbar .button:insensitive.raised.linked:last-child, -.toolbar .raised.linked .button:insensitive:last-child, -.inline-toolbar.toolbar .button:insensitive:last-child, -.inline-toolbar.toolbar GtkToolButton:last-child > .button:insensitive, -.linked .button:insensitive:only-child, -.toolbar .button:insensitive.raised.linked:only-child, -.toolbar .raised.linked .button:insensitive:only-child, -.inline-toolbar.toolbar .button:insensitive:only-child, -.inline-toolbar.toolbar GtkToolButton:only-child > .button:insensitive { - box-shadow: none; -} - -/* add back the inset shadow effect */ -.linked .button:active:last-child, -.toolbar .button:active.raised.linked:last-child, -.toolbar .raised.linked .button:active:last-child, -.inline-toolbar.toolbar .button:active:last-child, -.inline-toolbar.toolbar GtkToolButton:last-child > .button:active, -.linked .button:active:only-child, -.toolbar .button:active.raised.linked:only-child, -.toolbar .raised.linked .button:active:only-child, -.inline-toolbar.toolbar .button:active:only-child, -.inline-toolbar.toolbar GtkToolButton:only-child > .button:active { - box-shadow: inset 1px 0 alpha(@dark_shadow, 0.07), - inset 0 1px alpha(@dark_shadow, 0.08), - inset -1px 0 alpha(@dark_shadow, 0.07), - inset 0 -1px alpha(@dark_shadow, 0.05); -} - -/* middle button */ -.linked .entry, -.linked .button, -.linked .button:active, -.linked .button:active:hover, -.linked .button:insensitive { - border-width: 1px; - border-radius: 0; - border-right-width: 0; - border-left-width: 0; -} - -/* leftmost button */ -.linked .entry:first-child, -.linked .button:first-child, -.linked .button:active:first-child, -.linked .button:active:hover:first-child, -.linked .button:insensitive:first-child { - border-width: 1px; - border-radius: 2px; - border-right-width: 0; - border-bottom-right-radius: 0; - border-top-right-radius: 0; -} - -/* rightmost button */ -.linked .entry:last-child, -.linked .button:last-child, -.linked .button:active:last-child, -.linked .button:active:hover:last-child, -.linked .button:insensitive:last-child { - border-width: 1px; - border-radius: 2px; - border-left-width: 0; - border-bottom-left-radius: 0; - border-top-left-radius: 0; -} - -/* linked single button */ -.linked .entry:only-child, -.linked .button:only-child, -.linked .button:active:only-child, -.linked .button:active:hover:only-child, -.linked .button:insensitive:only-child { - border-width: 1px; - border-radius: 2px; -} - -/* middle button (vertical) */ -.linked.vertical .entry, -.linked.vertical .button, -.linked.vertical .button:active, -.linked.vertical .button:active:hover, -.linked.vertical .button:insensitive { - border-width: 1px; - border-radius: 0; - border-top-width: 0; - border-bottom-width: 0; -} - -/* top button (vertical) */ -.linked.vertical .entry:first-child, -.linked.vertical .button:first-child, -.linked.vertical .button:active:first-child, -.linked.vertical .button:active:hover:first-child, -.linked.vertical .button:insensitive:first-child { - border-width: 1px; - border-radius: 2px; - border-bottom-width: 0; - border-bottom-right-radius: 0; - border-bottom-left-radius: 0; -} - -/* bottom button (vertical) */ -.linked.vertical .entry:last-child, -.linked.vertical .button:last-child, -.linked.vertical .button:active:last-child, -.linked.vertical .button:active:hover:last-child, -.linked.vertical .button:insensitive:last-child { - border-width: 1px; - border-radius: 2px; - border-top-width: 0; - border-top-left-radius: 0; - border-top-right-radius: 0; -} - -/* linked single button (vertical) */ -.linked.vertical .entry:only-child, -.linked.vertical .button:only-child, -.linked.vertical .button:active:only-child, -.linked.vertical .button:active:hover:only-child, -.linked.vertical .button:insensitive:only-child { - border-width: 1px; - border-radius: 2px; -} - -/* linked button shadows (vertical) */ -.linked.vertical .button, -.toolbar.vertical .button.raised.linked, -.toolbar.vertical .raised.linked .button, -.inline-toolbar.toolbar.vertical .button, -.inline-toolbar.toolbar.vertical GtkToolButton > .button { - box-shadow: inset 0 -1px shade(@theme_bg_color, 0.9); -} - -.linked.vertical .button:active, -.toolbar.vertical .button.raised.linked:active, -.toolbar.vertical .raised.linked .button:active, -.inline-toolbar.toolbar.vertical .button:active, -.inline-toolbar.toolbar.vertical GtkToolButton > .button:active { - box-shadow: inset 0 -1px shade(@theme_bg_color, 0.9), - inset 0 1px alpha(@dark_shadow, 0.08), - inset 1px 0 alpha(@dark_shadow, 0.07), - inset 0 1px alpha(@dark_shadow, 0.08); -} - -.linked.vertical .button:insensitive, -.toolbar.vertical .button.raised.linked:insensitive, -.toolbar.vertical .raised.linked .button:insensitive, -.inline-toolbar.toolbar.vertical .button:insensitive, -.inline-toolbar.toolbar.vertical GtkToolButton > .button:insensitive { - box-shadow: inset 0 -1px shade(@theme_bg_color, 0.9); -} - -/* remove box shadow from last-child and only-child */ -.linked.vertical .button:last-child, -.toolbar.vertical .button.raised.linked:last-child, -.toolbar.vertical .raised.linked .button:last-child, -.inline-toolbar.toolbar.vertical .button:last-child, -.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button, -.linked.vertical .button:only-child, -.toolbar.vertical .button.raised.linked:only-child, -.toolbar.vertical .raised.linked .button:only-child, -.inline-toolbar.toolbar.vertical .button:only-child, -.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button, -.linked.vertical .button:insensitive:last-child, -.toolbar.vertical .button:insensitive.raised.linked:last-child, -.toolbar.vertical .raised.linked .button:insensitive:last-child, -.inline-toolbar.toolbar.vertical .button:insensitive:last-child, -.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button:insensitive, -.linked.vertical .button:insensitive:only-child, -.toolbar.vertical .button:insensitive.raised.linked:only-child, -.toolbar.vertical .raised.linked .button:insensitive:only-child, -.inline-toolbar.toolbar.vertical .button:insensitive:only-child, -.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button:insensitive { - box-shadow: none; -} - -/* add back the inset shadow effect */ -.linked.vertical .button:active:last-child, -.toolbar.vertical .button:active.raised.linked:last-child, -.toolbar.vertical .raised.linked .button:active:last-child, -.inline-toolbar.toolbar.vertical .button:active:last-child, -.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button:active, -.linked.vertical .button:active:only-child, -.toolbar.vertical .button:active.raised.linked:only-child, -.toolbar.vertical .raised.linked .button:active:only-child, -.inline-toolbar.toolbar.vertical .button:active:only-child, -.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button:active { - box-shadow: inset 1px 0 alpha(@dark_shadow, 0.07), - inset 0 1px alpha(@dark_shadow, 0.08), - inset -1px 0 alpha(@dark_shadow, 0.07), - inset 0 -1px alpha(@dark_shadow, 0.05); -} - /**************** * cell and row * ****************/ @@ -1056,16 +819,16 @@ GtkTreeMenu .menuitem * { background-image: none; } -.menuitem.arrow { - color: alpha(@menu_fg_color, 0.6); -} - .menuitem.check:active, .menuitem.radio:active { border-style: none; background-color: transparent; } +.menuitem.arrow { + color: alpha(@menu_fg_color, 0.6); +} + .menuitem GtkCalendar:inconsistent { color: mix(@menu_fg_color, @menu_bg_color, 0.5); } @@ -2108,78 +1871,74 @@ GtkColorButton.button { background-image: none; } -/* linked buttons */ -.primary-toolbar .button.raised.linked, -.primary-toolbar .raised.linked .button, +/****************** + * linked buttons * + *****************/ +/* set up shadows for visual separation */ +.linked .button, .inline-toolbar.toolbar .button, -.inline-toolbar.toolbar GtkToolButton .button { +.inline-toolbar.toolbar GtkToolButton .button, +.inline-toolbar.toolbar GtkToolButton > .button { box-shadow: inset -1px 0 shade(@theme_bg_color, 0.9); } -.primary-toolbar .button.raised.linked:active, -.primary-toolbar .raised.linked .button:active, +.linked .button:active, .inline-toolbar.toolbar .button:active, -.inline-toolbar.toolbar GtkToolButton .button:active { +.inline-toolbar.toolbar GtkToolButton .button:active, +.inline-toolbar.toolbar GtkToolButton > .button:active { box-shadow: inset -1px 0 shade(@theme_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); } -.primary-toolbar .button.raised.linked:insensitive, -.primary-toolbar .raised.linked .button:insensitive, +.linked .button:insensitive, .inline-toolbar.toolbar .button:insensitive, -.inline-toolbar.toolbar GtkToolButton .button:insensitive { +.inline-toolbar.toolbar GtkToolButton .button:insensitive, +.inline-toolbar.toolbar GtkToolButton > .button:insensitive { box-shadow: inset -1px 0 shade(@theme_bg_color, 0.9); } /* remove box shadow from last-child and only-child */ .linked .button:last-child, -.toolbar .button.raised.linked:last-child, -.toolbar .raised.linked .button:last-child, -.inline-toolbar.toolbar .button:last-child, -.inline-toolbar.toolbar GtkToolButton:last-child > .button, .linked .button:only-child, -.toolbar .button.raised.linked:only-child, -.toolbar .raised.linked .button:only-child, -.inline-toolbar.toolbar .button:only-child, -.inline-toolbar.toolbar GtkToolButton:only-child > .button, .linked .button:insensitive:last-child, -.toolbar .button:insensitive.raised.linked:last-child, -.toolbar .raised.linked .button:insensitive:last-child, -.inline-toolbar.toolbar .button:insensitive:last-child, -.inline-toolbar.toolbar GtkToolButton:last-child > .button:insensitive, .linked .button:insensitive:only-child, -.toolbar .button:insensitive.raised.linked:only-child, -.toolbar .raised.linked .button:insensitive:only-child, +.linked .button:active:insensitive:last-child, +.linked .button:active:insensitive:only-child, +.inline-toolbar.toolbar .button:last-child, +.inline-toolbar.toolbar .button:only-child, +.inline-toolbar.toolbar .button:insensitive:last-child, .inline-toolbar.toolbar .button:insensitive:only-child, -.inline-toolbar.toolbar GtkToolButton:only-child > .button:insensitive { +.inline-toolbar.toolbar .button:active:insensitive:last-child, +.inline-toolbar.toolbar .button:active:insensitive:only-child, +.inline-toolbar.toolbar GtkToolButton:last-child > .button, +.inline-toolbar.toolbar GtkToolButton:only-child > .button, +.inline-toolbar.toolbar GtkToolButton:last-child > .button:insensitive, +.inline-toolbar.toolbar GtkToolButton:only-child > .button:insensitive, +.inline-toolbar.toolbar GtkToolButton:last-child > .button:active:insensitive, +.inline-toolbar.toolbar GtkToolButton:only-child > .button:active:insensitive { box-shadow: none; } +/* add back the inset shadow effect */ .linked .button:active:last-child, -.toolbar .button:active.raised.linked:last-child, -.toolbar .raised.linked .button:active:last-child, -.inline-toolbar.toolbar .button:active:last-child, -.inline-toolbar.toolbar GtkToolButton:last-child > .button:active, .linked .button:active:only-child, -.toolbar .button:active.raised.linked:only-child, -.toolbar .raised.linked .button:active:only-child, +.inline-toolbar.toolbar .button:active:last-child, .inline-toolbar.toolbar .button:active:only-child, +.inline-toolbar.toolbar GtkToolButton:last-child > .button:active, .inline-toolbar.toolbar GtkToolButton:only-child > .button:active { box-shadow: inset 1px 0 alpha(@dark_shadow, 0.07), inset 0 1px alpha(@dark_shadow, 0.08), - inset -1px 0 alpha(@dark_shadow, 0.07), - inset 0 -1px alpha(@dark_shadow, 0.05); + inset -1px 0 alpha(@dark_shadow, 0.07); } /* middle button */ -.primary-toolbar .button.raised.linked, -.primary-toolbar .button.raised.linked:active, -.primary-toolbar .button.raised.linked:insensitive, -.primary-toolbar .raised.linked .button, -.primary-toolbar .raised.linked .button:active, -.primary-toolbar .raised.linked .button:insensitive, +.linked .entry, +.linked .button, +.linked .button:active, +.linked .button:active:hover, +.linked .button:insensitive, .inline-toolbar.toolbar .button, .inline-toolbar.toolbar .button:active, .inline-toolbar.toolbar .button:insensitive, @@ -2192,13 +1951,12 @@ GtkColorButton.button { border-left-width: 0; } -/* leftmost button */ -.primary-toolbar .button.raised.linked:first-child, -.primary-toolbar .button.raised.linked:active:first-child, -.primary-toolbar .button.raised.linked:insensitive:first-child, -.primary-toolbar .raised.linked .button:first-child, -.primary-toolbar .raised.linked .button:active:first-child, -.primary-toolbar .raised.linked .button:insensitive:first-child, +/*leftmost button */ +.linked .entry:first-child, +.linked .button:first-child, +.linked .button:active:first-child, +.linked .button:active:hover:first-child, +.linked .button:insensitive:first-child, .inline-toolbar.toolbar .button:first-child, .inline-toolbar.toolbar .button:active:first-child, .inline-toolbar.toolbar .button:insensitive:first-child, @@ -2213,12 +1971,11 @@ GtkColorButton.button { } /* rightmost button */ -.primary-toolbar .button.raised.linked:last-child, -.primary-toolbar .button.raised.linked:active:last-child, -.primary-toolbar .button.raised.linked:insensitive:last-child, -.primary-toolbar .raised.linked .button:last-child, -.primary-toolbar .raised.linked .button:active:last-child, -.primary-toolbar .raised.linked .button:insensitive:last-child, +.linked .entry:last-child, +.linked .button:last-child, +.linked .button:active:last-child, +.linked .button:active:hover:last-child, +.linked .button:insensitive:last-child, .inline-toolbar.toolbar .button:last-child, .inline-toolbar.toolbar .button:active:last-child, .inline-toolbar.toolbar .button:insensitive:last-child, @@ -2233,12 +1990,11 @@ GtkColorButton.button { } /* linked single button */ -.primary-toolbar.toolbar .button:only-child, -.primary-toolbar.toolbar .button:active:only-child, -.primary-toolbar.toolbar .button:insensitive:only-child, -.primary-toolbar.toolbar GtkToolButton:only-child .button, -.primary-toolbar.toolbar GtkToolButton:only-child .button:active, -.primary-toolbar.toolbar GtkToolButton:only-child .button:insensitive, +.linked .entry:only-child, +.linked .button:only-child, +.linked .button:active:only-child, +.linked .button:active:hover:only-child, +.linked .button:insensitive:only-child, .inline-toolbar.toolbar .button:only-child, .inline-toolbar.toolbar .button:active:only-child, .inline-toolbar.toolbar .button:insensitive:only-child, @@ -2249,6 +2005,230 @@ GtkColorButton.button { border-radius: 2px; } +/* linked button shadows (vertical) */ +.linked.vertical .button, +.inline-toolbar.toolbar.vertical .button, +.inline-toolbar.toolbar.vertical GtkToolButton > .button { + box-shadow: inset 0 -1px shade(@theme_bg_color, 0.9); +} + +.linked.vertical .button:active, +.inline-toolbar.toolbar.vertical .button:active, +.inline-toolbar.toolbar.vertical GtkToolButton > .button:active { + box-shadow: inset 0 -1px shade(@theme_bg_color, 0.9), + inset 1px 0 alpha(@dark_shadow, 0.07), + inset 0 1px alpha(@dark_shadow, 0.08), + inset -1px 0 alpha(@dark_shadow, 0.07); +} + +.linked.vertical .button:insensitive, +.inline-toolbar.toolbar.vertical .button:insensitive, +.inline-toolbar.toolbar.vertical GtkToolButton > .button:insensitive { + box-shadow: inset 0 -1px shade(@theme_bg_color, 0.9); +} + +/* remove box shadow from last-child and only-child */ +.linked.vertical .button:last-child, +.linked.vertical .button:only-child, +.linked.vertical .button:insensitive:last-child, +.linked.vertical .button:insensitive:only-child, +.linked.vertical .button:active:insensitive:last-child, +.linked.vertical .button:active:insensitive:only-child, +.inline-toolbar.toolbar.vertical .button:last-child, +.inline-toolbar.toolbar.vertical .button:only-child, +.inline-toolbar.toolbar.vertical .button:insensitive:last-child, +.inline-toolbar.toolbar.vertical .button:insensitive:only-child, +.inline-toolbar.toolbar.vertical .button:active:insensitive:last-child, +.inline-toolbar.toolbar.vertical .button:active:insensitive:only-child, +.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button, +.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button, +.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button:insensitive, +.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button:insensitive, +.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button:active:insensitive, +.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button:active:insensitive { + box-shadow: none; +} + +/* add back the inset shadow effect */ +.linked.vertical .button:active:last-child, +.linked.vertical .button:active:only-child, +.inline-toolbar.toolbar.vertical .button:active:last-child, +.inline-toolbar.toolbar.vertical .button:active:only-child, +.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button:active, +.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button:active { + box-shadow: inset 1px 0 alpha(@dark_shadow, 0.07), + inset 0 1px alpha(@dark_shadow, 0.08), + inset -1px 0 alpha(@dark_shadow, 0.07); +} + +/* middle button (vertical) */ +.linked.vertical .entry, +.linked.vertical .button, +.linked.vertical .button:active, +.linked.vertical .button:active:hover, +.linked.vertical .button:insensitive { + border-width: 1px; + border-radius: 0; + border-top-width: 0; + border-bottom-width: 0; +} + +/* top button (vertical) */ +.linked.vertical .entry:first-child, +.linked.vertical .button:first-child, +.linked.vertical .button:active:first-child, +.linked.vertical .button:active:hover:first-child, +.linked.vertical .button:insensitive:first-child { + border-width: 1px; + border-radius: 2px; + border-bottom-width: 0; + border-bottom-right-radius: 0; + border-bottom-left-radius: 0; +} + +/* bottom button (vertical) */ +.linked.vertical .entry:last-child, +.linked.vertical .button:last-child, +.linked.vertical .button:active:last-child, +.linked.vertical .button:active:hover:last-child, +.linked.vertical .button:insensitive:last-child { + border-width: 1px; + border-radius: 2px; + border-top-width: 0; + border-top-left-radius: 0; + border-top-right-radius: 0; +} + +/* linked single button (vertical) */ +.linked.vertical .entry:only-child, +.linked.vertical .button:only-child, +.linked.vertical .button:active:only-child, +.linked.vertical .button:active:hover:only-child, +.linked.vertical .button:insensitive:only-child { + border-width: 1px; + border-radius: 2px; +} + +/* linked toolbar buttons */ +.primary-toolbar .button.raised.linked, +.primary-toolbar .raised.linked .button, +.toolbar .button.linked { + box-shadow: inset -1px 0 shade(@toolbar_bg_color, 0.9); +} + +.primary-toolbar .button.raised.linked:active, +.primary-toolbar .raised.linked .button:active, +.toolbar .button.linked: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); +} + +.primary-toolbar .button.raised.linked:insensitive, +.primary-toolbar .raised.linked .button:insensitive, +.toolbar .button.linked:insensitive { + box-shadow: inset -1px 0 shade(@toolbar_bg_color, 0.9); +} + +/* remove box shadow from last-child and only-child */ +.primary-toolbar .button.raised.linked:last-child, +.primary-toolbar .button.raised.linked:only-child, +.primary-toolbar .button:insensitive.raised.linked:last-child, +.primary-toolbar .button:insensitive.raised.linked:only-child, +.primary-toolbar .button:active:insensitive.raised.linked:last-child, +.primary-toolbar .button:active:insensitive.raised.linked:only-child, +.primary-toolbar .raised.linked .button:last-child, +.primary-toolbar .raised.linked .button:only-child, +.primary-toolbar .raised.linked .button:insensitive:last-child, +.primary-toolbar .raised.linked .button:insensitive:only-child, +.primary-toolbar .raised.linked .button:active:insensitive:last-child, +.primary-toolbar .raised.linked .button:active:insensitive:only-child, +.toolbar .button.linked:last-child, +.toolbar .button.linked:only-child, +.toolbar .button:insensitive.raised.linked:last-child, +.toolbar .button:insensitive.raised.linked:only-child, +.toolbar .button:active:insensitive.raised.linked:last-child, +.toolbar .button:active:insensitive.raised.linked:only-child { + box-shadow: none; +} + +/* add back the inset shadow effect */ +.primary-toolbar .button:active.raised.linked:last-child, +.primary-toolbar .button:active.raised.linked:only-child, +.primary-toolbar .raised.linked .button:active:last-child, +.primary-toolbar .raised.linked .button:active:only-child, +.toolbar .button:active.raised.linked:last-child, +.toolbar .button:active.raised.linked:only-child { + box-shadow: inset 1px 0 alpha(@dark_shadow, 0.07), + inset 0 1px alpha(@dark_shadow, 0.08), + inset -1px 0 alpha(@dark_shadow, 0.07); +} + +/* middle button */ +.primary-toolbar .button.raised.linked, +.primary-toolbar .button.raised.linked:active, +.primary-toolbar .button.raised.linked:insensitive, +.primary-toolbar .raised.linked .button, +.primary-toolbar .raised.linked .button:active, +.primary-toolbar .raised.linked .button:insensitive, +.toolbar .button.linked, +.toolbar .button.linked:active, +.toolbar .button.linked:insensitive { + border-width: 1px; + border-radius: 0; + border-right-width: 0; + border-left-width: 0; +} + +/* leftmost button */ +.primary-toolbar .button.raised.linked:first-child, +.primary-toolbar .button.raised.linked:active:first-child, +.primary-toolbar .button.raised.linked:insensitive:first-child, +.primary-toolbar .raised.linked .button:first-child, +.primary-toolbar .raised.linked .button:active:first-child, +.primary-toolbar .raised.linked .button:insensitive:first-child, +.toolbar .button.linked:first-child, +.toolbar .button.linked:active:first-child, +.toolbar .button.linked:insensitive:first-child { + border-width: 1px; + border-radius: 2px; + border-right-width: 0; + border-bottom-right-radius: 0; + border-top-right-radius: 0; +} + +/* rightmost button */ +.primary-toolbar .button.raised.linked:last-child, +.primary-toolbar .button.raised.linked:active:last-child, +.primary-toolbar .button.raised.linked:insensitive:last-child, +.primary-toolbar .raised.linked .button:last-child, +.primary-toolbar .raised.linked .button:active:last-child, +.primary-toolbar .raised.linked .button:insensitive:last-child, +.toolbar .button.linked:last-child, +.toolbar .button.linked:active:last-child, +.toolbar .button.linked:insensitive:last-child { + border-width: 1px; + border-radius: 2px; + border-left-width: 0; + border-bottom-left-radius: 0; + border-top-left-radius: 0; +} + +/* linked single button */ +.primary-toolbar .button.raised.linked:only-child, +.primary-toolbar .button.raised.linked:active:only-child, +.primary-toolbar .button.raised.linked:insensitive:only-child, +.primary-toolbar .raised.linked .button:only-child, +.primary-toolbar .raised.linked .button:active:only-child, +.primary-toolbar .raised.linked .button:insensitive:only-child, +.toolbar .button.linked:only-child, +.toolbar .button.linked:active:only-child, +.toolbar .button.linked:insensitive:only-child { + border-width: 1px; + border-radius: 2px; +} + /*********** * tooltip * ***********/ From 1b850fcf55d88f61563d5a045fb1bdb8475c15d9 Mon Sep 17 00:00:00 2001 From: Simon Steinbeiss Date: Fri, 21 Jun 2013 22:50:36 +0200 Subject: [PATCH 06/13] Fix sidebar in open-file dialog and thunar --- gtk-2.0/apps/thunar.rc | 15 +++++++++++++++ gtk-2.0/gtkrc | 2 ++ 2 files changed, 17 insertions(+) create mode 100644 gtk-2.0/apps/thunar.rc diff --git a/gtk-2.0/apps/thunar.rc b/gtk-2.0/apps/thunar.rc new file mode 100644 index 0000000..4d08f2a --- /dev/null +++ b/gtk-2.0/apps/thunar.rc @@ -0,0 +1,15 @@ +style "sidepane" +{ + base[NORMAL] = @bg_color + base[INSENSITIVE] = mix (0.4, shade (1.35,@selected_bg_color), shade (0.9,@base_color)) + bg[NORMAL] = @bg_color + text[NORMAL] = mix(0.9, @fg_color, @bg_color) +} + +widget_class "*ThunarShortcutsView*" style "sidepane" +widget_class "*ThunarTreeView*" style "sidepane" +widget_class "*ThunarLocationEntry*" style "murrine-entry" + +# Gtk2 Open-File Dialog +widget_class "*GtkFileChooserWidget.GtkFileChooserDefault.GtkVBox.GtkHPaned.GtkVBox.GtkScrolledWindow.GtkTreeView*" style "sidepane" +widget_class "*GtkFileChooserWidget.GtkFileChooserDefault.GtkVBox.GtkHPaned.GtkVBox.GtkScrolledWindow.." style "treeview-header" \ No newline at end of file diff --git a/gtk-2.0/gtkrc b/gtk-2.0/gtkrc index cc24b29..39c9e74 100644 --- a/gtk-2.0/gtkrc +++ b/gtk-2.0/gtkrc @@ -727,3 +727,5 @@ widget_class "*GimpToolbox*" style "performance-fix" widget_class "*GimpMenuDock*" style "performance-fix" widget "*OOoFixed*" style "performance-fix" # Openoffice/Libreoffice widget_class "*MozContainer*" style "performance-fix" # Firefox (Not sure if this one does anything though.) + +include "apps/thunar.rc" \ No newline at end of file From c828372ea652098da08a7867f6dd68e7294e3e3b Mon Sep 17 00:00:00 2001 From: Simon Steinbeiss Date: Fri, 21 Jun 2013 23:08:05 +0200 Subject: [PATCH 07/13] Fix more Xfce widgets in Numix Dark style for logout and tabwin --- gtk-2.0/gtkrc | 33 +++++++++++++++++++++++++++------ 1 file changed, 27 insertions(+), 6 deletions(-) diff --git a/gtk-2.0/gtkrc b/gtk-2.0/gtkrc index 39c9e74..b8a4105 100644 --- a/gtk-2.0/gtkrc +++ b/gtk-2.0/gtkrc @@ -539,13 +539,33 @@ style "xfwm-tabwin" { Xfwm4TabwinWidget::border-width = 0 Xfwm4TabwinWidget::icon-size = 64 + bg[NORMAL] = @menu_bg_color + fg[NORMAL] = @menu_fg_color + engine "murrine" { focusstyle = 0 } } style "xfsm-logout" { + bg[NORMAL] = @menu_bg_color + bg[ACTIVE] = @menu_bg_color + bg[PRELIGHT] = shade (1.1, @menu_bg_color) + bg[SELECTED] = shade (0.5, @menu_bg_color) + bg[INSENSITIVE] = shade (1.3, @menu_bg_color) + fg[NORMAL] = @menu_fg_color + fg[PRELIGHT] = @menu_fg_color + + text[NORMAL] = @menu_fg_color + + engine "murrine" { + } +} + +style "xfsm-logout-button" { + bg[NORMAL] = shade (1.2, @menu_bg_color) + bg[PRELIGHT] = shade (1.4, @menu_bg_color) engine "murrine" { } } @@ -555,12 +575,6 @@ widget "*WnckPager*" style "workspace-switcher" widget "*Xfce*Panel*" style "murrine-panel" class "*Xfce*Panel*" style "murrine-panel" -widget_class "*XfceHeading*" style "xfce-header" -widget_class "*XfceDesktop*" style "xfdesktop-windowlist" -widget_class "*XfdesktopIconView*" style "xfdesktop-icon-view" -widget "xfwm4-tabwin*" style "xfwm-tabwin" -widget_class "*XfsmLogoutDialog*" style "xfsm-logout" - # Google Chrome/Chromium Styles (requires 9.0.597 or newer) style "chromium-toolbar-button" { @@ -728,4 +742,11 @@ widget_class "*GimpMenuDock*" style "performance-fix" widget "*OOoFixed*" style "performance-fix" # Openoffice/Libreoffice widget_class "*MozContainer*" style "performance-fix" # Firefox (Not sure if this one does anything though.) +widget_class "*XfceHeading*" style "xfce-header" +widget_class "*XfceDesktop*" style "xfdesktop-windowlist" +widget_class "*XfdesktopIconView*" style "xfdesktop-icon-view" +widget "xfwm4-tabwin*" style "xfwm-tabwin" +widget_class "*XfsmLogoutDialog*" style "xfsm-logout" +widget_class "*XfsmLogoutDialog*GtkButton" style "xfsm-logout-button" + include "apps/thunar.rc" \ No newline at end of file From 6fbc55e2cf6de60db55507cf152dcfeed68f0570 Mon Sep 17 00:00:00 2001 From: Simon Steinbeiss Date: Fri, 21 Jun 2013 23:25:22 +0200 Subject: [PATCH 08/13] Supposedly fix the libreoffice toolbar-combo-entry problem (Issue#39) hopefully without breaking something else --- gtk-2.0/gtkrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gtk-2.0/gtkrc b/gtk-2.0/gtkrc index b8a4105..0673af8 100644 --- a/gtk-2.0/gtkrc +++ b/gtk-2.0/gtkrc @@ -296,7 +296,7 @@ style "metacity-frame" = "murrine-default" { } style "murrine-statusbar" { } -style "murrine-comboboxentry" = "murrine-entry" { } +style "murrine-comboboxentry" = "murrine-entry" { ythickness = 1 } style "murrine-hscale" = "murrine-scale" { } style "murrine-vscale" = "murrine-scale" { } style "murrine-hscrollbar" = "murrine-scrollbar" { } From e0127a6d93c77e62431a9f99b7125460c6fefc49 Mon Sep 17 00:00:00 2001 From: Simon Steinbeiss Date: Fri, 21 Jun 2013 23:44:15 +0200 Subject: [PATCH 09/13] Fix typo --- gtk-2.0/apps/thunar.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gtk-2.0/apps/thunar.rc b/gtk-2.0/apps/thunar.rc index 4d08f2a..4722bb8 100644 --- a/gtk-2.0/apps/thunar.rc +++ b/gtk-2.0/apps/thunar.rc @@ -12,4 +12,4 @@ widget_class "*ThunarLocationEntry*" style "murrine-entry" # Gtk2 Open-File Dialog widget_class "*GtkFileChooserWidget.GtkFileChooserDefault.GtkVBox.GtkHPaned.GtkVBox.GtkScrolledWindow.GtkTreeView*" style "sidepane" -widget_class "*GtkFileChooserWidget.GtkFileChooserDefault.GtkVBox.GtkHPaned.GtkVBox.GtkScrolledWindow.." style "treeview-header" \ No newline at end of file +widget_class "*GtkFileChooserWidget.GtkFileChooserDefault.GtkVBox.GtkHPaned.GtkVBox.GtkScrolledWindow.." style "murrine-treeview-header" \ No newline at end of file From 22371b1a2746d804d034e3a318a0ff77eaac303d Mon Sep 17 00:00:00 2001 From: Satyajit Sahoo Date: Sat, 22 Jun 2013 11:14:18 +0530 Subject: [PATCH 10/13] Merge thunar styles into the main file --- gtk-2.0/apps/thunar.rc | 15 --------------- gtk-2.0/gtkrc | 27 ++++++++++++++++++++++----- 2 files changed, 22 insertions(+), 20 deletions(-) delete mode 100644 gtk-2.0/apps/thunar.rc diff --git a/gtk-2.0/apps/thunar.rc b/gtk-2.0/apps/thunar.rc deleted file mode 100644 index 4722bb8..0000000 --- a/gtk-2.0/apps/thunar.rc +++ /dev/null @@ -1,15 +0,0 @@ -style "sidepane" -{ - base[NORMAL] = @bg_color - base[INSENSITIVE] = mix (0.4, shade (1.35,@selected_bg_color), shade (0.9,@base_color)) - bg[NORMAL] = @bg_color - text[NORMAL] = mix(0.9, @fg_color, @bg_color) -} - -widget_class "*ThunarShortcutsView*" style "sidepane" -widget_class "*ThunarTreeView*" style "sidepane" -widget_class "*ThunarLocationEntry*" style "murrine-entry" - -# Gtk2 Open-File Dialog -widget_class "*GtkFileChooserWidget.GtkFileChooserDefault.GtkVBox.GtkHPaned.GtkVBox.GtkScrolledWindow.GtkTreeView*" style "sidepane" -widget_class "*GtkFileChooserWidget.GtkFileChooserDefault.GtkVBox.GtkHPaned.GtkVBox.GtkScrolledWindow.." style "murrine-treeview-header" \ No newline at end of file diff --git a/gtk-2.0/gtkrc b/gtk-2.0/gtkrc index 0673af8..e43064b 100644 --- a/gtk-2.0/gtkrc +++ b/gtk-2.0/gtkrc @@ -560,14 +560,15 @@ style "xfsm-logout" { text[NORMAL] = @menu_fg_color engine "murrine" { - } + } } style "xfsm-logout-button" { bg[NORMAL] = shade (1.2, @menu_bg_color) bg[PRELIGHT] = shade (1.4, @menu_bg_color) + engine "murrine" { - } + } } widget "*WnckPager*" style "workspace-switcher" @@ -575,6 +576,24 @@ widget "*WnckPager*" style "workspace-switcher" widget "*Xfce*Panel*" style "murrine-panel" class "*Xfce*Panel*" style "murrine-panel" +# Thunar Styles + +style "sidepane" { + base[NORMAL] = @bg_color + base[INSENSITIVE] = mix (0.4, shade (1.35, @selected_bg_color), shade (0.9, @base_color)) + bg[NORMAL] = @bg_color + text[NORMAL] = mix (0.9, @fg_color, @bg_color) +} + +widget_class "*ThunarShortcutsView*" style "sidepane" +widget_class "*ThunarTreeView*" style "sidepane" +widget_class "*ThunarLocationEntry*" style "murrine-entry" + +# Gtk2 Open-File Dialog + +widget_class "*GtkFileChooserWidget.GtkFileChooserDefault.GtkVBox.GtkHPaned.GtkVBox.GtkScrolledWindow.GtkTreeView*" style "sidepane" +widget_class "*GtkFileChooserWidget.GtkFileChooserDefault.GtkVBox.GtkHPaned.GtkVBox.GtkScrolledWindow.." style "murrine-treeview-header" + # Google Chrome/Chromium Styles (requires 9.0.597 or newer) style "chromium-toolbar-button" { @@ -606,7 +625,7 @@ class "ChromeGtkFrame" style "chrome-gtk-frame" widget_class "*Chrom*Button*" style "chromium-toolbar-button" -# General Style Application +# General Styles class "GtkWidget" style "murrine-default" @@ -748,5 +767,3 @@ widget_class "*XfdesktopIconView*" style "xfdesktop-icon-view" widget "xfwm4-tabwin*" style "xfwm-tabwin" widget_class "*XfsmLogoutDialog*" style "xfsm-logout" widget_class "*XfsmLogoutDialog*GtkButton" style "xfsm-logout-button" - -include "apps/thunar.rc" \ No newline at end of file From 9e92eeae1f7d272b98c670cf82b8088a39279247 Mon Sep 17 00:00:00 2001 From: Satyajit Sahoo Date: Sat, 22 Jun 2013 11:25:04 +0530 Subject: [PATCH 11/13] Adjusted entry borders --- gtk-2.0/gtkrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gtk-2.0/gtkrc b/gtk-2.0/gtkrc index e43064b..65ed727 100644 --- a/gtk-2.0/gtkrc +++ b/gtk-2.0/gtkrc @@ -286,8 +286,8 @@ style "murrine-radiocheck" = "murrine-default" { } style "murrine-entry" = "murrine-wider" { - engine "murrine" { + border_shades = { 1.3, 1.3 } } } From bf429fa4da0d7c2f6e29d40d908f73ffb9f44428 Mon Sep 17 00:00:00 2001 From: Satyajit Sahoo Date: Sat, 22 Jun 2013 11:34:42 +0530 Subject: [PATCH 12/13] Restyled notebooks to match GTK3 --- gtk-2.0/gtkrc | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/gtk-2.0/gtkrc b/gtk-2.0/gtkrc index 65ed727..a77af3d 100644 --- a/gtk-2.0/gtkrc +++ b/gtk-2.0/gtkrc @@ -154,12 +154,8 @@ style "murrine-wider" { # Notebook style "murrine-notebook-bg" { - bg[NORMAL] = shade (1.08, @bg_color) - bg[ACTIVE] = shade (0.90, @bg_color) - - engine "murrine" { - border_shades = { 0.8, 0.8 } - } + bg[NORMAL] = @base_color + bg[ACTIVE] = shade (0.87, @base_color) } style "murrine-notebook" = "murrine-notebook-bg" { From ccd195361d06a822a8a5af54e1145eac4d5dabb7 Mon Sep 17 00:00:00 2001 From: Satyajit Sahoo Date: Sat, 22 Jun 2013 16:46:53 +0530 Subject: [PATCH 13/13] Added assets for dark theme and tweaked assets. Fixes https://github.com/cldx/numix-gtk-theme/issues/4 --- gtk-3.0/assets/checkbox-checked-dark.png | Bin 0 -> 437 bytes .../checkbox-checked-insensitive-dark.png | Bin 0 -> 464 bytes .../assets/checkbox-checked-insensitive.png | Bin 480 -> 494 bytes gtk-3.0/assets/checkbox-mixed-dark.png | Bin 0 -> 241 bytes .../checkbox-mixed-insensitive-dark.png | Bin 0 -> 220 bytes gtk-3.0/assets/checkbox-mixed-insensitive.png | Bin 254 -> 235 bytes gtk-3.0/assets/checkbox-unchecked-dark.png | Bin 0 -> 223 bytes .../checkbox-unchecked-insensitive-dark.png | Bin 0 -> 206 bytes .../assets/checkbox-unchecked-insensitive.png | Bin 232 -> 215 bytes gtk-3.0/assets/radio-mixed-dark.png | Bin 0 -> 587 bytes .../assets/radio-mixed-insensitive-dark.png | Bin 0 -> 568 bytes gtk-3.0/assets/radio-mixed-insensitive.png | Bin 501 -> 543 bytes gtk-3.0/assets/radio-mixed.png | Bin 538 -> 513 bytes gtk-3.0/assets/radio-selected-dark.png | Bin 0 -> 647 bytes .../radio-selected-insensitive-dark.png | Bin 0 -> 615 bytes gtk-3.0/assets/radio-selected-insensitive.png | Bin 549 -> 604 bytes gtk-3.0/assets/radio-unselected-dark.png | Bin 0 -> 490 bytes .../radio-unselected-insensitive-dark.png | Bin 0 -> 538 bytes .../assets/radio-unselected-insensitive.png | Bin 473 -> 502 bytes gtk-3.0/gtk-dark.css | 2 +- gtk-3.0/gtk-widgets-assets-dark.css | 114 ++++++++++++++++++ 21 files changed, 115 insertions(+), 1 deletion(-) create mode 100644 gtk-3.0/assets/checkbox-checked-dark.png create mode 100644 gtk-3.0/assets/checkbox-checked-insensitive-dark.png create mode 100644 gtk-3.0/assets/checkbox-mixed-dark.png create mode 100644 gtk-3.0/assets/checkbox-mixed-insensitive-dark.png create mode 100644 gtk-3.0/assets/checkbox-unchecked-dark.png create mode 100644 gtk-3.0/assets/checkbox-unchecked-insensitive-dark.png create mode 100644 gtk-3.0/assets/radio-mixed-dark.png create mode 100644 gtk-3.0/assets/radio-mixed-insensitive-dark.png create mode 100644 gtk-3.0/assets/radio-selected-dark.png create mode 100644 gtk-3.0/assets/radio-selected-insensitive-dark.png create mode 100644 gtk-3.0/assets/radio-unselected-dark.png create mode 100644 gtk-3.0/assets/radio-unselected-insensitive-dark.png create mode 100644 gtk-3.0/gtk-widgets-assets-dark.css diff --git a/gtk-3.0/assets/checkbox-checked-dark.png b/gtk-3.0/assets/checkbox-checked-dark.png new file mode 100644 index 0000000000000000000000000000000000000000..fcada259f4d8fe26161eb770014cc894a592a528 GIT binary patch literal 437 zcmV;m0ZRUfP)=QBE|p!010qNS#tmY4c7nw4c7reD4Tcy000McNliru-3As4IuNbT6L|mt0YXVc zK~y-)t&_b<15pr#zq@~TSIKH(I+b8;83>3$L`wx9CeN`iV56lds9ky+As`4Mv9L>0 zNi^(AV%)oXEkrRS#jZN_d}n4jXT(~iQU@IXHS$#pM8g6dEU&DZ1>es_M`398x}CrR zYI$LRg6~%W4E|VF*2ZcaQH@`D69!FL^duABv) z4I6;%@qm3N1t3Lpq9hOY-1G@W682R4zJ)~<&?(F&eIfx94rYvR3$G;@86@{VsmF*nQbOR(7h(@p5 f34Sp=0nzvXVXbXs4Yf0WbcEP)=QBE|p!010qNS#tmY4c7nw4c7reD4Tcy000McNliru-3As52?$FHgeU+20bNN% zK~y-)rIWu(13?hRe>s<2{8Q}_!WNRt185P@SO|g-piiJagxJ_vD+E%AVkIa9D;rCn zz+hn`VwI%aE4&2p*c7+1Fc+eUn&@=%&CEBm-|VCczP}3HGO)~KR)f^8=oKH-8_l~( zstbO;1l@9~;OD#bMpNdbMR4L|^MLWsqY1WKu@QtH<8ycGZ;giuOd0&7W*wf0(TT^S;fQWk+C zFrQARPoY=25?t2TP!F7I;Ax%Zy? zNW(O@IQKMwY$8_QQRF1N|GdP1httC z^7(v?5VGz#&VPwv7?06tR8SPIAiR(TrQtZi%v%9bUIJI?>hiM2w9P3`ECmAyRKXO3Z5ZgjQRb3UjgtoexgCm zb=`Aa*Dn_BXJ(1rZr8SLTLCbfnz^m(`q_62o^zquY)8Hf27|2Ud9RGIn^LKC_>)5m z@1WIcJp_R=$8-;|8>{vk@!=?=g}t zl~qU+Z7xMf6G#&3ylopxDk=`w%{m8#Q2Oq(%OFr$k`qp|xJluoC2 zCX-130QGwP9RSR2E9P>!3&vPAlgWHer_)0K9ssayV9xmsW6YTs+%pVgKk~7)z&p9bidnam*avnM)&Ez-}wuqqLaUgiDIDu0000U_7?h3yMK}vQ zB8!1Ku7fb6lg8`{pdfpRr>`sfT{bZ;Q`wMb#oR!lI!_nJ5R21KC)@HlI0&@v-+KF& zQ+J24M@Zh*=QFxJ=P<2Jy6Utv(Bqo_VQuxF&wQVqU9m|+DuQ(dXE66E$q3c6MY7S- zF6ZyPE_`v6p;UuMAUc}S<<1p$sTs+RGyE9cKYe0xZommM%JJ&@$E hv+%{!rk_lwa=(YkJiVHw9uIU0gQu&X%Q~loCIAghROtW! literal 0 HcmV?d00001 diff --git a/gtk-3.0/assets/checkbox-mixed-insensitive-dark.png b/gtk-3.0/assets/checkbox-mixed-insensitive-dark.png new file mode 100644 index 0000000000000000000000000000000000000000..2dcdc3cf2073974bcfa2d5e330767ee34ac34d94 GIT binary patch literal 220 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)3TgJQ>U_7?h3yMK}vQ zB8!1Ku7fb6lg8`{pdfpRr>`sfT{bapPKCPtI+uV#nVv3=Ar_~TLqY;JBqsd0fBL|I zgkug;7Do>ph&aP^HKzXm!NZf6ya)@KV4e<=Ua>;q|Nno@?M^%?46dv{%YAr6ni3Nj zxVJSNT+V2FVC8$Jpv5I7Qi^PIno@WseQva5Wzopr0B-e3nE(I) literal 0 HcmV?d00001 diff --git a/gtk-3.0/assets/checkbox-mixed-insensitive.png b/gtk-3.0/assets/checkbox-mixed-insensitive.png index aa01322a24306442701a3833b4c33328de060033..1bb9f81b12460b8e730795fe9c736fa09731b2ec 100644 GIT binary patch delta 157 zcmV;O0Am0C0qX&fBo78+OGiWi)&NNWH#h(y#*r}?8V7VqO+^RY1{MnrBsPsUQ& delta 196 zcmaFO_>XadN+3(IlV=DA5Y%v_bTBY5a29w(7BevLUI$@DCym(^Ktah8*NBqf{Irtt z#G+J&^73-M%)IR4ne4(k7CJHUK;<*RqO(&x4?-E2OReE(AOCmtdFb&66k$?IFVdQ&MBb@09gu6ga7~l literal 0 HcmV?d00001 diff --git a/gtk-3.0/assets/checkbox-unchecked-insensitive-dark.png b/gtk-3.0/assets/checkbox-unchecked-insensitive-dark.png new file mode 100644 index 0000000000000000000000000000000000000000..decd7f8e6a1b5428becfccaf52e447d15f97e522 GIT binary patch literal 206 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)3TgJQ>U_7?h3yMK}vQ zB8!1Ku7fb6lg8`{pdfpRr>`sfT{bap4ylDJjwk|!qCH(4Lo7}whlB)dNKE)~|MY=QBE|p!010qNS#tmY4c7nw4c7reD4Tcy000McNliru-3As4H32~9FGK(U0oX}I zK~y-)rIW!<6Hyd~|1&cV6K>OKJ2W;C8f;KpOq@ksnNSyQ?E}b5NaD(eZ~<@N1|DGa z6^ul?(9}hTT1eZZ7Gle^3{38%_qZS>#6X4ct!{GfcmH!1Kj9x97K@KTSZAP2pfUh3 zxJEz?jP3n)JGlH_pB}2!DkX8e0iq8gm6~5z$lHZNA)9j?vMeiM=EWpQ-eqlDu2m|# zL2&*LP38KJ?;kZyUtBJgvZiS+;R>Xbor6|usMMtEKJ{MtzRx-UByqf<>H3RDtE;YI z7#UoHuIqNraq`2#Anx~ibH`!$h0b@T&!v@>)9aG2nxxfi&V%{62Ew{XiTX`t05DB+ zNu)#_M6Wdl%IUOi;g+P+w#DFQ27$^#2yJ@t9)p?UTjT%$LWpGo6*b%ugTb{Zit=_Q zbN_O}|A?aKfWb!^0kzR6jBlGf8ig@|zG+}=M<~PmQr@2lgI`0j(!}5f3mhM z!!Uf3bDTU8(JYynRjb)-vr=38?e-@P09?=8RBF=QYc%S!CXrHh_8N`4Qj@Ohd7Bqy z3W5M@mC8=P*P9y-hcD00PQQZDH+21;QYspc$3Kq_`@ar<_aCrQTdwE5@qM2!%5;}H Z{{=DF-5$psQ+WUY002ovPDHLkV1naK0!sh@ literal 0 HcmV?d00001 diff --git a/gtk-3.0/assets/radio-mixed-insensitive-dark.png b/gtk-3.0/assets/radio-mixed-insensitive-dark.png new file mode 100644 index 0000000000000000000000000000000000000000..37e22ff183ab06ac90c4dad5a64b34d4fc7a8d07 GIT binary patch literal 568 zcmV-80>}M{P)=QBE|p!010qNS#tmY4c7nw4c7reD4Tcy000McNliru-3As51`Ac2$z1>d0mVr~ zK~y-)rIW#H6G0fo-#4>m*$CO7WQj`~R}b1AQ)&qG?7@S7LA`kPBK7275HA)lIg8MO zN1y%Z!)NYD);dS0?^y|}dG zM^OX-pj`avINkwJ9H;5SUhgEpZ*ZKlSFo%WfI;P|d)N1UmH;rBTnmq)d!teE1ye|p zaepuzzOwD&gVAtU>YtvzqsgD&j??tcw8>MF?1Hf>OC|deGatn9@oUUTl8pPdUA#gh zZVCogbf(+*OLV5&48Cm;sHT)!&o8cf*FIk)JPbZu1^}hh{-wFOX9E9;!QhT*n#%y* z0Kif7ad8%*X`0In?id8@Nki6igDlH>vlvK2)(P}pfU!wLYmQU)W{vGQWsiu~z`P}b zFzkZSELc`c2=T|A2q8qlvRYs?gD~t00I0a`27p0zVSf9fB#u+|stfbm00tAyc^AI- zA&%EUc*4wEI@4{X)PBA&X~_C{Y&0vbyW#sj|77s5b^ZnoTEAN=Hx)3bXZGV6S#?Yn^BwZBoKU7={Z8lxB z(2a) z;ZwN`e=|gpGyo`~M!Lp^Ok>T0WextEC+kKjMZR`AFQiLlc8=KQ4~ba zyj>FD4=4@D57<#9m*fLVydbL@RVIZFFIwOaC@P68BiGMrw|}bCU$CVrT@nyQ2EpZ} z-JJl(kyW+MN*VOPoi|6Ldu5w_eU0(N^3YOORu{l>CA*R}ALRLFe?IKJRmON>u>u{1 zhRd{RdTG=2Lc=BK$YNE-cme3q^gy6;8NW+(oYZf#YzmuN|9_bQvTS&FeRF#z(J5mbZ<7~`6N?pT{qm6cZxa3_KV)77%R^w=*1RJD zrk37>ZQHEdns<^}TkfT@x`~^2k9f=IL&oep7eHcP+2Lb2G~7n1<*JrWfo}kd&tG0V zK>$E4om#F^*_EaK?t|rW`KwK`MPJs>AZrec%5r|(7F7FTb|m{#807f|Gf|z)ilTV3 zlcFes>STtQ4Dx*Q>{Zs@HL8qpjCc=BW!8y(1-ruN10&2N%kvMwHu<^dd=Kt((ePA# RAk6>(002ovPDHLkV1nnX+hza& diff --git a/gtk-3.0/assets/radio-mixed.png b/gtk-3.0/assets/radio-mixed.png index ccd8b3416dbb0b24c000ea04912081f97deb2d2e..8f5f4288a373a0fdd4b25fc1962c9f593b4b315b 100644 GIT binary patch delta 467 zcmV;^0WAKS1c3yQBo78+OGiWi)&NNWH#h(y#*r}?e+P6)O+^RY1{Ml5I0pHa4FCWE zj!8s8R5;76lfQ}+VHCyB`OJ_MQ)uyxW;6Q-goVI>MeKz2A8fH}VYYB^Um`DHnHTU8 zY*xl1ZXwo*5U?=a6cP{vNeIkWq?sZlkYg2?V$G`S4{mkuIrkLzQWA=MOp-%U=OP;v z8vr0`e?VzK@uC^W!{R&(2J9qB3x;p3wQ02$R)Qcn0DvsZMziT;;hc-GR{JcD-vUt4 zfSnJ?C(rZ3M~|P}@qK?6SCHrVxZmr}SF6?J>{a{%fD8b1lBDH%UU+p67*~BxwP_tq1k`Aq?LgJ$+Uxm&>#=x^44S zNvyT0$k#?>qgo3q_)Ds_up;VViDDxN0<&rSczLu{c>nSX03Zm01B!bFH>4zLkY$tif4s5Fpv*~0(@tdJ|;hc-|JRkpQ>^#rM&bf%v zIeXKL;~~~+_j}#Br1f=TN$Y;EJI7k>W*iT1e9Hgrng02me*s(B`wx_j8j%11002ov JPDHLkV1g{Q*FOLN delta 512 zcmV+b0{{Ji1eyepB!2{RLP=Bz2nYy#2xN!=000SaNLh0L01ejw01ejxLMWSf0000P zbVXQnQ*UN;cVTj60C#tHE@^ISb7Ns}WiD@WXPfRk8UO$Rmq|oHR5*>Tlfh~eQ51&% zbIp(}2BP2{O*2gjLZL9=BJPA*6}o6$m@d57m&gma%nSGk-G5ZBi&)SHNQCUnZWa;{ z14#(nyU1o1#lZZoTC!;4h<@91zW^U2y>3QsB05=sjIC>#kn63ThonDKhQ ztOZEV+76Vw(^{vsdR&R3Xa@kCbCbn=QBE|p!010qNS#tmY4c7nw4c7reD4Tcy000McNliru-3As4Hz+V;)v5ph0u)I^ zK~y-)rBlI98c`HIZ{9Ex2YJklCM31S8e3fuXF(H_Cenr5`UBnc3!1v^XXqceX+MDa z3#P`fXk!;3qCpY_Q-%o)(D&foE{p_>y78=TZqB*)p4=RUdw8|9^aczc3CJ?AEC3Lw zz<>e>-!7`v(j=eX6+1gSObrIRVC=w7BxdL57eqRpc3jV6@pxPj(V|l7t0RQm%H@tr zrQ12|PJH_N*AK(si_0r3j%8Ud@c^WhSC^Gap!KMh+3-K)^LgR`paz3ogY);V*VZzo zX{PW9IOoFkyoI3E8Z_$lnRXcdWVfE#(aP#-@3GAfT~aBRXF>FiJ1OzmP9$bs*V~vR zrAHFm|Jqm|_7NH;x(1)Rq~GtID5Vl60oi0y#P5qg4Fk9{CIDbv1vr3%Yi^A>$)t#P zyWO`21IyaBy*xQ!Q+D9SOqd3PX)w4k6PvO#Wy7}ZWd@ct@Jtv4DnwCqIoUk6=Fn0@ z3^ie>2`x3mu{Ad(jH2k0Kn3ok#2OJT3XvMy=o%d7%mPV?s}XP*6I1>H;HKF)S5h54 z|BdZ1{ObrI!!TTTJ#T?A#-0)rk*<`>RnmI@qFOyP03hT0ds>fbXT{>Fl=AAS&1c2p zsn(-f#`pKeVJekM*vjR;H|q77APBbm{oV-(4U_Yj);j8RI)84Ojq~Pp;{|EGpYi=K h`Fx(nVR}xS{{x}~2T8tA!a)E4002ovPDHLkV1k literal 0 HcmV?d00001 diff --git a/gtk-3.0/assets/radio-selected-insensitive-dark.png b/gtk-3.0/assets/radio-selected-insensitive-dark.png new file mode 100644 index 0000000000000000000000000000000000000000..3343ad3f1e02e8a38d233394ff4a6290614ffe2c GIT binary patch literal 615 zcmV-t0+{`YP)=QBE|p!010qNS#tmY4c7nw4c7reD4Tcy000McNliru-3As51sW6vx@-Ud0rW{k zK~y-)rBlCa6JZ#B-tR6sFSNN!<tIgO!zkEi`gp(R{hsH0A6`NX`CRTQ2zMD+ zA&?6I46YLJ35=I@->;4HmFQ3`7D*Li9far1d?1H%Hwc1f-_Ooo2ofz4v`9poreVmX zwjt7?)CcL zFaiDk;H1;-zBY{X{a&|gp0wK^Y4qn0gCMv$NqK^kcVOI5Ow)M8%m>Zp;oFFiOePbK zZQq%h$!waYac_ERN}h({zLfGu%KDs;&!~N7H-6uhF0FLBPKKs{{*ph;k1;yX^j8?002ovPDHLkV1g%` B5|;n~ literal 0 HcmV?d00001 diff --git a/gtk-3.0/assets/radio-selected-insensitive.png b/gtk-3.0/assets/radio-selected-insensitive.png index c8ac81517759fb93b73dc56ba5f95e6c9f374300..5d91d2ca43b33e9ca75f586d0eb37cfc442fc0c9 100644 GIT binary patch delta 559 zcmV+~0?_@X1l$CWBo78+OGiWi)&NNWH#h(y#*r}?e+P6)O+^RY1{Mnq2fx`|y#N3K z=}AOER5;76lRsQEW>^*D9R|xqwqs1Mc?}U_pZAvFBXe0bK4nSOs8i6 z04Y(-C6atT9*;lgxLE6PvG@idME^FRl%jt3=x5-2tT{0&wc5MiaD(dgxA&y9)Wi(y z6`wqP5H^96UT?2^*ghqMYy*IB+arW*cMsdAev8vkZQI_n7cXleB+D{aRn-!|$-f2waITz#hNg84!*D~U{rOWp zxhb&N^}Wp8c81X@RaGqsTf#nrnH>f*JHnQ*Uscsol$qPk(DjxXj3|=BZHEdc-{xIR zf2U`NA{oP)!W2;>C5pMI>0CJntKh1a62%-v)W96WjuS~fA1yXCtuwov?fQX#?g#$) z>~gl-(6mmJNhJ9^$HvBJpzGP|#r1dN*ZAST0(4WLL!B!2{RLP=Bz2nYy#2xN!=000SaNLh0L01ejw01ejxLMWSf0000P zbVXQnQ*UN;cVTj60C#tHE@^ISb7Ns}WiD@WXPfRk8UO$RqDe$SR5*>LQ@d&#K@>e_ zRw-17t@Hya`~z!aP#S+g8g1bL;UWm5!j0UeaFZ=mq)g*N7=J~Da6E==n*4$cLE1)z zFe>~5s+NG8Wap%iWp6~{5Ok{H-g6&w?!A>{qRcm? zH&f?MMT`MfjmJgB``wE7yT;=JU{%C8b?y`ZAA=q`V0!JolBg*t-o$b14u3$JUcO`z z3?+Pz5AACJGJgP&I@cvpo6TU26k9+O_#_@~ywS0t7zNU#oM2t~Ia?r2D1Sy~llZ?dqOyYAD;w!?zDeA) z737|%%uvciG|J9po{uQBK}oJ<9wF?M67Qrw{l7DKFB#B`W z3?cNI)-JYQWtOgysdHTrX8;BiZr0;n35EuMHiTYm?FV4BCEWI$e*vs`=?;0qPP_mB O002ovP6b4+LSTYwVc(ko diff --git a/gtk-3.0/assets/radio-unselected-dark.png b/gtk-3.0/assets/radio-unselected-dark.png new file mode 100644 index 0000000000000000000000000000000000000000..9b948f70ab0e9a6f7342176abe48a3788f98824f GIT binary patch literal 490 zcmVu;d0C@tovRga@6CQ%R zIH|5|C3_UBw~DUh`*&$kg-WRf-+aFRoZ47f7aM;&cPXNGLTQ$vYZ?A0(auz4aJj*iv3P{sbil2*bO7&h( zqUco+1P6Eo=iIt7X6t>siQgrsS(Z^qA{viBs$TEI+vDR{L=>KYq+gX~;oJ6$sq4@3 zW;8m2$oJ^*@a9jOAG^d{UA+W(q98ce16@2<27n+44)j155IIu>reQejqa$HB>=S(d zLLgJEwdxw6wVnuM)LHx;MKHJ4R$WDFZACCw0_07z+jk9Un%!O?KNN^ddu?Oq-1@n) zb8db2m0y*q>m|rpWz3eO|C>zGSH^5X&P-h|6#&FZGWWjStje-@>JsPNdR3N%_w6Q5 glKKBD)4$aD7U3)CvVsK}=QBE|p!010qNS#tmY4c7nw4c7reD4Tcy000McNliru-3As51S3)y10?_e0jEhs zK~y-)rIWEsTTv9ozjJQj@-pNFN*?J$!^1)Am|#Povx9?wfnA(kq@DZ=;v`)%mx4ma zf`dcn(nl(0j#GGsXGsQQl9$KRT#kcDX{D*g{-!(J?>pbQmyhrOuTWS4;jI8`1S$f6 zKpF&`LU7m$g68k{)$~xQR4B##9)yn~a&E@vB#z_#+nbwDOxz`=B_jHewQciib=7aT z+W-KXiho{)Cjc^|INs@Wx-I+#$H{qV%c=qB=U=)TzVC|yfXU=yaM9iz4x=l~Ac{u4 z{$TLgwlmwq!64hazWz>=oxhFZczxF78A-lE@J3~`_O6JWhvDTHJdr3G^=v!yf{2${ zfHgBVbi z6X*v+a7aX3j+67ADt4TlM?_l?IpS6jG$E*_Evv@NkG=^rbK0_M5L8=1&}0C}yY2yi zeqnLp_+LpJC+8Iw7mfk+Cz|^%{OUs(z5`)TM2^hZ)TiI8wJxcYD&NOOHSf9yzVFK) c2G6bY9kOY&H1!z}*#H0l07*qoM6N<$f>T%RWdHyG literal 0 HcmV?d00001 diff --git a/gtk-3.0/assets/radio-unselected-insensitive.png b/gtk-3.0/assets/radio-unselected-insensitive.png index 58953b67d549cccefb8f600af2297df57f0e9383..cc7b4b2e6ffedd18859481c429afaecb30be1b0f 100644 GIT binary patch delta 456 zcmV;(0XP2H1NH-uBo78+OGiWi)&NNWH#h(y#*r}?e+P6)O+^RY1{MnpAGNOassI21 zgGod|R5;76lfg;?Q51&HxpS`WrOIrE>8OKVVtqn2|7QM5BKG@MwQ+0#EIBwRP9*2_g0X zVE4BXLhQBfn!TrXy9xk6y0)E`a#3`~PRVuMe-&)Nb={RSc1lt%ie1}IRXNdj9!6sl2N*E2zd zab3?SR3pMPIt)i6*`NmDXe7&MXh^6=8=UikWtC%p6LlRa))K@^3* zGmpjvn{eR`fE9@}UO*aNk&&q)Hh}w7uV4Y`Eks2;DJD&}0DqF@yvBuPQFs$+^WI5; ziIC+VkWV$m`R=_scdl%+tDh;ISRPsG$?5@Eu4UJ<7Q-0VyZ*5AR!-@{VhK75Etj3P z?RVO?A6hO!M;6PR(gmRZ(BlNkKhiIWu8ZbNS&klfMmaBz)f97^Kjr8632*?&DNQ80 zw|DnvFTnt1Ie&V%y}Lh?=;o9ro6c8PCl*UO&4<_Er<3rvxR&`CERTTMzVLPuU}ot& zY|>`6FT9n^%5p!*>J|3Qp#=*2MpiGpZGBzAa@|O$hk}iCYPk-wYm3351uO=#eg|0# zV4U;fcwhL@JC^-D3}aklrfQ0LRaI|hQdLz@Q_L~bVK|KIcYkH=T%&SI6U0|wCbQbE pcM})`V2qiTF@6I!o!@)T{{Wv5#flJMSP=jK002ovPDHLkV1k3N#W?@~ diff --git a/gtk-3.0/gtk-dark.css b/gtk-3.0/gtk-dark.css index ae35bbc..41c1687 100644 --- a/gtk-3.0/gtk-dark.css +++ b/gtk-3.0/gtk-dark.css @@ -58,7 +58,7 @@ @define-color wm_border_unfocused #393939; @import url("gtk-widgets.css"); -@import url("gtk-widgets-assets.css"); +@import url("gtk-widgets-assets-dark.css"); @import url("apps/gnome-applications.css"); @import url("apps/granite-widgets.css"); @import url("apps/unity.css"); diff --git a/gtk-3.0/gtk-widgets-assets-dark.css b/gtk-3.0/gtk-widgets-assets-dark.css new file mode 100644 index 0000000..e5c07d6 --- /dev/null +++ b/gtk-3.0/gtk-widgets-assets-dark.css @@ -0,0 +1,114 @@ +/******************* + * check and radio * + *******************/ +/* draw regular check and radio items using our assets */ +.check, +.check row:selected, +.check row:selected:focus { + background-image: url("assets/checkbox-unchecked-dark.png"); +} + +.check:insensitive, +.check row:selected:insensitive, +.check row:selected:focus:insensitive { + background-image: url("assets/checkbox-unchecked-insensitive-dark.png"); +} + +.check:active, +.check row:selected:active, +.check row:selected:focus:active { + background-image: url("assets/checkbox-checked-dark.png"); +} + +.check:active:insensitive, +.check row:selected:active:insensitive, +.check row:selected:focus:active:insensitive { + background-image: url("assets/checkbox-checked-insensitive-dark.png"); +} + +.check:inconsistent, +.check row:selected:inconsistent, +.check row:selected:focus:inconsistent { + background-image: url("assets/checkbox-mixed-dark.png"); +} + +.check:inconsistent:insensitive, +.check row:selected:inconsistent:insensitive, +.check row:selected:focus:inconsistent:insensitive { + background-image: url("assets/checkbox-mixed-insensitive-dark.png"); +} + +.radio, +.radio row:selected, +.radio row:selected:focus { + background-image: url("assets/radio-unselected-dark.png"); +} + +.radio:insensitive, +.radio row:selected:insensitive, +.radio row:selected:focus:insensitive { + background-image: url("assets/radio-unselected-insensitive-dark.png"); +} + +.radio:active, +.radio row:selected:active, +.radio row:selected:focus:active { + background-image: url("assets/radio-selected-dark.png"); +} + +.radio:active:insensitive, +.radio row:selected:active:insensitive, +.radio row:selected:focus:active:insensitive { + background-image: url("assets/radio-selected-insensitive-dark.png"); +} + +.radio:inconsistent, +.radio row:selected:inconsistent, +.radio row:selected:focus:inconsistent { + background-image: url("assets/radio-mixed-dark.png"); +} + +.radio:inconsistent:insensitive, +.radio row:selected:inconsistent:insensitive, +.radio row:selected:focus:inconsistent:insensitive { + background-image: url("assets/radio-mixed-insensitive-dark.png"); +} + +.menuitem.check:active { + background-image: url("assets/menuitem-checkbox-checked.png"); +} + +.menuitem.check:active:hover { + background-image: url("assets/menuitem-checkbox-checked-hover.png"); +} + +.menuitem.check:active:insensitive { + background-image: url("assets/menuitem-checkbox-checked-insensitive.png"); +} + +.menuitem.check:inconsistent:hover, +.menuitem.radio:inconsistent:hover { + background-image: url("assets/menuitem-checkbox-mixed-hover.png"); +} + +.menuitem.check:inconsistent, +.menuitem.radio:inconsistent { + background-image: url("assets/menuitem-checkbox-mixed.png"); +} + +.menuitem.check:inconsistent:insensitive, +.menuitem.radio:inconsistent:insensitive { + background-image: url("assets/menuitem-checkbox-mixed-insensitive.png"); +} + +.menuitem.radio:active { + background-image: url("assets/menuitem-radio-checked.png"); +} + +.menuitem.radio:active:hover { + background-image: url("assets/menuitem-radio-checked-hover.png"); +} + +.menuitem.radio:active:insensitive { + background-image: url("assets/menuitem-radio-checked-insensitive.png"); +}