From 0ba03aac16b7cdcbca24365c4158dcbc0e557ecc Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 25 Oct 2015 16:28:38 -0400 Subject: [PATCH] Adwaita: Update separator styling Adapt Adwaita to the changes in the previous commit. --- gtk/theme/Adwaita/_common.scss | 6 +++--- gtk/theme/Adwaita/gtk-contained-dark.css | 14 +++++++------- gtk/theme/Adwaita/gtk-contained.css | 14 +++++++------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss index a2b8bd919c..c2b87f64f9 100644 --- a/gtk/theme/Adwaita/_common.scss +++ b/gtk/theme/Adwaita/_common.scss @@ -956,7 +956,7 @@ GtkComboBox { color: $backdrop_insensitive_color; } .menuitem { text-shadow: none; } - .separator.vertical { + & separator.vertical { // always disable separators -GtkWidget-wide-separators: true; } @@ -1095,7 +1095,7 @@ GtkComboBox { } .header-bar-separator, - & > GtkBox > .separator.vertical { + & > GtkBox > separator.vertical { -GtkWidget-wide-separators: true; -GtkWidget-separator-width: 1px; border-width: 0 1px; @@ -2518,7 +2518,7 @@ GtkScrolledWindow { } //vbox and hbox separators -.separator { +separator { // always disable separators // -GtkWidget-wide-separators: true; color: transparentize(black, 0.9); diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css index 29611fc1da..82a9e07ded 100644 --- a/gtk/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/theme/Adwaita/gtk-contained-dark.css @@ -1460,7 +1460,7 @@ GtkComboBox { color: #5d6767; } GtkComboBox .menuitem { text-shadow: none; } - GtkComboBox .separator.vertical { + GtkComboBox separator.vertical { -GtkWidget-wide-separators: true; } GtkComboBox.combobox-entry entry:dir(ltr) { border-top-right-radius: 0; @@ -1538,16 +1538,16 @@ GtkComboBox { font-size: smaller; padding-left: 12px; padding-right: 12px; } - .titlebar .header-bar-separator, .titlebar > GtkBox > .separator.vertical, + .titlebar .header-bar-separator, .titlebar > GtkBox > separator.vertical, .header-bar .header-bar-separator, - .header-bar > GtkBox > .separator.vertical { + .header-bar > GtkBox > separator.vertical { -GtkWidget-wide-separators: true; -GtkWidget-separator-width: 1px; border-width: 0 1px; border-image: linear-gradient(to bottom, rgba(28, 31, 31, 0), #1c1f1f 30%, #1c1f1f 70%, rgba(28, 31, 31, 0) 100%) 0 1/0 1px stretch; } - .titlebar .header-bar-separator:backdrop, .titlebar > GtkBox > .separator.vertical:backdrop, + .titlebar .header-bar-separator:backdrop, .titlebar > GtkBox > separator.vertical:backdrop, .header-bar .header-bar-separator:backdrop, - .header-bar > GtkBox > .separator.vertical:backdrop { + .header-bar > GtkBox > separator.vertical:backdrop { border-image: linear-gradient(to bottom, rgba(31, 34, 34, 0.5)) 0 1/1px 1px; } .titlebar.selection-mode, .header-bar.selection-mode { @@ -3460,9 +3460,9 @@ GtkProgressBar { GtkScrolledWindow GtkViewport.frame { border-style: none; } -.separator { +separator { color: rgba(0, 0, 0, 0.1); } - GtkFileChooserButton .separator.vertical, GtkFontButton .separator.vertical { + GtkFileChooserButton separator.vertical, GtkFontButton separator.vertical { -GtkWidget-wide-separators: true; } /********* diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css index 706939d94a..bdfc65b9ac 100644 --- a/gtk/theme/Adwaita/gtk-contained.css +++ b/gtk/theme/Adwaita/gtk-contained.css @@ -1460,7 +1460,7 @@ GtkComboBox { color: #c7c7c7; } GtkComboBox .menuitem { text-shadow: none; } - GtkComboBox .separator.vertical { + GtkComboBox separator.vertical { -GtkWidget-wide-separators: true; } GtkComboBox.combobox-entry entry:dir(ltr) { border-top-right-radius: 0; @@ -1538,16 +1538,16 @@ GtkComboBox { font-size: smaller; padding-left: 12px; padding-right: 12px; } - .titlebar .header-bar-separator, .titlebar > GtkBox > .separator.vertical, + .titlebar .header-bar-separator, .titlebar > GtkBox > separator.vertical, .header-bar .header-bar-separator, - .header-bar > GtkBox > .separator.vertical { + .header-bar > GtkBox > separator.vertical { -GtkWidget-wide-separators: true; -GtkWidget-separator-width: 1px; border-width: 0 1px; border-image: linear-gradient(to bottom, rgba(161, 161, 161, 0), #a1a1a1 30%, #a1a1a1 70%, rgba(161, 161, 161, 0) 100%) 0 1/0 1px stretch; } - .titlebar .header-bar-separator:backdrop, .titlebar > GtkBox > .separator.vertical:backdrop, + .titlebar .header-bar-separator:backdrop, .titlebar > GtkBox > separator.vertical:backdrop, .header-bar .header-bar-separator:backdrop, - .header-bar > GtkBox > .separator.vertical:backdrop { + .header-bar > GtkBox > separator.vertical:backdrop { border-image: linear-gradient(to bottom, rgba(169, 169, 169, 0.5)) 0 1/1px 1px; } .titlebar.selection-mode, .header-bar.selection-mode { @@ -3622,9 +3622,9 @@ GtkProgressBar { GtkScrolledWindow GtkViewport.frame { border-style: none; } -.separator { +separator { color: rgba(0, 0, 0, 0.1); } - GtkFileChooserButton .separator.vertical, GtkFontButton .separator.vertical { + GtkFileChooserButton separator.vertical, GtkFontButton separator.vertical { -GtkWidget-wide-separators: true; } /*********