From b4fe67e22082192106b2171c7f110e09750ce73f Mon Sep 17 00:00:00 2001 From: Cosimo Cecchi Date: Tue, 20 Nov 2012 14:25:35 -0500 Subject: views: cleanup view-related selectors - use .view {} selectors to identify the view itself, and move styling for cell renderers entirely to .cell {} selectors - remove some duplicate or useless selectors --- themes/Adwaita/gtk-3.0/gtk-widgets.css | 81 +++++++++++----------------------- 1 file changed, 25 insertions(+), 56 deletions(-) diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets.css b/themes/Adwaita/gtk-3.0/gtk-widgets.css index a3979b59..d86d06bf 100644 --- a/themes/Adwaita/gtk-3.0/gtk-widgets.css +++ b/themes/Adwaita/gtk-3.0/gtk-widgets.css @@ -1119,6 +1119,14 @@ GtkScrolledWindow GtkViewport.frame { border-style: none; } +GtkViewport { + background-color: @theme_base_color; +} + +GtkViewport:backdrop { + background-color: @theme_unfocused_base_color; +} + /*********** * Buttons * ***********/ @@ -3125,18 +3133,12 @@ GtkTreeView.dnd { border-style: solid; } -GtkViewport { - background-color: @theme_base_color; -} - -GtkViewport:backdrop { - background-color: @theme_unfocused_base_color; +GtkTreeView:selected:focus { + outline-color: mix(@theme_selected_fg_color, @theme_selected_bg_color, 0.30); } GtkIconView.view.cell:selected, GtkIconView.view.cell:selected:focus { - background-color: @theme_selected_bg_color; - color: @theme_selected_fg_color; border-radius: 4px; /* FIXME: this probably needs to be better; @@ -3147,40 +3149,35 @@ GtkIconView.view.cell:selected:focus { outline-offset: 3px; } -.view, -GtkTreeView { +.view { background-color: @theme_base_color; color: @theme_text_color; } -.view:selected, -GtkTreeView:selected { - background-color: @theme_selected_bg_color; - color: @theme_selected_fg_color; -} - -.view:insensitive, -GtkTreeView:insensitive { +.view:insensitive { background-color: @insensitive_bg_color; color: @insensitive_fg_color; } -.view:backdrop, -GtkTreeView:backdrop { +.view:backdrop { background-color: @theme_unfocused_base_color; color: @theme_unfocused_text_color; } -.cell:backdrop:selected, -GtkIconView.view.cell:backdrop:selected, -.view:backdrop:selected, -GtkTreeView:backdrop:selected { - background-color: @theme_unfocused_selected_bg_color; - color: @theme_unfocused_selected_fg_color; +.cell { + color: @theme_text_color; + padding: 2px; } -GtkTreeView:selected:focus { - outline-color: mix(@theme_selected_fg_color, @theme_selected_bg_color, 0.30); +.cell:selected, +.cell:selected:focus { + background-color: @theme_selected_bg_color; + color: @theme_selected_fg_color; +} + +.cell:backdrop:selected { + background-color: @theme_unfocused_selected_bg_color; + color: @theme_unfocused_selected_fg_color; } column-header.button, @@ -3234,34 +3231,6 @@ column-header .button.dnd { border-image-slice: 0 1; } -row:hover { - border-width: 0; -} - -row:insensitive { - border-width: 0; -} - -row:selected:focus { - border-width: 0; - background-color: @theme_selected_bg_color; -} - -row:selected { - border-width: 0; -} - -.cell { - color: @theme_text_color; - padding: 2px; - border-width: 0; -} - -.cell:selected { - background-color: @theme_selected_bg_color; - color: @theme_selected_fg_color; -} - .expander { border-style: solid; border-width: 1px; -- cgit v1.2.1 From db00fa24d8e23206163600703470ed182ff6797f Mon Sep 17 00:00:00 2001 From: Cosimo Cecchi Date: Tue, 20 Nov 2012 14:27:04 -0500 Subject: content-view: use a light noise texture for content view backgrounds This is currently used at least by Documents, Photos, Baobab, Clocks and Bijiben. --- themes/Adwaita/gtk-3.0/assets/Makefile.am | 2 + .../Adwaita/gtk-3.0/assets/noise-texture-dark.png | Bin 0 -> 69136 bytes .../Adwaita/gtk-3.0/assets/noise-texture-light.png | Bin 0 -> 69136 bytes themes/Adwaita/gtk-3.0/gtk-widgets-assets-dark.css | 7 ++++ themes/Adwaita/gtk-3.0/gtk-widgets-assets.css | 7 ++++ themes/Adwaita/gtk-3.0/gtk-widgets.css | 44 ++++++++++++++------- themes/Adwaita/gtk-3.0/gtk.gresource.xml | 2 + 7 files changed, 48 insertions(+), 14 deletions(-) create mode 100644 themes/Adwaita/gtk-3.0/assets/noise-texture-dark.png create mode 100644 themes/Adwaita/gtk-3.0/assets/noise-texture-light.png diff --git a/themes/Adwaita/gtk-3.0/assets/Makefile.am b/themes/Adwaita/gtk-3.0/assets/Makefile.am index 9ba79aa6..ca078609 100644 --- a/themes/Adwaita/gtk-3.0/assets/Makefile.am +++ b/themes/Adwaita/gtk-3.0/assets/Makefile.am @@ -47,6 +47,8 @@ EXTRA_DIST = \ menuitem-radio-checked.png \ menuitem-radio-checked-insensitive.png \ menuitem-radio-checked-selected.png \ + noise-texture-dark.png \ + noise-texture-light.png \ pane-separator-grip.svg \ pane-separator-grip-vertical.svg \ radio-checked.png \ diff --git a/themes/Adwaita/gtk-3.0/assets/noise-texture-dark.png b/themes/Adwaita/gtk-3.0/assets/noise-texture-dark.png new file mode 100644 index 00000000..f73293ef Binary files /dev/null and b/themes/Adwaita/gtk-3.0/assets/noise-texture-dark.png differ diff --git a/themes/Adwaita/gtk-3.0/assets/noise-texture-light.png b/themes/Adwaita/gtk-3.0/assets/noise-texture-light.png new file mode 100644 index 00000000..f73293ef Binary files /dev/null and b/themes/Adwaita/gtk-3.0/assets/noise-texture-light.png differ diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets-assets-dark.css b/themes/Adwaita/gtk-3.0/gtk-widgets-assets-dark.css index 1e765277..1a03edd9 100644 --- a/themes/Adwaita/gtk-3.0/gtk-widgets-assets-dark.css +++ b/themes/Adwaita/gtk-3.0/gtk-widgets-assets-dark.css @@ -405,3 +405,10 @@ .cursor-handle.top { background-image: url("assets/scale-slider-down-backdrop-dark.png"); } + +/**************** + * Content view * + ****************/ +.content-view.view { + background-image: url("assets/noise-texture-dark.png"); +} diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets-assets.css b/themes/Adwaita/gtk-3.0/gtk-widgets-assets.css index c47b67dd..40d2dd25 100644 --- a/themes/Adwaita/gtk-3.0/gtk-widgets-assets.css +++ b/themes/Adwaita/gtk-3.0/gtk-widgets-assets.css @@ -409,3 +409,10 @@ .cursor-handle.top { background-image: url("assets/scale-slider-down-backdrop.png"); } + +/**************** + * Content view * + ****************/ +.content-view.view { + background-image: url("assets/noise-texture-light.png"); +} diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets.css b/themes/Adwaita/gtk-3.0/gtk-widgets.css index d86d06bf..051f0b04 100644 --- a/themes/Adwaita/gtk-3.0/gtk-widgets.css +++ b/themes/Adwaita/gtk-3.0/gtk-widgets.css @@ -3288,30 +3288,42 @@ column-header .button.dnd { background-color: @content_view_bg; } -.content-view.view:hover { - background-color: @theme_bg_color; - color: @theme_text_color; +.content-view.view:insensitive { + background-color: @theme_unfocused_base_color; + background-image: none; } -.content-view.view:selected, -.content-view.view:active { - background-color: @theme_selected_bg_color; +.content-view.view:backdrop { + background-color: @sidebar_bg_unfocused; + background-image: none; } -.content-view.view:insensitive { - background-color: @theme_unfocused_base_color; +/* FIXME: EggListBox should set the .cell style class on + * the background it renders for the children, like + * GtkIconView and GtkTreeView do */ +.content-view.cell { + background-color: transparent; + background-image: none; } -.content-view.view:backdrop, -.content-view.view:hover:backdrop { - background-color: @sidebar_bg_unfocused; +EggListBox.content-view:hover, +.content-view.cell:hover { + background-color: @theme_bg_color; } -.content-view.view:selected:backdrop { - background-color: @theme_unfocused_selected_bg_color; +EggListBox.content-view:selected, +EggListBox.content-view:active, +.content-view.cell:selected, +.content-view.cell:active { + background-color: @theme_selected_bg_color; + background-image: none; } -.content-view.view .separator:backdrop { color: @theme_unfocused_bg_color; } +EggListBox.content-view:selected:backdrop, +.content-view.cell:selected:backdrop { + background-color: @theme_unfocused_selected_bg_color; + background-image: none; +} GdMainIconView.content-view { -GdMainIconView-icon-size: 40; @@ -3332,6 +3344,10 @@ GtkIconView.content-view.check:active { background-color: transparent; } +.content-view.view .separator:backdrop { + color: @theme_unfocused_bg_color; +} + GtkIconView.content-view.check:hover, GtkIconView.content-view.check:insensitive, GtkIconView.content-view.check:backdrop, diff --git a/themes/Adwaita/gtk-3.0/gtk.gresource.xml b/themes/Adwaita/gtk-3.0/gtk.gresource.xml index d8eba613..84b6bc1d 100644 --- a/themes/Adwaita/gtk-3.0/gtk.gresource.xml +++ b/themes/Adwaita/gtk-3.0/gtk.gresource.xml @@ -49,6 +49,8 @@ assets/menuitem-radio-checked-insensitive.png assets/menuitem-radio-checked.png assets/menuitem-radio-checked-selected.png + assets/noise-texture-dark.png + assets/noise-texture-light.png assets/pane-separator-grip.svg assets/pane-separator-grip-vertical.svg assets/radio-checked-alt-dark.png -- cgit v1.2.1 From febb4ff7c2f05f69b541c90f2c34f0950c6ea049 Mon Sep 17 00:00:00 2001 From: Cosimo Cecchi Date: Sun, 25 Nov 2012 17:25:37 -0500 Subject: assets: sync for light version changes --- themes/Adwaita/gtk-3.0/gtk-widgets-assets-dark.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets-assets-dark.css b/themes/Adwaita/gtk-3.0/gtk-widgets-assets-dark.css index 1a03edd9..7121070e 100644 --- a/themes/Adwaita/gtk-3.0/gtk-widgets-assets-dark.css +++ b/themes/Adwaita/gtk-3.0/gtk-widgets-assets-dark.css @@ -14,6 +14,8 @@ /* draw regular check and radio items using our SVG assets */ .check { background-image: url("assets/checkbox-unchecked-dark.png"); + background-repeat: no-repeat; + background-position: center; } .check row:selected, @@ -105,6 +107,8 @@ .radio { background-image: url("assets/radio-unchecked-dark.png"); + background-repeat: no-repeat; + background-position: center; } .radio row:selected, -- cgit v1.2.1 From 979375bb742660b1063488d14adab7f7fde3db9b Mon Sep 17 00:00:00 2001 From: Lapo Calamandrei Date: Mon, 26 Nov 2012 12:06:07 +0100 Subject: Adwaita gtk3: removed not some not needed column-headers selectors. --- themes/Adwaita/gtk-3.0/gtk-widgets-borders-dark.css | 9 --------- themes/Adwaita/gtk-3.0/gtk-widgets-borders.css | 10 ---------- 2 files changed, 19 deletions(-) diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets-borders-dark.css b/themes/Adwaita/gtk-3.0/gtk-widgets-borders-dark.css index dfeae08c..54fb55a5 100644 --- a/themes/Adwaita/gtk-3.0/gtk-widgets-borders-dark.css +++ b/themes/Adwaita/gtk-3.0/gtk-widgets-borders-dark.css @@ -200,15 +200,6 @@ column-header:last-child .button:backdrop { border-right-width: 0; } -column-header.button:last-child, -column-header:last-child .button, -column-header.button:last-child:active, -column-header:last-child .button:active, -column-header.button:last-child:active:hover, -column-header:last-child .button:active:hover { - border-image-slice: 0 0 1 0; -} - /* unfocused window: generic element borders */ .selection-mode.toolbar .suggested-action.button:backdrop, diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets-borders.css b/themes/Adwaita/gtk-3.0/gtk-widgets-borders.css index 3682b2ab..a844cd65 100644 --- a/themes/Adwaita/gtk-3.0/gtk-widgets-borders.css +++ b/themes/Adwaita/gtk-3.0/gtk-widgets-borders.css @@ -201,16 +201,6 @@ column-header:last-child .button:backdrop { border-right-width: 0; } -column-header.button:last-child, -column-header:last-child .button, -column-header.button:last-child:active, -column-header:last-child .button:active, -column-header.button:last-child:active:hover, -column-header:last-child .button:active:hover { - border-image-slice: 0 0 1 0; -} - - /* unfocused window: generic element borders */ .selection-mode.toolbar .suggested-action.button:backdrop, -- cgit v1.2.1