From 974807fae9ec9ea33626fb0378b00dfe75e18470 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 27 Aug 2014 22:17:29 -0400 Subject: [PATCH] Adwaita: Make expanders turn again The theme needed some small adjustments for the recent expander state changes ACTIVE to CHECKED. --- gtk/resources/theme/Adwaita/_common.scss | 4 +- .../theme/Adwaita/gtk-contained-dark.css | 63 +++++----- gtk/resources/theme/Adwaita/gtk-contained.css | 109 +++++++++--------- 3 files changed, 83 insertions(+), 93 deletions(-) diff --git a/gtk/resources/theme/Adwaita/_common.scss b/gtk/resources/theme/Adwaita/_common.scss index 6fd5867265..d8cfbcdb3b 100644 --- a/gtk/resources/theme/Adwaita/_common.scss +++ b/gtk/resources/theme/Adwaita/_common.scss @@ -1096,7 +1096,7 @@ GtkTreeView.view { // treeview grid lines and expanders, unfortunatelly &:hover { color: $selected_fg_color; } &:backdrop { color: mix($backdrop_base_color, $selected_bg_color, 70%); } } - &:active { + &:checked { -gtk-icon-source: -gtk-icontheme('pan-down-symbolic'); } &:backdrop { color: mix($backdrop_fg_color, $backdrop_base_color, 70%); } @@ -2278,7 +2278,7 @@ GtkExpander { -gtk-icon-source: -gtk-icontheme('pan-end-symbolic'); &:dir(rtl) { -gtk-icon-source: -gtk-icontheme('pan-end-symbolic-rtl'); } &:hover { color: lighten($fg_color,30%); } //only lightens the arrow - &:active { -gtk-icon-source: -gtk-icontheme('pan-down-symbolic'); } + &:checked { -gtk-icon-source: -gtk-icontheme('pan-down-symbolic'); } } /************ diff --git a/gtk/resources/theme/Adwaita/gtk-contained-dark.css b/gtk/resources/theme/Adwaita/gtk-contained-dark.css index ebd55b0955..6aeb40c7c2 100644 --- a/gtk/resources/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/resources/theme/Adwaita/gtk-contained-dark.css @@ -3,7 +3,7 @@ @define-color theme_bg_color #393f3f; @define-color theme_base_color #292929; @define-color theme_selected_bg_color #215d9c; -@define-color theme_selected_fg_color #ffffff; +@define-color theme_selected_fg_color white; @define-color insensitive_bg_color #323636; @define-color insensitive_fg_color #939695; @define-color insensitive_base_color #292929; @@ -11,7 +11,7 @@ @define-color theme_unfocused_bg_color #393f3f; @define-color theme_unfocused_base_color #2c2c2c; @define-color theme_unfocused_selected_bg_color #215d9c; -@define-color theme_unfocused_selected_fg_color #ffffff; +@define-color theme_unfocused_selected_fg_color white; @define-color borders #1c1f1f; @define-color unfocused_borders #1e2222; @define-color warning_color #f57900; @@ -95,7 +95,7 @@ color: #939695; } .gtkstyle-fallback:selected { background-color: #215d9c; - color: #ffffff; } + color: white; } .view { color: #eeeeec; @@ -235,7 +235,7 @@ GtkTextView { box-shadow: inset 0 2px rgba(38, 38, 38, 0), inset 0 1px rgba(33, 33, 33, 0), 0 1px rgba(255, 255, 255, 0); } .entry:selected, .entry:backdrop:selected { background-color: #215d9c; - color: #ffffff; } + color: white; } .entry.progressbar { margin: 1px; border-radius: 0; @@ -305,6 +305,7 @@ GtkTextView { @keyframes needs_attention { from { background-image: -gtk-gradient(radial, center center, 0, center center, 0.01, to(#3583d5), to(transparent)); } + to { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(#215d9c), to(transparent)); } } .button { @@ -811,16 +812,14 @@ GtkTextView { background-image: linear-gradient(to bottom, #303434); box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); } -.inline-toolbar.toolbar GtkToolButton > .button.flat, .inline-toolbar GtkToolButton > .button.flat, .inline-toolbar.search-bar GtkToolButton > .button.flat, .inline-toolbar.location-bar GtkToolButton > .button.flat, -.inline-toolbar.toolbar GtkToolButton:backdrop > .button.flat, +.inline-toolbar GtkToolButton > .button.flat, .inline-toolbar.search-bar GtkToolButton > .button.flat, .inline-toolbar.location-bar GtkToolButton > .button.flat, .inline-toolbar GtkToolButton:backdrop > .button.flat, .inline-toolbar.search-bar GtkToolButton:backdrop > .button.flat, .inline-toolbar.location-bar GtkToolButton:backdrop > .button.flat, .osd .button:hover, .osd .button:active, .osd .button:checked, .osd .button:backdrop:active, .osd .button:backdrop:checked, .osd .button:insensitive, .osd .button:backdrop:insensitive, .osd .button:backdrop, .osd .button.suggested-action, .osd .button.suggested-action:hover, .osd .button.suggested-action:active, .osd .button.suggested-action:checked, .osd .button.suggested-action:backdrop:active, .osd .button.suggested-action:backdrop:checked, .osd .button.suggested-action:insensitive, .osd .button.suggested-action:backdrop:insensitive, .osd .button.suggested-action:backdrop, .osd .button.destructive-action, .osd .button.destructive-action:hover, .osd .button.destructive-action:active, .osd .button.destructive-action:checked, .osd .button.destructive-action:backdrop:active, .osd .button.destructive-action:backdrop:checked, .osd .button.destructive-action:insensitive, .osd .button.destructive-action:backdrop:insensitive, .osd .button.destructive-action:backdrop, .inline-toolbar .button, .inline-toolbar .button:backdrop, .linked .button, .linked .button:hover, .linked .button:active, .linked .button:checked, .linked .button:backdrop, GtkComboBox.combobox-entry .entry, GtkComboBox.combobox-entry .button, GtkComboBox.combobox-entry .button:backdrop, .linked > GtkComboBox > .button:dir(ltr) { border-radius: 0; border-left-style: none; } .inline-toolbar GtkToolButton > .button.flat:dir(rtl), - .inline-toolbar GtkToolButton:backdrop > .button.flat:dir(rtl), .inline-toolbar.toolbar GtkToolButton:dir(rtl) > .button.flat, .inline-toolbar GtkToolButton:dir(rtl) > .button.flat, .inline-toolbar.search-bar GtkToolButton:dir(rtl) > .button.flat, .inline-toolbar.location-bar GtkToolButton:dir(rtl) > .button.flat, - .inline-toolbar.toolbar GtkToolButton:backdrop:dir(rtl) > .button.flat, + .inline-toolbar GtkToolButton:backdrop > .button.flat:dir(rtl), .inline-toolbar GtkToolButton:dir(rtl) > .button.flat, .inline-toolbar.search-bar GtkToolButton:dir(rtl) > .button.flat, .inline-toolbar.location-bar GtkToolButton:dir(rtl) > .button.flat, .inline-toolbar GtkToolButton:backdrop:dir(rtl) > .button.flat, .inline-toolbar.search-bar GtkToolButton:backdrop:dir(rtl) > .button.flat, .inline-toolbar.location-bar GtkToolButton:backdrop:dir(rtl) > .button.flat, .osd .button:dir(rtl):hover, .osd .button:dir(rtl):active, .osd .button:dir(rtl):checked, .osd .button:dir(rtl):insensitive, .osd .button:dir(rtl):backdrop, .osd .button.suggested-action:dir(rtl), .osd .button.destructive-action:dir(rtl), .inline-toolbar .button:dir(rtl), .linked .button:dir(rtl), GtkComboBox.combobox-entry .entry:dir(rtl), GtkComboBox.combobox-entry .button:dir(rtl), .linked > GtkComboBox > .button:dir(rtl) { @@ -828,28 +827,24 @@ GtkTextView { border-right-style: none; border-left-style: solid; } -.osd .button:first-child:hover, .osd .button:first-child:active, .osd .button:first-child:checked, .osd .button:first-child:insensitive, .osd .button:first-child:backdrop, .osd .button.suggested-action:first-child, .osd .button.destructive-action:first-child, .inline-toolbar .button:first-child, .linked .button:first-child, .inline-toolbar.toolbar GtkToolButton:first-child > .button.flat, .inline-toolbar GtkToolButton:first-child > .button.flat, .inline-toolbar.search-bar GtkToolButton:first-child > .button.flat, .inline-toolbar.location-bar GtkToolButton:first-child > .button.flat, -.inline-toolbar.toolbar GtkToolButton:backdrop:first-child > .button.flat, +.osd .button:first-child:hover, .osd .button:first-child:active, .osd .button:first-child:checked, .osd .button:first-child:insensitive, .osd .button:first-child:backdrop, .osd .button.suggested-action:first-child, .osd .button.destructive-action:first-child, .inline-toolbar .button:first-child, .linked .button:first-child, .inline-toolbar GtkToolButton:first-child > .button.flat, .inline-toolbar.search-bar GtkToolButton:first-child > .button.flat, .inline-toolbar.location-bar GtkToolButton:first-child > .button.flat, .inline-toolbar GtkToolButton:backdrop:first-child > .button.flat, .inline-toolbar.search-bar GtkToolButton:backdrop:first-child > .button.flat, .inline-toolbar.location-bar GtkToolButton:backdrop:first-child > .button.flat, GtkComboBox.combobox-entry .entry:first-child, GtkComboBox.combobox-entry .button:first-child, .linked > GtkComboBox:first-child > .button { border-radius: 3px 0 0 3px; border-left-style: solid; } -.osd .button:last-child:hover, .osd .button:last-child:active, .osd .button:last-child:checked, .osd .button:last-child:insensitive, .osd .button:last-child:backdrop, .osd .button.suggested-action:last-child, .osd .button.destructive-action:last-child, .inline-toolbar .button:last-child, .linked .button:last-child, .inline-toolbar.toolbar GtkToolButton:last-child > .button.flat, .inline-toolbar GtkToolButton:last-child > .button.flat, .inline-toolbar.search-bar GtkToolButton:last-child > .button.flat, .inline-toolbar.location-bar GtkToolButton:last-child > .button.flat, -.inline-toolbar.toolbar GtkToolButton:backdrop:last-child > .button.flat, +.osd .button:last-child:hover, .osd .button:last-child:active, .osd .button:last-child:checked, .osd .button:last-child:insensitive, .osd .button:last-child:backdrop, .osd .button.suggested-action:last-child, .osd .button.destructive-action:last-child, .inline-toolbar .button:last-child, .linked .button:last-child, .inline-toolbar GtkToolButton:last-child > .button.flat, .inline-toolbar.search-bar GtkToolButton:last-child > .button.flat, .inline-toolbar.location-bar GtkToolButton:last-child > .button.flat, .inline-toolbar GtkToolButton:backdrop:last-child > .button.flat, .inline-toolbar.search-bar GtkToolButton:backdrop:last-child > .button.flat, .inline-toolbar.location-bar GtkToolButton:backdrop:last-child > .button.flat, GtkComboBox.combobox-entry .entry:last-child, GtkComboBox.combobox-entry .button:last-child, .linked > GtkComboBox:last-child > .button { border-radius: 0 3px 3px 0; } .osd .button:last-child:dir(rtl):hover, .osd .button:last-child:dir(rtl):active, .osd .button:last-child:dir(rtl):checked, .osd .button:last-child:dir(rtl):insensitive, .osd .button:last-child:dir(rtl):backdrop, .osd .button.suggested-action:last-child:dir(rtl), .osd .button.destructive-action:last-child:dir(rtl), .inline-toolbar .button:last-child:dir(rtl), .linked .button:last-child:dir(rtl), .inline-toolbar GtkToolButton:last-child > .button.flat:dir(rtl), - .inline-toolbar GtkToolButton:backdrop:last-child > .button.flat:dir(rtl), .inline-toolbar.toolbar GtkToolButton:last-child:dir(rtl) > .button.flat, .inline-toolbar GtkToolButton:last-child:dir(rtl) > .button.flat, .inline-toolbar.search-bar GtkToolButton:last-child:dir(rtl) > .button.flat, .inline-toolbar.location-bar GtkToolButton:last-child:dir(rtl) > .button.flat, - .inline-toolbar.toolbar GtkToolButton:backdrop:last-child:dir(rtl) > .button.flat, + .inline-toolbar GtkToolButton:backdrop:last-child > .button.flat:dir(rtl), .inline-toolbar GtkToolButton:last-child:dir(rtl) > .button.flat, .inline-toolbar.search-bar GtkToolButton:last-child:dir(rtl) > .button.flat, .inline-toolbar.location-bar GtkToolButton:last-child:dir(rtl) > .button.flat, .inline-toolbar GtkToolButton:backdrop:last-child:dir(rtl) > .button.flat, .inline-toolbar.search-bar GtkToolButton:backdrop:last-child:dir(rtl) > .button.flat, .inline-toolbar.location-bar GtkToolButton:backdrop:last-child:dir(rtl) > .button.flat, GtkComboBox.combobox-entry .entry:last-child:dir(rtl), GtkComboBox.combobox-entry .button:last-child:dir(rtl), .linked > GtkComboBox:last-child > .button:dir(rtl) { border-right-style: solid; } -.osd .button:only-child:hover, .osd .button:only-child:active, .osd .button:only-child:checked, .osd .button:only-child:insensitive, .osd .button:only-child:backdrop, .osd .button.suggested-action:only-child, .osd .button.destructive-action:only-child, .inline-toolbar .button:only-child, .linked .button:only-child, .inline-toolbar.toolbar GtkToolButton:only-child > .button.flat, .inline-toolbar GtkToolButton:only-child > .button.flat, .inline-toolbar.search-bar GtkToolButton:only-child > .button.flat, .inline-toolbar.location-bar GtkToolButton:only-child > .button.flat, -.inline-toolbar.toolbar GtkToolButton:backdrop:only-child > .button.flat, +.osd .button:only-child:hover, .osd .button:only-child:active, .osd .button:only-child:checked, .osd .button:only-child:insensitive, .osd .button:only-child:backdrop, .osd .button.suggested-action:only-child, .osd .button.destructive-action:only-child, .inline-toolbar .button:only-child, .linked .button:only-child, .inline-toolbar GtkToolButton:only-child > .button.flat, .inline-toolbar.search-bar GtkToolButton:only-child > .button.flat, .inline-toolbar.location-bar GtkToolButton:only-child > .button.flat, .inline-toolbar GtkToolButton:backdrop:only-child > .button.flat, .inline-toolbar.search-bar GtkToolButton:backdrop:only-child > .button.flat, .inline-toolbar.location-bar GtkToolButton:backdrop:only-child > .button.flat, GtkComboBox.combobox-entry .entry:only-child, GtkComboBox.combobox-entry .button:only-child, .linked > GtkComboBox:only-child > .button { @@ -1161,7 +1156,7 @@ GtkComboBox { border-image: linear-gradient(to bottom, rgba(30, 34, 34, 0.5)) 0 1/1px 1px; } .titlebar.selection-mode, GtkCalendar.selection-mode.header, .header-bar.selection-mode { - color: #ffffff; + color: white; text-shadow: 0 1px rgba(0, 0, 0, 0.5); border-color: #0f2b48; background-image: linear-gradient(to bottom, #256ab1, #215d9c); @@ -1174,7 +1169,7 @@ GtkComboBox { .header-bar.selection-mode .button { border-style: solid; border-width: 1px; - color: #ffffff; + color: white; background-image: linear-gradient(to bottom, #256ab1, #215d9c 40%, #1c5187); border-color: #0b1e33; text-shadow: 0 -1px rgba(0, 0, 0, 0.70353); @@ -1183,7 +1178,7 @@ GtkComboBox { .titlebar.selection-mode .button:hover, GtkCalendar.selection-mode.header .button:hover, .header-bar.selection-mode .button:hover { border-style: solid; - color: #ffffff; + color: white; border-color: #0b1e33; background-image: linear-gradient(to bottom, #3180d4, #2467ad 40%, #215d9c); text-shadow: 0 -1px rgba(0, 0, 0, 0.67153); @@ -1193,7 +1188,7 @@ GtkComboBox { .header-bar.selection-mode .button:active, .header-bar.selection-mode .button:checked { border-style: solid; - color: #ffffff; + color: white; border-color: #0b1e33; background-image: linear-gradient(to bottom, #194776, #1c5187); text-shadow: 0 -1px rgba(0, 0, 0, 0.78353); @@ -1211,7 +1206,7 @@ GtkComboBox { .titlebar.selection-mode .button:backdrop, GtkCalendar.selection-mode.header .button:backdrop, .header-bar.selection-mode .button:backdrop { border-style: solid; - color: #ffffff; + color: white; border-color: #0b1e33; background-image: linear-gradient(to bottom, #215d9c); text-shadow: none; @@ -1356,10 +1351,10 @@ GtkTreeView.view { GtkTreeView.view.expander:selected { color: #bccee1; } GtkTreeView.view.expander:selected:hover { - color: #ffffff; } + color: white; } GtkTreeView.view.expander:selected:backdrop { color: #283a4d; } - GtkTreeView.view.expander:active { + GtkTreeView.view.expander:checked { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); } GtkTreeView.view.expander:backdrop { color: #999b99; } @@ -1447,7 +1442,7 @@ GtkTreeView.view.progressbar { text-shadow: none; padding: 4px; } .menu .menuitem:hover { - color: #ffffff; + color: white; background-color: #215d9c; } .menu .menuitem:insensitive { color: #939695; } @@ -1892,7 +1887,7 @@ GtkSwitch { background-image: none; background-color: #323636; } .list-row:selected GtkSwitch { - box-shadow: 0 0 0 1px #ffffff; } + box-shadow: 0 0 0 1px white; } .list-row:selected GtkSwitch:backdrop { box-shadow: 0 0 0 1px #2c2c2c; } GtkSwitch.slider, .list-row:selected GtkSwitch.slider { @@ -2786,7 +2781,7 @@ GtkLevelBar.vertical { .view:selected, .view:selected:focus, .view:selected:hover, GtkLabel:selected, GtkLabel:selected:focus, GtkLabel:selected:hover, .entry:selected, .entry:selected:focus, .menuitem.button.flat:selected { background-color: #215d9c; - color: #ffffff; } + color: white; } .view:backdrop:selected, GtkLabel:backdrop:selected, .entry:backdrop:selected, .menuitem.button.flat:backdrop:selected { color: #c9cbc9; } @@ -2850,7 +2845,7 @@ GtkScrolledWindow GtkViewport.frame { background-color: #1d538c; } .list-row:selected { - color: #ffffff; + color: white; background-color: #215d9c; } .list-row:selected:backdrop { color: #2c2c2c; } @@ -2931,7 +2926,7 @@ GtkExpander { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); } GtkExpander:hover { color: white; } - GtkExpander:active { + GtkExpander:checked { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); } /************ @@ -2941,7 +2936,7 @@ GtkCalendar { border: 1px solid #1c1f1f; } GtkCalendar:selected { background-color: #215d9c; - color: #ffffff; + color: white; border-radius: 3px; } GtkCalendar:selected:backdrop { color: #c9cbc9; } @@ -3195,7 +3190,7 @@ GtkInfoBar { .warning, .error { background-color: #215d9c; - color: #ffffff; + color: white; text-shadow: 0 1px #184472; border-color: #184472; } .info .button, @@ -3204,7 +3199,7 @@ GtkInfoBar { .error .button { border-style: solid; border-width: 1px; - color: #ffffff; + color: white; background-image: linear-gradient(to bottom, #256ab1, #215d9c 40%, #1c5187); border-color: #0b1e33; text-shadow: 0 -1px rgba(0, 0, 0, 0.70353); @@ -3215,7 +3210,7 @@ GtkInfoBar { .warning .button:hover, .error .button:hover { border-style: solid; - color: #ffffff; + color: white; border-color: #0b1e33; background-image: linear-gradient(to bottom, #3180d4, #2467ad 40%, #215d9c); text-shadow: 0 -1px rgba(0, 0, 0, 0.67153); @@ -3226,7 +3221,7 @@ GtkInfoBar { .warning .button:active, .error .button:active { border-style: solid; - color: #ffffff; + color: white; border-color: #0b1e33; background-image: linear-gradient(to bottom, #194776, #1c5187); text-shadow: 0 -1px rgba(0, 0, 0, 0.78353); @@ -3248,7 +3243,7 @@ GtkInfoBar { .warning .button:backdrop, .error .button:backdrop { border-style: solid; - color: #ffffff; + color: white; border-color: #0b1e33; background-image: linear-gradient(to bottom, #215d9c); text-shadow: none; diff --git a/gtk/resources/theme/Adwaita/gtk-contained.css b/gtk/resources/theme/Adwaita/gtk-contained.css index 23f39fbfed..c8d6e09367 100644 --- a/gtk/resources/theme/Adwaita/gtk-contained.css +++ b/gtk/resources/theme/Adwaita/gtk-contained.css @@ -1,17 +1,17 @@ /* GTK NAMED COLORS */ @define-color theme_fg_color #2e3436; @define-color theme_bg_color #ededed; -@define-color theme_base_color #ffffff; +@define-color theme_base_color white; @define-color theme_selected_bg_color #4a90d9; -@define-color theme_selected_fg_color #ffffff; +@define-color theme_selected_fg_color white; @define-color insensitive_bg_color #f4f4f4; @define-color insensitive_fg_color #8d9091; -@define-color insensitive_base_color #ffffff; +@define-color insensitive_base_color white; @define-color theme_unfocused_fg_color #54595a; @define-color theme_unfocused_bg_color #ededed; @define-color theme_unfocused_base_color #fcfcfc; @define-color theme_unfocused_selected_bg_color #4a90d9; -@define-color theme_unfocused_selected_fg_color #ffffff; +@define-color theme_unfocused_selected_fg_color white; @define-color borders #a1a1a1; @define-color unfocused_borders #a8a8a8; @define-color warning_color #f57900; @@ -30,7 +30,7 @@ @define-color wm_button_active_color_a shade(#ededed, 0.85); @define-color wm_button_active_color_b shade(#ededed, 0.89); @define-color wm_button_active_color_c shade(#ededed, 0.9); -@define-color content_view_bg #ffffff; +@define-color content_view_bg white; * { padding: 0; -GtkToolButton-icon-spacing: 4; @@ -95,11 +95,11 @@ color: #8d9091; } .gtkstyle-fallback:selected { background-color: #4a90d9; - color: #ffffff; } + color: white; } .view { color: #2e3436; - background-color: #ffffff; } + background-color: white; } .view:backdrop { color: #54595a; background-color: #fcfcfc; } @@ -127,7 +127,7 @@ GtkLabel:insensitive { text-shadow: none; } GtkAssistant .sidebar { - background-color: #ffffff; + background-color: white; border-top: 1px solid #a1a1a1; } GtkAssistant .sidebar:dir(ltr) { border-right: 1px solid #a1a1a1; } @@ -182,7 +182,7 @@ GtkTextView { background-color: transparent; border-style: solid; border-width: 1px; - background-image: linear-gradient(to bottom, #f7f7f7, #ffffff 90%); + background-image: linear-gradient(to bottom, #f7f7f7, white 90%); border-color: #a1a1a1; box-shadow: inset 0 3px #f7f7f7, inset 0 1px #d1d1d1, inset 0 0 0 1px rgba(74, 144, 217, 0), 0 1px white; } .entry.image.left { @@ -194,7 +194,7 @@ GtkTextView { background-color: transparent; border-style: solid; border-width: 1px; - background-image: linear-gradient(to bottom, #f7f7f7, #ffffff 90%); + background-image: linear-gradient(to bottom, #f7f7f7, white 90%); border-color: #a1a1a1; box-shadow: inset 0 3px #f7f7f7, inset 0 1px #d1d1d1, inset 0 0 0 1px rgba(74, 144, 217, 0); border: none; @@ -203,14 +203,14 @@ GtkTextView { background-color: transparent; border-style: solid; border-width: 1px; - background-image: linear-gradient(to bottom, #f7f7f7, #ffffff 90%); + background-image: linear-gradient(to bottom, #f7f7f7, white 90%); box-shadow: inset 0 3px #f7f7f7, inset 0 1px #d1d1d1, inset 0 0 0 1px rgba(74, 144, 217, 0.15), 0 1px white; border-color: #4a90d9; } .entry:insensitive { background-color: transparent; border-style: solid; border-width: 1px; - background-image: linear-gradient(to bottom, #f7f7f7, #ffffff 90%); + background-image: linear-gradient(to bottom, #f7f7f7, white 90%); color: #8d9091; border-color: #a1a1a1; background-image: linear-gradient(to bottom, #f4f4f4); @@ -219,7 +219,7 @@ GtkTextView { background-color: transparent; border-style: solid; border-width: 1px; - background-image: linear-gradient(to bottom, #f7f7f7, #ffffff 90%); + background-image: linear-gradient(to bottom, #f7f7f7, white 90%); color: #54595a; border-color: #a8a8a8; background-image: linear-gradient(to bottom, #fcfcfc); @@ -228,14 +228,14 @@ GtkTextView { background-color: transparent; border-style: solid; border-width: 1px; - background-image: linear-gradient(to bottom, #f7f7f7, #ffffff 90%); + background-image: linear-gradient(to bottom, #f7f7f7, white 90%); color: #c7c7c7; border-color: #a8a8a8; background-image: linear-gradient(to bottom, #f4f4f4); box-shadow: inset 0 2px rgba(242, 242, 242, 0), inset 0 1px rgba(209, 209, 209, 0), 0 1px rgba(255, 255, 255, 0); } .entry:selected, .entry:backdrop:selected { background-color: #4a90d9; - color: #ffffff; } + color: white; } .entry.progressbar { margin: 1px; border-radius: 0; @@ -265,7 +265,7 @@ GtkTextView { background-color: transparent; border-style: solid; border-width: 1px; - background-image: linear-gradient(to bottom, #f7f7f7, #ffffff 90%); + background-image: linear-gradient(to bottom, #f7f7f7, white 90%); box-shadow: inset 0 3px #f7f7f7, inset 0 1px #d1d1d1, inset 0 0 0 1px rgba(204, 0, 0, 0.15), 0 1px white; border-color: #cc0000; } .entry.error:selected, .entry.error:selected:focus { @@ -277,7 +277,7 @@ GtkTextView { background-color: transparent; border-style: solid; border-width: 1px; - background-image: linear-gradient(to bottom, #f7f7f7, #ffffff 90%); + background-image: linear-gradient(to bottom, #f7f7f7, white 90%); box-shadow: inset 0 3px #f7f7f7, inset 0 1px #d1d1d1, inset 0 0 0 1px rgba(245, 121, 0, 0.15), 0 1px white; border-color: #f57900; } .entry.warning:selected, .entry.warning:selected:focus { @@ -297,6 +297,7 @@ GtkTextView { @keyframes needs_attention { from { background-image: -gtk-gradient(radial, center center, 0, center center, 0.01, to(#4a90d9), to(transparent)); } + to { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(#4a90d9), to(transparent)); } } .button { @@ -803,16 +804,14 @@ GtkTextView { background-image: linear-gradient(to bottom, #ededed); box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); } -.inline-toolbar.toolbar GtkToolButton > .button.flat, .inline-toolbar GtkToolButton > .button.flat, .inline-toolbar.search-bar GtkToolButton > .button.flat, .inline-toolbar.location-bar GtkToolButton > .button.flat, -.inline-toolbar.toolbar GtkToolButton:backdrop > .button.flat, +.inline-toolbar GtkToolButton > .button.flat, .inline-toolbar.search-bar GtkToolButton > .button.flat, .inline-toolbar.location-bar GtkToolButton > .button.flat, .inline-toolbar GtkToolButton:backdrop > .button.flat, .inline-toolbar.search-bar GtkToolButton:backdrop > .button.flat, .inline-toolbar.location-bar GtkToolButton:backdrop > .button.flat, .osd .button:hover, .osd .button:active, .osd .button:checked, .osd .button:backdrop:active, .osd .button:backdrop:checked, .osd .button:insensitive, .osd .button:backdrop:insensitive, .osd .button:backdrop, .osd .button.suggested-action, .osd .button.suggested-action:hover, .osd .button.suggested-action:active, .osd .button.suggested-action:checked, .osd .button.suggested-action:backdrop:active, .osd .button.suggested-action:backdrop:checked, .osd .button.suggested-action:insensitive, .osd .button.suggested-action:backdrop:insensitive, .osd .button.suggested-action:backdrop, .osd .button.destructive-action, .osd .button.destructive-action:hover, .osd .button.destructive-action:active, .osd .button.destructive-action:checked, .osd .button.destructive-action:backdrop:active, .osd .button.destructive-action:backdrop:checked, .osd .button.destructive-action:insensitive, .osd .button.destructive-action:backdrop:insensitive, .osd .button.destructive-action:backdrop, .inline-toolbar .button, .inline-toolbar .button:backdrop, .linked .button, .linked .button:hover, .linked .button:active, .linked .button:checked, .linked .button:backdrop, GtkComboBox.combobox-entry .entry, GtkComboBox.combobox-entry .button, GtkComboBox.combobox-entry .button:backdrop, .linked > GtkComboBox > .button:dir(ltr) { border-radius: 0; border-left-style: none; } .inline-toolbar GtkToolButton > .button.flat:dir(rtl), - .inline-toolbar GtkToolButton:backdrop > .button.flat:dir(rtl), .inline-toolbar.toolbar GtkToolButton:dir(rtl) > .button.flat, .inline-toolbar GtkToolButton:dir(rtl) > .button.flat, .inline-toolbar.search-bar GtkToolButton:dir(rtl) > .button.flat, .inline-toolbar.location-bar GtkToolButton:dir(rtl) > .button.flat, - .inline-toolbar.toolbar GtkToolButton:backdrop:dir(rtl) > .button.flat, + .inline-toolbar GtkToolButton:backdrop > .button.flat:dir(rtl), .inline-toolbar GtkToolButton:dir(rtl) > .button.flat, .inline-toolbar.search-bar GtkToolButton:dir(rtl) > .button.flat, .inline-toolbar.location-bar GtkToolButton:dir(rtl) > .button.flat, .inline-toolbar GtkToolButton:backdrop:dir(rtl) > .button.flat, .inline-toolbar.search-bar GtkToolButton:backdrop:dir(rtl) > .button.flat, .inline-toolbar.location-bar GtkToolButton:backdrop:dir(rtl) > .button.flat, .osd .button:dir(rtl):hover, .osd .button:dir(rtl):active, .osd .button:dir(rtl):checked, .osd .button:dir(rtl):insensitive, .osd .button:dir(rtl):backdrop, .osd .button.suggested-action:dir(rtl), .osd .button.destructive-action:dir(rtl), .inline-toolbar .button:dir(rtl), .linked .button:dir(rtl), GtkComboBox.combobox-entry .entry:dir(rtl), GtkComboBox.combobox-entry .button:dir(rtl), .linked > GtkComboBox > .button:dir(rtl) { @@ -820,28 +819,24 @@ GtkTextView { border-right-style: none; border-left-style: solid; } -.osd .button:first-child:hover, .osd .button:first-child:active, .osd .button:first-child:checked, .osd .button:first-child:insensitive, .osd .button:first-child:backdrop, .osd .button.suggested-action:first-child, .osd .button.destructive-action:first-child, .inline-toolbar .button:first-child, .linked .button:first-child, .inline-toolbar.toolbar GtkToolButton:first-child > .button.flat, .inline-toolbar GtkToolButton:first-child > .button.flat, .inline-toolbar.search-bar GtkToolButton:first-child > .button.flat, .inline-toolbar.location-bar GtkToolButton:first-child > .button.flat, -.inline-toolbar.toolbar GtkToolButton:backdrop:first-child > .button.flat, +.osd .button:first-child:hover, .osd .button:first-child:active, .osd .button:first-child:checked, .osd .button:first-child:insensitive, .osd .button:first-child:backdrop, .osd .button.suggested-action:first-child, .osd .button.destructive-action:first-child, .inline-toolbar .button:first-child, .linked .button:first-child, .inline-toolbar GtkToolButton:first-child > .button.flat, .inline-toolbar.search-bar GtkToolButton:first-child > .button.flat, .inline-toolbar.location-bar GtkToolButton:first-child > .button.flat, .inline-toolbar GtkToolButton:backdrop:first-child > .button.flat, .inline-toolbar.search-bar GtkToolButton:backdrop:first-child > .button.flat, .inline-toolbar.location-bar GtkToolButton:backdrop:first-child > .button.flat, GtkComboBox.combobox-entry .entry:first-child, GtkComboBox.combobox-entry .button:first-child, .linked > GtkComboBox:first-child > .button { border-radius: 3px 0 0 3px; border-left-style: solid; } -.osd .button:last-child:hover, .osd .button:last-child:active, .osd .button:last-child:checked, .osd .button:last-child:insensitive, .osd .button:last-child:backdrop, .osd .button.suggested-action:last-child, .osd .button.destructive-action:last-child, .inline-toolbar .button:last-child, .linked .button:last-child, .inline-toolbar.toolbar GtkToolButton:last-child > .button.flat, .inline-toolbar GtkToolButton:last-child > .button.flat, .inline-toolbar.search-bar GtkToolButton:last-child > .button.flat, .inline-toolbar.location-bar GtkToolButton:last-child > .button.flat, -.inline-toolbar.toolbar GtkToolButton:backdrop:last-child > .button.flat, +.osd .button:last-child:hover, .osd .button:last-child:active, .osd .button:last-child:checked, .osd .button:last-child:insensitive, .osd .button:last-child:backdrop, .osd .button.suggested-action:last-child, .osd .button.destructive-action:last-child, .inline-toolbar .button:last-child, .linked .button:last-child, .inline-toolbar GtkToolButton:last-child > .button.flat, .inline-toolbar.search-bar GtkToolButton:last-child > .button.flat, .inline-toolbar.location-bar GtkToolButton:last-child > .button.flat, .inline-toolbar GtkToolButton:backdrop:last-child > .button.flat, .inline-toolbar.search-bar GtkToolButton:backdrop:last-child > .button.flat, .inline-toolbar.location-bar GtkToolButton:backdrop:last-child > .button.flat, GtkComboBox.combobox-entry .entry:last-child, GtkComboBox.combobox-entry .button:last-child, .linked > GtkComboBox:last-child > .button { border-radius: 0 3px 3px 0; } .osd .button:last-child:dir(rtl):hover, .osd .button:last-child:dir(rtl):active, .osd .button:last-child:dir(rtl):checked, .osd .button:last-child:dir(rtl):insensitive, .osd .button:last-child:dir(rtl):backdrop, .osd .button.suggested-action:last-child:dir(rtl), .osd .button.destructive-action:last-child:dir(rtl), .inline-toolbar .button:last-child:dir(rtl), .linked .button:last-child:dir(rtl), .inline-toolbar GtkToolButton:last-child > .button.flat:dir(rtl), - .inline-toolbar GtkToolButton:backdrop:last-child > .button.flat:dir(rtl), .inline-toolbar.toolbar GtkToolButton:last-child:dir(rtl) > .button.flat, .inline-toolbar GtkToolButton:last-child:dir(rtl) > .button.flat, .inline-toolbar.search-bar GtkToolButton:last-child:dir(rtl) > .button.flat, .inline-toolbar.location-bar GtkToolButton:last-child:dir(rtl) > .button.flat, - .inline-toolbar.toolbar GtkToolButton:backdrop:last-child:dir(rtl) > .button.flat, + .inline-toolbar GtkToolButton:backdrop:last-child > .button.flat:dir(rtl), .inline-toolbar GtkToolButton:last-child:dir(rtl) > .button.flat, .inline-toolbar.search-bar GtkToolButton:last-child:dir(rtl) > .button.flat, .inline-toolbar.location-bar GtkToolButton:last-child:dir(rtl) > .button.flat, .inline-toolbar GtkToolButton:backdrop:last-child:dir(rtl) > .button.flat, .inline-toolbar.search-bar GtkToolButton:backdrop:last-child:dir(rtl) > .button.flat, .inline-toolbar.location-bar GtkToolButton:backdrop:last-child:dir(rtl) > .button.flat, GtkComboBox.combobox-entry .entry:last-child:dir(rtl), GtkComboBox.combobox-entry .button:last-child:dir(rtl), .linked > GtkComboBox:last-child > .button:dir(rtl) { border-right-style: solid; } -.osd .button:only-child:hover, .osd .button:only-child:active, .osd .button:only-child:checked, .osd .button:only-child:insensitive, .osd .button:only-child:backdrop, .osd .button.suggested-action:only-child, .osd .button.destructive-action:only-child, .inline-toolbar .button:only-child, .linked .button:only-child, .inline-toolbar.toolbar GtkToolButton:only-child > .button.flat, .inline-toolbar GtkToolButton:only-child > .button.flat, .inline-toolbar.search-bar GtkToolButton:only-child > .button.flat, .inline-toolbar.location-bar GtkToolButton:only-child > .button.flat, -.inline-toolbar.toolbar GtkToolButton:backdrop:only-child > .button.flat, +.osd .button:only-child:hover, .osd .button:only-child:active, .osd .button:only-child:checked, .osd .button:only-child:insensitive, .osd .button:only-child:backdrop, .osd .button.suggested-action:only-child, .osd .button.destructive-action:only-child, .inline-toolbar .button:only-child, .linked .button:only-child, .inline-toolbar GtkToolButton:only-child > .button.flat, .inline-toolbar.search-bar GtkToolButton:only-child > .button.flat, .inline-toolbar.location-bar GtkToolButton:only-child > .button.flat, .inline-toolbar GtkToolButton:backdrop:only-child > .button.flat, .inline-toolbar.search-bar GtkToolButton:backdrop:only-child > .button.flat, .inline-toolbar.location-bar GtkToolButton:backdrop:only-child > .button.flat, GtkComboBox.combobox-entry .entry:only-child, GtkComboBox.combobox-entry .button:only-child, .linked > GtkComboBox:only-child > .button { @@ -1153,7 +1148,7 @@ GtkComboBox { border-image: linear-gradient(to bottom, rgba(168, 168, 168, 0.5)) 0 1/1px 1px; } .titlebar.selection-mode, GtkCalendar.selection-mode.header, .header-bar.selection-mode { - color: #ffffff; + color: white; text-shadow: 0 1px rgba(0, 0, 0, 0.5); border-color: #184472; background-image: linear-gradient(to bottom, #5f9ddd, #4a90d9); @@ -1166,7 +1161,7 @@ GtkComboBox { .header-bar.selection-mode .button { border-style: solid; border-width: 1px; - color: #ffffff; + color: white; background-image: linear-gradient(to bottom, #5f9ddd, #4a90d9 40%, #3583d5); border-color: #1c5187; text-shadow: 0 -1px rgba(0, 0, 0, 0.54353); @@ -1175,7 +1170,7 @@ GtkComboBox { .titlebar.selection-mode .button:hover, GtkCalendar.selection-mode.header .button:hover, .header-bar.selection-mode .button:hover { border-style: solid; - color: #ffffff; + color: white; border-color: #1c5187; background-image: linear-gradient(to bottom, #85b4e5, #5b9add 40%, #4a90d9); text-shadow: 0 -1px rgba(0, 0, 0, 0.51153); @@ -1185,7 +1180,7 @@ GtkComboBox { .header-bar.selection-mode .button:active, .header-bar.selection-mode .button:checked { border-style: solid; - color: #ffffff; + color: white; border-color: #1c5187; background-image: linear-gradient(to bottom, #2b79cb, #3583d5); text-shadow: 0 -1px rgba(0, 0, 0, 0.62353); @@ -1203,7 +1198,7 @@ GtkComboBox { .titlebar.selection-mode .button:backdrop, GtkCalendar.selection-mode.header .button:backdrop, .header-bar.selection-mode .button:backdrop { border-style: solid; - color: #ffffff; + color: white; border-color: #4a90d9; background-image: linear-gradient(to bottom, #4a90d9); text-shadow: none; @@ -1348,17 +1343,17 @@ GtkTreeView.view { GtkTreeView.view.expander:selected { color: #c8ddf3; } GtkTreeView.view.expander:selected:hover { - color: #ffffff; } + color: white; } GtkTreeView.view.expander:selected:backdrop { color: #c6dbf1; } - GtkTreeView.view.expander:active { + GtkTreeView.view.expander:checked { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); } GtkTreeView.view.expander:backdrop { color: #86898a; } column-header .button { color: #96999a; - background-color: #ffffff; + background-color: white; font-weight: bold; text-shadow: none; box-shadow: none; } @@ -1375,7 +1370,7 @@ column-header:last-child .button, column-header:last-child.button { column-header.button.dnd, column-header .button.dnd, column-header.button.dnd:active, column-header.button.dnd:selected, column-header.button.dnd:hover { transition: none; color: #4a90d9; - box-shadow: inset 1px 1px 0 1px #4a90d9, inset -1px 0 0 1px #4a90d9, inset 1px 1px #ffffff, inset -1px 0 #ffffff; } + box-shadow: inset 1px 1px 0 1px #4a90d9, inset -1px 0 0 1px #4a90d9, inset 1px 1px white, inset -1px 0 white; } column-header .button, column-header .button:hover, column-header .button:active { padding: 3px 6px; @@ -1398,7 +1393,7 @@ column-header .button, column-header .button:hover, column-header .button:active background-image: none; } GtkTreeView.view.progressbar { - color: #ffffff; + color: white; border-radius: 4px; border-color: #184472; background-image: linear-gradient(to bottom, #4a90d9, #2a76c6); @@ -1406,7 +1401,7 @@ GtkTreeView.view.progressbar { GtkTreeView.view.progressbar:selected { color: #4a90d9; box-shadow: none; - background-image: linear-gradient(to bottom, #ffffff, #e6e6e6); } + background-image: linear-gradient(to bottom, white, #e6e6e6); } GtkTreeView.view.progressbar:selected:backdrop { color: #4a90d9; background-color: #fcfcfc; } @@ -1436,12 +1431,12 @@ GtkTreeView.view.progressbar { .menu { margin: 4px; padding: 0px; - background-color: #ffffff; } + background-color: white; } .menu .menuitem { text-shadow: none; padding: 4px; } .menu .menuitem:hover { - color: #ffffff; + color: white; background-color: #4a90d9; } .menu .menuitem:insensitive { color: #8d9091; } @@ -1555,7 +1550,7 @@ GtkTreeView.view.progressbar { *****************/ .notebook { padding: 0; - background-color: #ffffff; + background-color: white; -GtkNotebook-initial-gap: 10; -GtkNotebook-arrow-spacing: 5; -GtkNotebook-tab-curvature: 0; @@ -1887,7 +1882,7 @@ GtkSwitch { background-image: none; background-color: #f4f4f4; } .list-row:selected GtkSwitch { - box-shadow: 0 0 0 1px #ffffff; } + box-shadow: 0 0 0 1px white; } .list-row:selected GtkSwitch:backdrop { box-shadow: 0 0 0 1px #fcfcfc; } GtkSwitch.slider, .list-row:selected GtkSwitch.slider { @@ -2736,14 +2731,14 @@ GtkLevelBar.vertical { background-color: transparent; border-style: solid; border-width: 1px; - background-image: linear-gradient(to bottom, #f7f7f7, #ffffff 90%); + background-image: linear-gradient(to bottom, #f7f7f7, white 90%); border-color: #a1a1a1; box-shadow: inset 0 3px #f7f7f7, inset 0 1px #d1d1d1, inset 0 0 0 1px rgba(74, 144, 217, 0), 0 1px white; } .level-bar.trough:backdrop { background-color: transparent; border-style: solid; border-width: 1px; - background-image: linear-gradient(to bottom, #f7f7f7, #ffffff 90%); + background-image: linear-gradient(to bottom, #f7f7f7, white 90%); color: #54595a; border-color: #a8a8a8; background-image: linear-gradient(to bottom, #fcfcfc); @@ -2781,7 +2776,7 @@ GtkLevelBar.vertical { .view:selected, .view:selected:focus, .view:selected:hover, GtkLabel:selected, GtkLabel:selected:focus, GtkLabel:selected:hover, .entry:selected, .entry:selected:focus, .menuitem.button.flat:selected { background-color: #4a90d9; - color: #ffffff; + color: white; outline-color: rgba(255, 255, 255, 0.3); } .view:backdrop:selected, GtkLabel:backdrop:selected, .entry:backdrop:selected, .menuitem.button.flat:backdrop:selected { color: #fcfcfc; } @@ -2821,7 +2816,7 @@ GtkScrolledWindow GtkViewport.frame { * Lists * *********/ .list, .list-row { - background-color: #ffffff; + background-color: white; border-color: #a1a1a1; } .list:backdrop, .list-row:backdrop { background-color: #fcfcfc; @@ -2846,7 +2841,7 @@ GtkScrolledWindow GtkViewport.frame { background-color: #4281c3; } .list-row:selected { - color: #ffffff; + color: white; background-color: #4a90d9; } .list-row:selected:backdrop { color: #fcfcfc; } @@ -2927,7 +2922,7 @@ GtkExpander { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); } GtkExpander:hover { color: #748489; } - GtkExpander:active { + GtkExpander:checked { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); } /************ @@ -2937,7 +2932,7 @@ GtkCalendar { border: 1px solid #a1a1a1; } GtkCalendar:selected { background-color: #4a90d9; - color: #ffffff; + color: white; border-radius: 3px; } GtkCalendar:selected:backdrop { color: #fcfcfc; } @@ -3131,7 +3126,7 @@ GtkCalendar { border-bottom-left-radius: 7px; } GtkFileChooserDialog .search-bar { - background-color: #ffffff; + background-color: white; border-color: #ededed; box-shadow: none; } GtkFileChooserDialog .search-bar:backdrop { @@ -3191,7 +3186,7 @@ GtkInfoBar { .warning, .error { background-color: #4a90d9; - color: #ffffff; + color: white; text-shadow: 0 1px #2a76c6; border-color: #2a76c6; } .info .button, @@ -3200,7 +3195,7 @@ GtkInfoBar { .error .button { border-style: solid; border-width: 1px; - color: #ffffff; + color: white; background-image: linear-gradient(to bottom, #5f9ddd, #4a90d9 40%, #3583d5); border-color: #1c5187; text-shadow: 0 -1px rgba(0, 0, 0, 0.54353); @@ -3211,7 +3206,7 @@ GtkInfoBar { .warning .button:hover, .error .button:hover { border-style: solid; - color: #ffffff; + color: white; border-color: #1c5187; background-image: linear-gradient(to bottom, #85b4e5, #5b9add 40%, #4a90d9); text-shadow: 0 -1px rgba(0, 0, 0, 0.51153); @@ -3222,7 +3217,7 @@ GtkInfoBar { .warning .button:active, .error .button:active { border-style: solid; - color: #ffffff; + color: white; border-color: #1c5187; background-image: linear-gradient(to bottom, #2b79cb, #3583d5); text-shadow: 0 -1px rgba(0, 0, 0, 0.62353); @@ -3244,7 +3239,7 @@ GtkInfoBar { .warning .button:backdrop, .error .button:backdrop { border-style: solid; - color: #ffffff; + color: white; border-color: #4a90d9; background-image: linear-gradient(to bottom, #4a90d9); text-shadow: none;