From 3d60f42e3b8d152e155b6392ac05f787e9222829 Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Fri, 1 Apr 2016 14:00:25 +0200 Subject: combobox fixes --- common/gtk-3.0/3.20/gtk-dark.css | 24 ++++++++++++------------ common/gtk-3.0/3.20/gtk-darker.css | 24 ++++++++++++------------ common/gtk-3.0/3.20/gtk-solid-dark.css | 24 ++++++++++++------------ common/gtk-3.0/3.20/gtk-solid-darker.css | 24 ++++++++++++------------ common/gtk-3.0/3.20/gtk-solid.css | 28 ++++++++++++++-------------- common/gtk-3.0/3.20/gtk.css | 28 ++++++++++++++-------------- common/gtk-3.0/3.20/sass/_common.scss | 28 +++++++++++----------------- 7 files changed, 87 insertions(+), 93 deletions(-) diff --git a/common/gtk-3.0/3.20/gtk-dark.css b/common/gtk-3.0/3.20/gtk-dark.css index 68f59c3..32dc802 100644 --- a/common/gtk-3.0/3.20/gtk-dark.css +++ b/common/gtk-3.0/3.20/gtk-dark.css @@ -646,11 +646,11 @@ toolbar.inline-toolbar toolbutton > button.flat, .inline-toolbar toolbutton > bu border-radius: 0; border-right-style: none; } -.linked:not(.vertical) > entry:first-child, .inline-toolbar button:first-child, .linked:not(.vertical) > button:first-child, toolbar.inline-toolbar toolbutton:first-child > button.flat, .inline-toolbar toolbutton:first-child > button.flat, toolbar.inline-toolbar toolbutton:first-child > button.sidebar-button, .inline-toolbar toolbutton:first-child > button.sidebar-button, spinbutton:not(.vertical) button:first-child, spinbutton:not(.vertical) entry:first-child, combobox.linked button:nth-child(2):dir(rtl), .linked:not(.vertical) > combobox:first-child > box > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:first-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:first-child, .primary-toolbar .linked:not(.vertical).path-bar > button:first-child, headerbar .linked:not(.vertical).path-bar > button:first-child { +.linked:not(.vertical) > entry:first-child, .inline-toolbar button:first-child, .linked:not(.vertical) > button:first-child, toolbar.inline-toolbar toolbutton:first-child > button.flat, .inline-toolbar toolbutton:first-child > button.flat, toolbar.inline-toolbar toolbutton:first-child > button.sidebar-button, .inline-toolbar toolbutton:first-child > button.sidebar-button, spinbutton:not(.vertical) button:first-child, spinbutton:not(.vertical) entry:first-child, .linked:not(.vertical) > combobox:first-child > box > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:first-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:first-child, .primary-toolbar .linked:not(.vertical).path-bar > button:first-child, headerbar .linked:not(.vertical).path-bar > button:first-child { border-top-left-radius: 3px; border-bottom-left-radius: 3px; } -.linked:not(.vertical) > entry:last-child, .inline-toolbar button:last-child, .linked:not(.vertical) > button:last-child, toolbar.inline-toolbar toolbutton:last-child > button.flat, .inline-toolbar toolbutton:last-child > button.flat, toolbar.inline-toolbar toolbutton:last-child > button.sidebar-button, .inline-toolbar toolbutton:last-child > button.sidebar-button, spinbutton:not(.vertical) button:last-child, spinbutton:not(.vertical) entry:last-child, combobox.linked button:nth-child(2):dir(ltr), .linked:not(.vertical) > combobox:last-child > box > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:last-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:last-child, .primary-toolbar .linked:not(.vertical).path-bar > button:last-child, headerbar .linked:not(.vertical).path-bar > button:last-child { +.linked:not(.vertical) > entry:last-child, .inline-toolbar button:last-child, .linked:not(.vertical) > button:last-child, toolbar.inline-toolbar toolbutton:last-child > button.flat, .inline-toolbar toolbutton:last-child > button.flat, toolbar.inline-toolbar toolbutton:last-child > button.sidebar-button, .inline-toolbar toolbutton:last-child > button.sidebar-button, spinbutton:not(.vertical) button:last-child, spinbutton:not(.vertical) entry:last-child, .linked:not(.vertical) > combobox:last-child > box > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:last-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:last-child, .primary-toolbar .linked:not(.vertical).path-bar > button:last-child, headerbar .linked:not(.vertical).path-bar > button:last-child { border-top-right-radius: 3px; border-bottom-right-radius: 3px; border-right-style: solid; } @@ -1277,37 +1277,37 @@ window.csd > .titlebar:not(headerbar):backdrop { .primary-toolbar combobox:disabled, headerbar combobox:disabled { color: rgba(207, 218, 231, 0.2); } -.primary-toolbar combobox.linked button, headerbar combobox.linked button { +.primary-toolbar combobox > .linked > button.combo, headerbar combobox > .linked > button.combo { color: rgba(207, 218, 231, 0.8); border-color: rgba(21, 23, 28, 0.37); background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.37)); background-color: transparent; } - .primary-toolbar combobox.linked button image, headerbar combobox.linked button image, .primary-toolbar combobox.linked button image:hover, headerbar combobox.linked button image:hover { + .primary-toolbar combobox > .linked > button.combo image, headerbar combobox > .linked > button.combo image, .primary-toolbar combobox > .linked > button.combo image:hover, headerbar combobox > .linked > button.combo image:hover { color: inherit; } - .primary-toolbar combobox.linked button:hover, headerbar combobox.linked button:hover { + .primary-toolbar combobox > .linked > button.combo:hover, headerbar combobox > .linked > button.combo:hover { color: #ffffff; border-color: transparent; background-image: linear-gradient(to bottom, #5294E2); box-shadow: none; } - .primary-toolbar combobox.linked button:disabled, headerbar combobox.linked button:disabled { + .primary-toolbar combobox > .linked > button.combo:disabled, headerbar combobox > .linked > button.combo:disabled { color: rgba(207, 218, 231, 0.35); background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.22)); } -.primary-toolbar combobox.linked entry:dir(ltr), headerbar combobox.linked entry:dir(ltr) { +.primary-toolbar combobox > .linked > entry.combo:dir(ltr), headerbar combobox > .linked > entry.combo:dir(ltr) { border-right-style: none; } - .primary-toolbar combobox.linked entry:dir(ltr):focus, headerbar combobox.linked entry:dir(ltr):focus { + .primary-toolbar combobox > .linked > entry.combo:dir(ltr):focus, headerbar combobox > .linked > entry.combo:dir(ltr):focus { box-shadow: none; } -.primary-toolbar combobox.linked entry:dir(rtl), headerbar combobox.linked entry:dir(rtl) { +.primary-toolbar combobox > .linked > entry.combo:dir(rtl), headerbar combobox > .linked > entry.combo:dir(rtl) { border-left-style: none; } - .primary-toolbar combobox.linked entry:dir(rtl):focus, headerbar combobox.linked entry:dir(rtl):focus { + .primary-toolbar combobox > .linked > entry.combo:dir(rtl):focus, headerbar combobox > .linked > entry.combo:dir(rtl):focus { box-shadow: none; } -.primary-toolbar combobox.linked button.combo:dir(ltr), headerbar combobox.linked button.combo:dir(ltr), .primary-toolbar combobox.linked button.combo:dir(ltr):hover, headerbar combobox.linked button.combo:dir(ltr):hover, .primary-toolbar combobox.linked button.combo:dir(ltr):active, headerbar combobox.linked button.combo:dir(ltr):active, .primary-toolbar combobox.linked button.combo:dir(ltr):checked, headerbar combobox.linked button.combo:dir(ltr):checked, .primary-toolbar combobox.linked button.combo:dir(ltr):disabled, headerbar combobox.linked button.combo:dir(ltr):disabled { +.primary-toolbar combobox > .linked > button.combo:dir(ltr), headerbar combobox > .linked > button.combo:dir(ltr), .primary-toolbar combobox > .linked > button.combo:dir(ltr):hover, headerbar combobox > .linked > button.combo:dir(ltr):hover, .primary-toolbar combobox > .linked > button.combo:dir(ltr):active, headerbar combobox > .linked > button.combo:dir(ltr):active, .primary-toolbar combobox > .linked > button.combo:dir(ltr):checked, headerbar combobox > .linked > button.combo:dir(ltr):checked, .primary-toolbar combobox > .linked > button.combo:dir(ltr):disabled, headerbar combobox > .linked > button.combo:dir(ltr):disabled { border-top-left-radius: 0; border-bottom-left-radius: 0; } -.primary-toolbar combobox.linked button.combo:dir(rtl), headerbar combobox.linked button.combo:dir(rtl), .primary-toolbar combobox.linked button.combo:dir(rtl):hover, headerbar combobox.linked button.combo:dir(rtl):hover, .primary-toolbar combobox.linked button.combo:dir(rtl):active, headerbar combobox.linked button.combo:dir(rtl):active, .primary-toolbar combobox.linked button.combo:dir(rtl):checked, headerbar combobox.linked button.combo:dir(rtl):checked, .primary-toolbar combobox.linked button.combo:dir(rtl):disabled, headerbar combobox.linked button.combo:dir(rtl):disabled { +.primary-toolbar combobox > .linked > button.combo:dir(rtl), headerbar combobox > .linked > button.combo:dir(rtl), .primary-toolbar combobox > .linked > button.combo:dir(rtl):hover, headerbar combobox > .linked > button.combo:dir(rtl):hover, .primary-toolbar combobox > .linked > button.combo:dir(rtl):active, headerbar combobox > .linked > button.combo:dir(rtl):active, .primary-toolbar combobox > .linked > button.combo:dir(rtl):checked, headerbar combobox > .linked > button.combo:dir(rtl):checked, .primary-toolbar combobox > .linked > button.combo:dir(rtl):disabled, headerbar combobox > .linked > button.combo:dir(rtl):disabled { border-top-right-radius: 0; border-bottom-right-radius: 0; } diff --git a/common/gtk-3.0/3.20/gtk-darker.css b/common/gtk-3.0/3.20/gtk-darker.css index 751b591..b261b7f 100644 --- a/common/gtk-3.0/3.20/gtk-darker.css +++ b/common/gtk-3.0/3.20/gtk-darker.css @@ -645,11 +645,11 @@ toolbar.inline-toolbar toolbutton > button.flat, .inline-toolbar toolbutton > bu border-radius: 0; border-right-style: none; } -.linked:not(.vertical) > entry:first-child, .inline-toolbar button:first-child, .linked:not(.vertical) > button:first-child, toolbar.inline-toolbar toolbutton:first-child > button.flat, .inline-toolbar toolbutton:first-child > button.flat, toolbar.inline-toolbar toolbutton:first-child > button.sidebar-button, .inline-toolbar toolbutton:first-child > button.sidebar-button, spinbutton:not(.vertical) button:first-child, spinbutton:not(.vertical) entry:first-child, combobox.linked button:nth-child(2):dir(rtl), .linked:not(.vertical) > combobox:first-child > box > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:first-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:first-child, .primary-toolbar .linked:not(.vertical).path-bar > button:first-child, headerbar .linked:not(.vertical).path-bar > button:first-child { +.linked:not(.vertical) > entry:first-child, .inline-toolbar button:first-child, .linked:not(.vertical) > button:first-child, toolbar.inline-toolbar toolbutton:first-child > button.flat, .inline-toolbar toolbutton:first-child > button.flat, toolbar.inline-toolbar toolbutton:first-child > button.sidebar-button, .inline-toolbar toolbutton:first-child > button.sidebar-button, spinbutton:not(.vertical) button:first-child, spinbutton:not(.vertical) entry:first-child, .linked:not(.vertical) > combobox:first-child > box > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:first-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:first-child, .primary-toolbar .linked:not(.vertical).path-bar > button:first-child, headerbar .linked:not(.vertical).path-bar > button:first-child { border-top-left-radius: 3px; border-bottom-left-radius: 3px; } -.linked:not(.vertical) > entry:last-child, .inline-toolbar button:last-child, .linked:not(.vertical) > button:last-child, toolbar.inline-toolbar toolbutton:last-child > button.flat, .inline-toolbar toolbutton:last-child > button.flat, toolbar.inline-toolbar toolbutton:last-child > button.sidebar-button, .inline-toolbar toolbutton:last-child > button.sidebar-button, spinbutton:not(.vertical) button:last-child, spinbutton:not(.vertical) entry:last-child, combobox.linked button:nth-child(2):dir(ltr), .linked:not(.vertical) > combobox:last-child > box > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:last-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:last-child, .primary-toolbar .linked:not(.vertical).path-bar > button:last-child, headerbar .linked:not(.vertical).path-bar > button:last-child { +.linked:not(.vertical) > entry:last-child, .inline-toolbar button:last-child, .linked:not(.vertical) > button:last-child, toolbar.inline-toolbar toolbutton:last-child > button.flat, .inline-toolbar toolbutton:last-child > button.flat, toolbar.inline-toolbar toolbutton:last-child > button.sidebar-button, .inline-toolbar toolbutton:last-child > button.sidebar-button, spinbutton:not(.vertical) button:last-child, spinbutton:not(.vertical) entry:last-child, .linked:not(.vertical) > combobox:last-child > box > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:last-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:last-child, .primary-toolbar .linked:not(.vertical).path-bar > button:last-child, headerbar .linked:not(.vertical).path-bar > button:last-child { border-top-right-radius: 3px; border-bottom-right-radius: 3px; border-right-style: solid; } @@ -1276,37 +1276,37 @@ window.csd > .titlebar:not(headerbar):backdrop { .primary-toolbar combobox:disabled, headerbar combobox:disabled { color: rgba(207, 218, 231, 0.2); } -.primary-toolbar combobox.linked button, headerbar combobox.linked button { +.primary-toolbar combobox > .linked > button.combo, headerbar combobox > .linked > button.combo { color: rgba(207, 218, 231, 0.8); border-color: rgba(21, 23, 28, 0.37); background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.37)); background-color: transparent; } - .primary-toolbar combobox.linked button image, headerbar combobox.linked button image, .primary-toolbar combobox.linked button image:hover, headerbar combobox.linked button image:hover { + .primary-toolbar combobox > .linked > button.combo image, headerbar combobox > .linked > button.combo image, .primary-toolbar combobox > .linked > button.combo image:hover, headerbar combobox > .linked > button.combo image:hover { color: inherit; } - .primary-toolbar combobox.linked button:hover, headerbar combobox.linked button:hover { + .primary-toolbar combobox > .linked > button.combo:hover, headerbar combobox > .linked > button.combo:hover { color: #ffffff; border-color: transparent; background-image: linear-gradient(to bottom, #5294E2); box-shadow: none; } - .primary-toolbar combobox.linked button:disabled, headerbar combobox.linked button:disabled { + .primary-toolbar combobox > .linked > button.combo:disabled, headerbar combobox > .linked > button.combo:disabled { color: rgba(207, 218, 231, 0.35); background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.22)); } -.primary-toolbar combobox.linked entry:dir(ltr), headerbar combobox.linked entry:dir(ltr) { +.primary-toolbar combobox > .linked > entry.combo:dir(ltr), headerbar combobox > .linked > entry.combo:dir(ltr) { border-right-style: none; } - .primary-toolbar combobox.linked entry:dir(ltr):focus, headerbar combobox.linked entry:dir(ltr):focus { + .primary-toolbar combobox > .linked > entry.combo:dir(ltr):focus, headerbar combobox > .linked > entry.combo:dir(ltr):focus { box-shadow: none; } -.primary-toolbar combobox.linked entry:dir(rtl), headerbar combobox.linked entry:dir(rtl) { +.primary-toolbar combobox > .linked > entry.combo:dir(rtl), headerbar combobox > .linked > entry.combo:dir(rtl) { border-left-style: none; } - .primary-toolbar combobox.linked entry:dir(rtl):focus, headerbar combobox.linked entry:dir(rtl):focus { + .primary-toolbar combobox > .linked > entry.combo:dir(rtl):focus, headerbar combobox > .linked > entry.combo:dir(rtl):focus { box-shadow: none; } -.primary-toolbar combobox.linked button.combo:dir(ltr), headerbar combobox.linked button.combo:dir(ltr), .primary-toolbar combobox.linked button.combo:dir(ltr):hover, headerbar combobox.linked button.combo:dir(ltr):hover, .primary-toolbar combobox.linked button.combo:dir(ltr):active, headerbar combobox.linked button.combo:dir(ltr):active, .primary-toolbar combobox.linked button.combo:dir(ltr):checked, headerbar combobox.linked button.combo:dir(ltr):checked, .primary-toolbar combobox.linked button.combo:dir(ltr):disabled, headerbar combobox.linked button.combo:dir(ltr):disabled { +.primary-toolbar combobox > .linked > button.combo:dir(ltr), headerbar combobox > .linked > button.combo:dir(ltr), .primary-toolbar combobox > .linked > button.combo:dir(ltr):hover, headerbar combobox > .linked > button.combo:dir(ltr):hover, .primary-toolbar combobox > .linked > button.combo:dir(ltr):active, headerbar combobox > .linked > button.combo:dir(ltr):active, .primary-toolbar combobox > .linked > button.combo:dir(ltr):checked, headerbar combobox > .linked > button.combo:dir(ltr):checked, .primary-toolbar combobox > .linked > button.combo:dir(ltr):disabled, headerbar combobox > .linked > button.combo:dir(ltr):disabled { border-top-left-radius: 0; border-bottom-left-radius: 0; } -.primary-toolbar combobox.linked button.combo:dir(rtl), headerbar combobox.linked button.combo:dir(rtl), .primary-toolbar combobox.linked button.combo:dir(rtl):hover, headerbar combobox.linked button.combo:dir(rtl):hover, .primary-toolbar combobox.linked button.combo:dir(rtl):active, headerbar combobox.linked button.combo:dir(rtl):active, .primary-toolbar combobox.linked button.combo:dir(rtl):checked, headerbar combobox.linked button.combo:dir(rtl):checked, .primary-toolbar combobox.linked button.combo:dir(rtl):disabled, headerbar combobox.linked button.combo:dir(rtl):disabled { +.primary-toolbar combobox > .linked > button.combo:dir(rtl), headerbar combobox > .linked > button.combo:dir(rtl), .primary-toolbar combobox > .linked > button.combo:dir(rtl):hover, headerbar combobox > .linked > button.combo:dir(rtl):hover, .primary-toolbar combobox > .linked > button.combo:dir(rtl):active, headerbar combobox > .linked > button.combo:dir(rtl):active, .primary-toolbar combobox > .linked > button.combo:dir(rtl):checked, headerbar combobox > .linked > button.combo:dir(rtl):checked, .primary-toolbar combobox > .linked > button.combo:dir(rtl):disabled, headerbar combobox > .linked > button.combo:dir(rtl):disabled { border-top-right-radius: 0; border-bottom-right-radius: 0; } diff --git a/common/gtk-3.0/3.20/gtk-solid-dark.css b/common/gtk-3.0/3.20/gtk-solid-dark.css index 9586c40..a6a0cfb 100644 --- a/common/gtk-3.0/3.20/gtk-solid-dark.css +++ b/common/gtk-3.0/3.20/gtk-solid-dark.css @@ -646,11 +646,11 @@ toolbar.inline-toolbar toolbutton > button.flat, .inline-toolbar toolbutton > bu border-radius: 0; border-right-style: none; } -.linked:not(.vertical) > entry:first-child, .inline-toolbar button:first-child, .linked:not(.vertical) > button:first-child, toolbar.inline-toolbar toolbutton:first-child > button.flat, .inline-toolbar toolbutton:first-child > button.flat, toolbar.inline-toolbar toolbutton:first-child > button.sidebar-button, .inline-toolbar toolbutton:first-child > button.sidebar-button, spinbutton:not(.vertical) button:first-child, spinbutton:not(.vertical) entry:first-child, combobox.linked button:nth-child(2):dir(rtl), .linked:not(.vertical) > combobox:first-child > box > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:first-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:first-child, .primary-toolbar .linked:not(.vertical).path-bar > button:first-child, headerbar .linked:not(.vertical).path-bar > button:first-child { +.linked:not(.vertical) > entry:first-child, .inline-toolbar button:first-child, .linked:not(.vertical) > button:first-child, toolbar.inline-toolbar toolbutton:first-child > button.flat, .inline-toolbar toolbutton:first-child > button.flat, toolbar.inline-toolbar toolbutton:first-child > button.sidebar-button, .inline-toolbar toolbutton:first-child > button.sidebar-button, spinbutton:not(.vertical) button:first-child, spinbutton:not(.vertical) entry:first-child, .linked:not(.vertical) > combobox:first-child > box > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:first-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:first-child, .primary-toolbar .linked:not(.vertical).path-bar > button:first-child, headerbar .linked:not(.vertical).path-bar > button:first-child { border-top-left-radius: 3px; border-bottom-left-radius: 3px; } -.linked:not(.vertical) > entry:last-child, .inline-toolbar button:last-child, .linked:not(.vertical) > button:last-child, toolbar.inline-toolbar toolbutton:last-child > button.flat, .inline-toolbar toolbutton:last-child > button.flat, toolbar.inline-toolbar toolbutton:last-child > button.sidebar-button, .inline-toolbar toolbutton:last-child > button.sidebar-button, spinbutton:not(.vertical) button:last-child, spinbutton:not(.vertical) entry:last-child, combobox.linked button:nth-child(2):dir(ltr), .linked:not(.vertical) > combobox:last-child > box > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:last-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:last-child, .primary-toolbar .linked:not(.vertical).path-bar > button:last-child, headerbar .linked:not(.vertical).path-bar > button:last-child { +.linked:not(.vertical) > entry:last-child, .inline-toolbar button:last-child, .linked:not(.vertical) > button:last-child, toolbar.inline-toolbar toolbutton:last-child > button.flat, .inline-toolbar toolbutton:last-child > button.flat, toolbar.inline-toolbar toolbutton:last-child > button.sidebar-button, .inline-toolbar toolbutton:last-child > button.sidebar-button, spinbutton:not(.vertical) button:last-child, spinbutton:not(.vertical) entry:last-child, .linked:not(.vertical) > combobox:last-child > box > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:last-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:last-child, .primary-toolbar .linked:not(.vertical).path-bar > button:last-child, headerbar .linked:not(.vertical).path-bar > button:last-child { border-top-right-radius: 3px; border-bottom-right-radius: 3px; border-right-style: solid; } @@ -1277,37 +1277,37 @@ window.csd > .titlebar:not(headerbar):backdrop { .primary-toolbar combobox:disabled, headerbar combobox:disabled { color: rgba(207, 218, 231, 0.2); } -.primary-toolbar combobox.linked button, headerbar combobox.linked button { +.primary-toolbar combobox > .linked > button.combo, headerbar combobox > .linked > button.combo { color: rgba(207, 218, 231, 0.8); border-color: rgba(21, 23, 28, 0.4); background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.4)); background-color: transparent; } - .primary-toolbar combobox.linked button image, headerbar combobox.linked button image, .primary-toolbar combobox.linked button image:hover, headerbar combobox.linked button image:hover { + .primary-toolbar combobox > .linked > button.combo image, headerbar combobox > .linked > button.combo image, .primary-toolbar combobox > .linked > button.combo image:hover, headerbar combobox > .linked > button.combo image:hover { color: inherit; } - .primary-toolbar combobox.linked button:hover, headerbar combobox.linked button:hover { + .primary-toolbar combobox > .linked > button.combo:hover, headerbar combobox > .linked > button.combo:hover { color: #ffffff; border-color: transparent; background-image: linear-gradient(to bottom, #5294E2); box-shadow: none; } - .primary-toolbar combobox.linked button:disabled, headerbar combobox.linked button:disabled { + .primary-toolbar combobox > .linked > button.combo:disabled, headerbar combobox > .linked > button.combo:disabled { color: rgba(207, 218, 231, 0.35); background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.25)); } -.primary-toolbar combobox.linked entry:dir(ltr), headerbar combobox.linked entry:dir(ltr) { +.primary-toolbar combobox > .linked > entry.combo:dir(ltr), headerbar combobox > .linked > entry.combo:dir(ltr) { border-right-style: none; } - .primary-toolbar combobox.linked entry:dir(ltr):focus, headerbar combobox.linked entry:dir(ltr):focus { + .primary-toolbar combobox > .linked > entry.combo:dir(ltr):focus, headerbar combobox > .linked > entry.combo:dir(ltr):focus { box-shadow: none; } -.primary-toolbar combobox.linked entry:dir(rtl), headerbar combobox.linked entry:dir(rtl) { +.primary-toolbar combobox > .linked > entry.combo:dir(rtl), headerbar combobox > .linked > entry.combo:dir(rtl) { border-left-style: none; } - .primary-toolbar combobox.linked entry:dir(rtl):focus, headerbar combobox.linked entry:dir(rtl):focus { + .primary-toolbar combobox > .linked > entry.combo:dir(rtl):focus, headerbar combobox > .linked > entry.combo:dir(rtl):focus { box-shadow: none; } -.primary-toolbar combobox.linked button.combo:dir(ltr), headerbar combobox.linked button.combo:dir(ltr), .primary-toolbar combobox.linked button.combo:dir(ltr):hover, headerbar combobox.linked button.combo:dir(ltr):hover, .primary-toolbar combobox.linked button.combo:dir(ltr):active, headerbar combobox.linked button.combo:dir(ltr):active, .primary-toolbar combobox.linked button.combo:dir(ltr):checked, headerbar combobox.linked button.combo:dir(ltr):checked, .primary-toolbar combobox.linked button.combo:dir(ltr):disabled, headerbar combobox.linked button.combo:dir(ltr):disabled { +.primary-toolbar combobox > .linked > button.combo:dir(ltr), headerbar combobox > .linked > button.combo:dir(ltr), .primary-toolbar combobox > .linked > button.combo:dir(ltr):hover, headerbar combobox > .linked > button.combo:dir(ltr):hover, .primary-toolbar combobox > .linked > button.combo:dir(ltr):active, headerbar combobox > .linked > button.combo:dir(ltr):active, .primary-toolbar combobox > .linked > button.combo:dir(ltr):checked, headerbar combobox > .linked > button.combo:dir(ltr):checked, .primary-toolbar combobox > .linked > button.combo:dir(ltr):disabled, headerbar combobox > .linked > button.combo:dir(ltr):disabled { border-top-left-radius: 0; border-bottom-left-radius: 0; } -.primary-toolbar combobox.linked button.combo:dir(rtl), headerbar combobox.linked button.combo:dir(rtl), .primary-toolbar combobox.linked button.combo:dir(rtl):hover, headerbar combobox.linked button.combo:dir(rtl):hover, .primary-toolbar combobox.linked button.combo:dir(rtl):active, headerbar combobox.linked button.combo:dir(rtl):active, .primary-toolbar combobox.linked button.combo:dir(rtl):checked, headerbar combobox.linked button.combo:dir(rtl):checked, .primary-toolbar combobox.linked button.combo:dir(rtl):disabled, headerbar combobox.linked button.combo:dir(rtl):disabled { +.primary-toolbar combobox > .linked > button.combo:dir(rtl), headerbar combobox > .linked > button.combo:dir(rtl), .primary-toolbar combobox > .linked > button.combo:dir(rtl):hover, headerbar combobox > .linked > button.combo:dir(rtl):hover, .primary-toolbar combobox > .linked > button.combo:dir(rtl):active, headerbar combobox > .linked > button.combo:dir(rtl):active, .primary-toolbar combobox > .linked > button.combo:dir(rtl):checked, headerbar combobox > .linked > button.combo:dir(rtl):checked, .primary-toolbar combobox > .linked > button.combo:dir(rtl):disabled, headerbar combobox > .linked > button.combo:dir(rtl):disabled { border-top-right-radius: 0; border-bottom-right-radius: 0; } diff --git a/common/gtk-3.0/3.20/gtk-solid-darker.css b/common/gtk-3.0/3.20/gtk-solid-darker.css index 654dad9..a759738 100644 --- a/common/gtk-3.0/3.20/gtk-solid-darker.css +++ b/common/gtk-3.0/3.20/gtk-solid-darker.css @@ -645,11 +645,11 @@ toolbar.inline-toolbar toolbutton > button.flat, .inline-toolbar toolbutton > bu border-radius: 0; border-right-style: none; } -.linked:not(.vertical) > entry:first-child, .inline-toolbar button:first-child, .linked:not(.vertical) > button:first-child, toolbar.inline-toolbar toolbutton:first-child > button.flat, .inline-toolbar toolbutton:first-child > button.flat, toolbar.inline-toolbar toolbutton:first-child > button.sidebar-button, .inline-toolbar toolbutton:first-child > button.sidebar-button, spinbutton:not(.vertical) button:first-child, spinbutton:not(.vertical) entry:first-child, combobox.linked button:nth-child(2):dir(rtl), .linked:not(.vertical) > combobox:first-child > box > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:first-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:first-child, .primary-toolbar .linked:not(.vertical).path-bar > button:first-child, headerbar .linked:not(.vertical).path-bar > button:first-child { +.linked:not(.vertical) > entry:first-child, .inline-toolbar button:first-child, .linked:not(.vertical) > button:first-child, toolbar.inline-toolbar toolbutton:first-child > button.flat, .inline-toolbar toolbutton:first-child > button.flat, toolbar.inline-toolbar toolbutton:first-child > button.sidebar-button, .inline-toolbar toolbutton:first-child > button.sidebar-button, spinbutton:not(.vertical) button:first-child, spinbutton:not(.vertical) entry:first-child, .linked:not(.vertical) > combobox:first-child > box > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:first-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:first-child, .primary-toolbar .linked:not(.vertical).path-bar > button:first-child, headerbar .linked:not(.vertical).path-bar > button:first-child { border-top-left-radius: 3px; border-bottom-left-radius: 3px; } -.linked:not(.vertical) > entry:last-child, .inline-toolbar button:last-child, .linked:not(.vertical) > button:last-child, toolbar.inline-toolbar toolbutton:last-child > button.flat, .inline-toolbar toolbutton:last-child > button.flat, toolbar.inline-toolbar toolbutton:last-child > button.sidebar-button, .inline-toolbar toolbutton:last-child > button.sidebar-button, spinbutton:not(.vertical) button:last-child, spinbutton:not(.vertical) entry:last-child, combobox.linked button:nth-child(2):dir(ltr), .linked:not(.vertical) > combobox:last-child > box > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:last-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:last-child, .primary-toolbar .linked:not(.vertical).path-bar > button:last-child, headerbar .linked:not(.vertical).path-bar > button:last-child { +.linked:not(.vertical) > entry:last-child, .inline-toolbar button:last-child, .linked:not(.vertical) > button:last-child, toolbar.inline-toolbar toolbutton:last-child > button.flat, .inline-toolbar toolbutton:last-child > button.flat, toolbar.inline-toolbar toolbutton:last-child > button.sidebar-button, .inline-toolbar toolbutton:last-child > button.sidebar-button, spinbutton:not(.vertical) button:last-child, spinbutton:not(.vertical) entry:last-child, .linked:not(.vertical) > combobox:last-child > box > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:last-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:last-child, .primary-toolbar .linked:not(.vertical).path-bar > button:last-child, headerbar .linked:not(.vertical).path-bar > button:last-child { border-top-right-radius: 3px; border-bottom-right-radius: 3px; border-right-style: solid; } @@ -1276,37 +1276,37 @@ window.csd > .titlebar:not(headerbar):backdrop { .primary-toolbar combobox:disabled, headerbar combobox:disabled { color: rgba(207, 218, 231, 0.2); } -.primary-toolbar combobox.linked button, headerbar combobox.linked button { +.primary-toolbar combobox > .linked > button.combo, headerbar combobox > .linked > button.combo { color: rgba(207, 218, 231, 0.8); border-color: rgba(21, 23, 28, 0.4); background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.4)); background-color: transparent; } - .primary-toolbar combobox.linked button image, headerbar combobox.linked button image, .primary-toolbar combobox.linked button image:hover, headerbar combobox.linked button image:hover { + .primary-toolbar combobox > .linked > button.combo image, headerbar combobox > .linked > button.combo image, .primary-toolbar combobox > .linked > button.combo image:hover, headerbar combobox > .linked > button.combo image:hover { color: inherit; } - .primary-toolbar combobox.linked button:hover, headerbar combobox.linked button:hover { + .primary-toolbar combobox > .linked > button.combo:hover, headerbar combobox > .linked > button.combo:hover { color: #ffffff; border-color: transparent; background-image: linear-gradient(to bottom, #5294E2); box-shadow: none; } - .primary-toolbar combobox.linked button:disabled, headerbar combobox.linked button:disabled { + .primary-toolbar combobox > .linked > button.combo:disabled, headerbar combobox > .linked > button.combo:disabled { color: rgba(207, 218, 231, 0.35); background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.25)); } -.primary-toolbar combobox.linked entry:dir(ltr), headerbar combobox.linked entry:dir(ltr) { +.primary-toolbar combobox > .linked > entry.combo:dir(ltr), headerbar combobox > .linked > entry.combo:dir(ltr) { border-right-style: none; } - .primary-toolbar combobox.linked entry:dir(ltr):focus, headerbar combobox.linked entry:dir(ltr):focus { + .primary-toolbar combobox > .linked > entry.combo:dir(ltr):focus, headerbar combobox > .linked > entry.combo:dir(ltr):focus { box-shadow: none; } -.primary-toolbar combobox.linked entry:dir(rtl), headerbar combobox.linked entry:dir(rtl) { +.primary-toolbar combobox > .linked > entry.combo:dir(rtl), headerbar combobox > .linked > entry.combo:dir(rtl) { border-left-style: none; } - .primary-toolbar combobox.linked entry:dir(rtl):focus, headerbar combobox.linked entry:dir(rtl):focus { + .primary-toolbar combobox > .linked > entry.combo:dir(rtl):focus, headerbar combobox > .linked > entry.combo:dir(rtl):focus { box-shadow: none; } -.primary-toolbar combobox.linked button.combo:dir(ltr), headerbar combobox.linked button.combo:dir(ltr), .primary-toolbar combobox.linked button.combo:dir(ltr):hover, headerbar combobox.linked button.combo:dir(ltr):hover, .primary-toolbar combobox.linked button.combo:dir(ltr):active, headerbar combobox.linked button.combo:dir(ltr):active, .primary-toolbar combobox.linked button.combo:dir(ltr):checked, headerbar combobox.linked button.combo:dir(ltr):checked, .primary-toolbar combobox.linked button.combo:dir(ltr):disabled, headerbar combobox.linked button.combo:dir(ltr):disabled { +.primary-toolbar combobox > .linked > button.combo:dir(ltr), headerbar combobox > .linked > button.combo:dir(ltr), .primary-toolbar combobox > .linked > button.combo:dir(ltr):hover, headerbar combobox > .linked > button.combo:dir(ltr):hover, .primary-toolbar combobox > .linked > button.combo:dir(ltr):active, headerbar combobox > .linked > button.combo:dir(ltr):active, .primary-toolbar combobox > .linked > button.combo:dir(ltr):checked, headerbar combobox > .linked > button.combo:dir(ltr):checked, .primary-toolbar combobox > .linked > button.combo:dir(ltr):disabled, headerbar combobox > .linked > button.combo:dir(ltr):disabled { border-top-left-radius: 0; border-bottom-left-radius: 0; } -.primary-toolbar combobox.linked button.combo:dir(rtl), headerbar combobox.linked button.combo:dir(rtl), .primary-toolbar combobox.linked button.combo:dir(rtl):hover, headerbar combobox.linked button.combo:dir(rtl):hover, .primary-toolbar combobox.linked button.combo:dir(rtl):active, headerbar combobox.linked button.combo:dir(rtl):active, .primary-toolbar combobox.linked button.combo:dir(rtl):checked, headerbar combobox.linked button.combo:dir(rtl):checked, .primary-toolbar combobox.linked button.combo:dir(rtl):disabled, headerbar combobox.linked button.combo:dir(rtl):disabled { +.primary-toolbar combobox > .linked > button.combo:dir(rtl), headerbar combobox > .linked > button.combo:dir(rtl), .primary-toolbar combobox > .linked > button.combo:dir(rtl):hover, headerbar combobox > .linked > button.combo:dir(rtl):hover, .primary-toolbar combobox > .linked > button.combo:dir(rtl):active, headerbar combobox > .linked > button.combo:dir(rtl):active, .primary-toolbar combobox > .linked > button.combo:dir(rtl):checked, headerbar combobox > .linked > button.combo:dir(rtl):checked, .primary-toolbar combobox > .linked > button.combo:dir(rtl):disabled, headerbar combobox > .linked > button.combo:dir(rtl):disabled { border-top-right-radius: 0; border-bottom-right-radius: 0; } diff --git a/common/gtk-3.0/3.20/gtk-solid.css b/common/gtk-3.0/3.20/gtk-solid.css index 3951eae..e714b03 100644 --- a/common/gtk-3.0/3.20/gtk-solid.css +++ b/common/gtk-3.0/3.20/gtk-solid.css @@ -645,11 +645,11 @@ toolbar.inline-toolbar toolbutton > button.flat, .inline-toolbar toolbutton > bu border-radius: 0; border-right-style: none; } -.linked:not(.vertical) > entry:first-child, .inline-toolbar button:first-child, .linked:not(.vertical) > button:first-child, toolbar.inline-toolbar toolbutton:first-child > button.flat, .inline-toolbar toolbutton:first-child > button.flat, toolbar.inline-toolbar toolbutton:first-child > button.sidebar-button, .inline-toolbar toolbutton:first-child > button.sidebar-button, spinbutton:not(.vertical) button:first-child, spinbutton:not(.vertical) entry:first-child, combobox.linked button:nth-child(2):dir(rtl), .linked:not(.vertical) > combobox:first-child > box > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:first-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:first-child, .primary-toolbar .linked:not(.vertical).path-bar > button:first-child, headerbar .linked:not(.vertical).path-bar > button:first-child { +.linked:not(.vertical) > entry:first-child, .inline-toolbar button:first-child, .linked:not(.vertical) > button:first-child, toolbar.inline-toolbar toolbutton:first-child > button.flat, .inline-toolbar toolbutton:first-child > button.flat, toolbar.inline-toolbar toolbutton:first-child > button.sidebar-button, .inline-toolbar toolbutton:first-child > button.sidebar-button, spinbutton:not(.vertical) button:first-child, spinbutton:not(.vertical) entry:first-child, .linked:not(.vertical) > combobox:first-child > box > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:first-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:first-child, .primary-toolbar .linked:not(.vertical).path-bar > button:first-child, headerbar .linked:not(.vertical).path-bar > button:first-child { border-top-left-radius: 3px; border-bottom-left-radius: 3px; } -.linked:not(.vertical) > entry:last-child, .inline-toolbar button:last-child, .linked:not(.vertical) > button:last-child, toolbar.inline-toolbar toolbutton:last-child > button.flat, .inline-toolbar toolbutton:last-child > button.flat, toolbar.inline-toolbar toolbutton:last-child > button.sidebar-button, .inline-toolbar toolbutton:last-child > button.sidebar-button, spinbutton:not(.vertical) button:last-child, spinbutton:not(.vertical) entry:last-child, combobox.linked button:nth-child(2):dir(ltr), .linked:not(.vertical) > combobox:last-child > box > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:last-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:last-child, .primary-toolbar .linked:not(.vertical).path-bar > button:last-child, headerbar .linked:not(.vertical).path-bar > button:last-child { +.linked:not(.vertical) > entry:last-child, .inline-toolbar button:last-child, .linked:not(.vertical) > button:last-child, toolbar.inline-toolbar toolbutton:last-child > button.flat, .inline-toolbar toolbutton:last-child > button.flat, toolbar.inline-toolbar toolbutton:last-child > button.sidebar-button, .inline-toolbar toolbutton:last-child > button.sidebar-button, spinbutton:not(.vertical) button:last-child, spinbutton:not(.vertical) entry:last-child, .linked:not(.vertical) > combobox:last-child > box > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:last-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:last-child, .primary-toolbar .linked:not(.vertical).path-bar > button:last-child, headerbar .linked:not(.vertical).path-bar > button:last-child { border-top-right-radius: 3px; border-bottom-right-radius: 3px; border-right-style: solid; } @@ -1276,41 +1276,41 @@ window.csd > .titlebar:not(headerbar):backdrop { .primary-toolbar combobox:disabled, headerbar combobox:disabled { color: rgba(82, 93, 118, 0.2); } -.primary-toolbar combobox.linked button, headerbar combobox.linked button { +.primary-toolbar combobox > .linked > button.combo, headerbar combobox > .linked > button.combo { color: rgba(82, 93, 118, 0.8); border-color: rgba(82, 93, 118, 0.1); background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.9)); background-color: transparent; } - .primary-toolbar combobox.linked button image, headerbar combobox.linked button image, .primary-toolbar combobox.linked button image:hover, headerbar combobox.linked button image:hover { + .primary-toolbar combobox > .linked > button.combo image, headerbar combobox > .linked > button.combo image, .primary-toolbar combobox > .linked > button.combo image:hover, headerbar combobox > .linked > button.combo image:hover { color: inherit; } - .primary-toolbar combobox.linked button:hover, headerbar combobox.linked button:hover { + .primary-toolbar combobox > .linked > button.combo:hover, headerbar combobox > .linked > button.combo:hover { color: #ffffff; border-color: #5294E2; background-image: linear-gradient(to bottom, #5294E2); box-shadow: none; } - .primary-toolbar combobox.linked button:disabled, headerbar combobox.linked button:disabled { + .primary-toolbar combobox > .linked > button.combo:disabled, headerbar combobox > .linked > button.combo:disabled { color: rgba(82, 93, 118, 0.35); background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.75)); } -.primary-toolbar combobox.linked entry:dir(ltr), headerbar combobox.linked entry:dir(ltr) { +.primary-toolbar combobox > .linked > entry.combo:dir(ltr), headerbar combobox > .linked > entry.combo:dir(ltr) { border-right-style: none; } - .primary-toolbar combobox.linked entry:dir(ltr):focus, headerbar combobox.linked entry:dir(ltr):focus { + .primary-toolbar combobox > .linked > entry.combo:dir(ltr):focus, headerbar combobox > .linked > entry.combo:dir(ltr):focus { box-shadow: none; } - .primary-toolbar combobox.linked entry:dir(ltr):focus, headerbar combobox.linked entry:dir(ltr):focus { + .primary-toolbar combobox > .linked > entry.combo:dir(ltr):focus, headerbar combobox > .linked > entry.combo:dir(ltr):focus { box-shadow: 1px 0 #5294E2; } -.primary-toolbar combobox.linked entry:dir(rtl), headerbar combobox.linked entry:dir(rtl) { +.primary-toolbar combobox > .linked > entry.combo:dir(rtl), headerbar combobox > .linked > entry.combo:dir(rtl) { border-left-style: none; } - .primary-toolbar combobox.linked entry:dir(rtl):focus, headerbar combobox.linked entry:dir(rtl):focus { + .primary-toolbar combobox > .linked > entry.combo:dir(rtl):focus, headerbar combobox > .linked > entry.combo:dir(rtl):focus { box-shadow: none; } - .primary-toolbar combobox.linked entry:dir(rtl):focus, headerbar combobox.linked entry:dir(rtl):focus { + .primary-toolbar combobox > .linked > entry.combo:dir(rtl):focus, headerbar combobox > .linked > entry.combo:dir(rtl):focus { box-shadow: -1px 0 #5294E2; } -.primary-toolbar combobox.linked button.combo:dir(ltr), headerbar combobox.linked button.combo:dir(ltr), .primary-toolbar combobox.linked button.combo:dir(ltr):hover, headerbar combobox.linked button.combo:dir(ltr):hover, .primary-toolbar combobox.linked button.combo:dir(ltr):active, headerbar combobox.linked button.combo:dir(ltr):active, .primary-toolbar combobox.linked button.combo:dir(ltr):checked, headerbar combobox.linked button.combo:dir(ltr):checked, .primary-toolbar combobox.linked button.combo:dir(ltr):disabled, headerbar combobox.linked button.combo:dir(ltr):disabled { +.primary-toolbar combobox > .linked > button.combo:dir(ltr), headerbar combobox > .linked > button.combo:dir(ltr), .primary-toolbar combobox > .linked > button.combo:dir(ltr):hover, headerbar combobox > .linked > button.combo:dir(ltr):hover, .primary-toolbar combobox > .linked > button.combo:dir(ltr):active, headerbar combobox > .linked > button.combo:dir(ltr):active, .primary-toolbar combobox > .linked > button.combo:dir(ltr):checked, headerbar combobox > .linked > button.combo:dir(ltr):checked, .primary-toolbar combobox > .linked > button.combo:dir(ltr):disabled, headerbar combobox > .linked > button.combo:dir(ltr):disabled { border-top-left-radius: 0; border-bottom-left-radius: 0; } -.primary-toolbar combobox.linked button.combo:dir(rtl), headerbar combobox.linked button.combo:dir(rtl), .primary-toolbar combobox.linked button.combo:dir(rtl):hover, headerbar combobox.linked button.combo:dir(rtl):hover, .primary-toolbar combobox.linked button.combo:dir(rtl):active, headerbar combobox.linked button.combo:dir(rtl):active, .primary-toolbar combobox.linked button.combo:dir(rtl):checked, headerbar combobox.linked button.combo:dir(rtl):checked, .primary-toolbar combobox.linked button.combo:dir(rtl):disabled, headerbar combobox.linked button.combo:dir(rtl):disabled { +.primary-toolbar combobox > .linked > button.combo:dir(rtl), headerbar combobox > .linked > button.combo:dir(rtl), .primary-toolbar combobox > .linked > button.combo:dir(rtl):hover, headerbar combobox > .linked > button.combo:dir(rtl):hover, .primary-toolbar combobox > .linked > button.combo:dir(rtl):active, headerbar combobox > .linked > button.combo:dir(rtl):active, .primary-toolbar combobox > .linked > button.combo:dir(rtl):checked, headerbar combobox > .linked > button.combo:dir(rtl):checked, .primary-toolbar combobox > .linked > button.combo:dir(rtl):disabled, headerbar combobox > .linked > button.combo:dir(rtl):disabled { border-top-right-radius: 0; border-bottom-right-radius: 0; } diff --git a/common/gtk-3.0/3.20/gtk.css b/common/gtk-3.0/3.20/gtk.css index b674898..f43d244 100644 --- a/common/gtk-3.0/3.20/gtk.css +++ b/common/gtk-3.0/3.20/gtk.css @@ -645,11 +645,11 @@ toolbar.inline-toolbar toolbutton > button.flat, .inline-toolbar toolbutton > bu border-radius: 0; border-right-style: none; } -.linked:not(.vertical) > entry:first-child, .inline-toolbar button:first-child, .linked:not(.vertical) > button:first-child, toolbar.inline-toolbar toolbutton:first-child > button.flat, .inline-toolbar toolbutton:first-child > button.flat, toolbar.inline-toolbar toolbutton:first-child > button.sidebar-button, .inline-toolbar toolbutton:first-child > button.sidebar-button, spinbutton:not(.vertical) button:first-child, spinbutton:not(.vertical) entry:first-child, combobox.linked button:nth-child(2):dir(rtl), .linked:not(.vertical) > combobox:first-child > box > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:first-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:first-child, .primary-toolbar .linked:not(.vertical).path-bar > button:first-child, headerbar .linked:not(.vertical).path-bar > button:first-child { +.linked:not(.vertical) > entry:first-child, .inline-toolbar button:first-child, .linked:not(.vertical) > button:first-child, toolbar.inline-toolbar toolbutton:first-child > button.flat, .inline-toolbar toolbutton:first-child > button.flat, toolbar.inline-toolbar toolbutton:first-child > button.sidebar-button, .inline-toolbar toolbutton:first-child > button.sidebar-button, spinbutton:not(.vertical) button:first-child, spinbutton:not(.vertical) entry:first-child, .linked:not(.vertical) > combobox:first-child > box > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:first-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:first-child, .primary-toolbar .linked:not(.vertical).path-bar > button:first-child, headerbar .linked:not(.vertical).path-bar > button:first-child { border-top-left-radius: 3px; border-bottom-left-radius: 3px; } -.linked:not(.vertical) > entry:last-child, .inline-toolbar button:last-child, .linked:not(.vertical) > button:last-child, toolbar.inline-toolbar toolbutton:last-child > button.flat, .inline-toolbar toolbutton:last-child > button.flat, toolbar.inline-toolbar toolbutton:last-child > button.sidebar-button, .inline-toolbar toolbutton:last-child > button.sidebar-button, spinbutton:not(.vertical) button:last-child, spinbutton:not(.vertical) entry:last-child, combobox.linked button:nth-child(2):dir(ltr), .linked:not(.vertical) > combobox:last-child > box > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:last-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:last-child, .primary-toolbar .linked:not(.vertical).path-bar > button:last-child, headerbar .linked:not(.vertical).path-bar > button:last-child { +.linked:not(.vertical) > entry:last-child, .inline-toolbar button:last-child, .linked:not(.vertical) > button:last-child, toolbar.inline-toolbar toolbutton:last-child > button.flat, .inline-toolbar toolbutton:last-child > button.flat, toolbar.inline-toolbar toolbutton:last-child > button.sidebar-button, .inline-toolbar toolbutton:last-child > button.sidebar-button, spinbutton:not(.vertical) button:last-child, spinbutton:not(.vertical) entry:last-child, .linked:not(.vertical) > combobox:last-child > box > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:last-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:last-child, .primary-toolbar .linked:not(.vertical).path-bar > button:last-child, headerbar .linked:not(.vertical).path-bar > button:last-child { border-top-right-radius: 3px; border-bottom-right-radius: 3px; border-right-style: solid; } @@ -1276,41 +1276,41 @@ window.csd > .titlebar:not(headerbar):backdrop { .primary-toolbar combobox:disabled, headerbar combobox:disabled { color: rgba(82, 93, 118, 0.2); } -.primary-toolbar combobox.linked button, headerbar combobox.linked button { +.primary-toolbar combobox > .linked > button.combo, headerbar combobox > .linked > button.combo { color: rgba(82, 93, 118, 0.8); border-color: rgba(82, 93, 118, 0.1); background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.9)); background-color: transparent; } - .primary-toolbar combobox.linked button image, headerbar combobox.linked button image, .primary-toolbar combobox.linked button image:hover, headerbar combobox.linked button image:hover { + .primary-toolbar combobox > .linked > button.combo image, headerbar combobox > .linked > button.combo image, .primary-toolbar combobox > .linked > button.combo image:hover, headerbar combobox > .linked > button.combo image:hover { color: inherit; } - .primary-toolbar combobox.linked button:hover, headerbar combobox.linked button:hover { + .primary-toolbar combobox > .linked > button.combo:hover, headerbar combobox > .linked > button.combo:hover { color: #ffffff; border-color: #5294E2; background-image: linear-gradient(to bottom, #5294E2); box-shadow: none; } - .primary-toolbar combobox.linked button:disabled, headerbar combobox.linked button:disabled { + .primary-toolbar combobox > .linked > button.combo:disabled, headerbar combobox > .linked > button.combo:disabled { color: rgba(82, 93, 118, 0.35); background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.75)); } -.primary-toolbar combobox.linked entry:dir(ltr), headerbar combobox.linked entry:dir(ltr) { +.primary-toolbar combobox > .linked > entry.combo:dir(ltr), headerbar combobox > .linked > entry.combo:dir(ltr) { border-right-style: none; } - .primary-toolbar combobox.linked entry:dir(ltr):focus, headerbar combobox.linked entry:dir(ltr):focus { + .primary-toolbar combobox > .linked > entry.combo:dir(ltr):focus, headerbar combobox > .linked > entry.combo:dir(ltr):focus { box-shadow: none; } - .primary-toolbar combobox.linked entry:dir(ltr):focus, headerbar combobox.linked entry:dir(ltr):focus { + .primary-toolbar combobox > .linked > entry.combo:dir(ltr):focus, headerbar combobox > .linked > entry.combo:dir(ltr):focus { box-shadow: 1px 0 #5294E2; } -.primary-toolbar combobox.linked entry:dir(rtl), headerbar combobox.linked entry:dir(rtl) { +.primary-toolbar combobox > .linked > entry.combo:dir(rtl), headerbar combobox > .linked > entry.combo:dir(rtl) { border-left-style: none; } - .primary-toolbar combobox.linked entry:dir(rtl):focus, headerbar combobox.linked entry:dir(rtl):focus { + .primary-toolbar combobox > .linked > entry.combo:dir(rtl):focus, headerbar combobox > .linked > entry.combo:dir(rtl):focus { box-shadow: none; } - .primary-toolbar combobox.linked entry:dir(rtl):focus, headerbar combobox.linked entry:dir(rtl):focus { + .primary-toolbar combobox > .linked > entry.combo:dir(rtl):focus, headerbar combobox > .linked > entry.combo:dir(rtl):focus { box-shadow: -1px 0 #5294E2; } -.primary-toolbar combobox.linked button.combo:dir(ltr), headerbar combobox.linked button.combo:dir(ltr), .primary-toolbar combobox.linked button.combo:dir(ltr):hover, headerbar combobox.linked button.combo:dir(ltr):hover, .primary-toolbar combobox.linked button.combo:dir(ltr):active, headerbar combobox.linked button.combo:dir(ltr):active, .primary-toolbar combobox.linked button.combo:dir(ltr):checked, headerbar combobox.linked button.combo:dir(ltr):checked, .primary-toolbar combobox.linked button.combo:dir(ltr):disabled, headerbar combobox.linked button.combo:dir(ltr):disabled { +.primary-toolbar combobox > .linked > button.combo:dir(ltr), headerbar combobox > .linked > button.combo:dir(ltr), .primary-toolbar combobox > .linked > button.combo:dir(ltr):hover, headerbar combobox > .linked > button.combo:dir(ltr):hover, .primary-toolbar combobox > .linked > button.combo:dir(ltr):active, headerbar combobox > .linked > button.combo:dir(ltr):active, .primary-toolbar combobox > .linked > button.combo:dir(ltr):checked, headerbar combobox > .linked > button.combo:dir(ltr):checked, .primary-toolbar combobox > .linked > button.combo:dir(ltr):disabled, headerbar combobox > .linked > button.combo:dir(ltr):disabled { border-top-left-radius: 0; border-bottom-left-radius: 0; } -.primary-toolbar combobox.linked button.combo:dir(rtl), headerbar combobox.linked button.combo:dir(rtl), .primary-toolbar combobox.linked button.combo:dir(rtl):hover, headerbar combobox.linked button.combo:dir(rtl):hover, .primary-toolbar combobox.linked button.combo:dir(rtl):active, headerbar combobox.linked button.combo:dir(rtl):active, .primary-toolbar combobox.linked button.combo:dir(rtl):checked, headerbar combobox.linked button.combo:dir(rtl):checked, .primary-toolbar combobox.linked button.combo:dir(rtl):disabled, headerbar combobox.linked button.combo:dir(rtl):disabled { +.primary-toolbar combobox > .linked > button.combo:dir(rtl), headerbar combobox > .linked > button.combo:dir(rtl), .primary-toolbar combobox > .linked > button.combo:dir(rtl):hover, headerbar combobox > .linked > button.combo:dir(rtl):hover, .primary-toolbar combobox > .linked > button.combo:dir(rtl):active, headerbar combobox > .linked > button.combo:dir(rtl):active, .primary-toolbar combobox > .linked > button.combo:dir(rtl):checked, headerbar combobox > .linked > button.combo:dir(rtl):checked, .primary-toolbar combobox > .linked > button.combo:dir(rtl):disabled, headerbar combobox > .linked > button.combo:dir(rtl):disabled { border-top-right-radius: 0; border-bottom-right-radius: 0; } diff --git a/common/gtk-3.0/3.20/sass/_common.scss b/common/gtk-3.0/3.20/sass/_common.scss index e30151d..287e452 100644 --- a/common/gtk-3.0/3.20/sass/_common.scss +++ b/common/gtk-3.0/3.20/sass/_common.scss @@ -839,13 +839,6 @@ combobox { &:drop(active) button.combo { @extend button:drop(active); } - &.linked { - button:nth-child(2) { - &:dir(ltr) { @extend %linked:last-child; } - &:dir(rtl) { @extend %linked:first-child; } - } - } - .linked:not(.vertical) > & > box > button.combo { // the combobox is a composite widget so the way we do button linking doesn't // work, special case needed. @@ -1190,18 +1183,18 @@ headerbar { } // Linking stuff + + // Disconnect linked buttons .linked:not(.vertical):not(.path-bar):not(.stack-switcher) { button:not(:last-child):not(:only-child) { margin-right: 1px; } } // Reset buttons - .linked:not(.vertical):not(.path-bar) > button, - .linked:not(.vertical):not(.path-bar) > button:hover, - .linked:not(.vertical):not(.path-bar) > button:active, - .linked:not(.vertical):not(.path-bar) > button:checked, - .linked:not(.vertical):not(.path-bar) > button:disabled { - border-radius: 3px; - border-style: solid; + .linked:not(.vertical):not(.path-bar) > button { + &, &:hover, &:active, &:checked, &:disabled { + border-radius: 3px; + border-style: solid; + } } .linked:not(.vertical):not(.path-bar), .linked:not(.vertical).path-bar { > button:hover:not(:checked):not(:active):not(:only-child), @@ -1288,13 +1281,14 @@ headerbar { combobox { &:disabled { color: transparentize($header_fg, 0.6); } - &.linked button { + > .linked > button.combo { @include entry(header-normal); &:hover { @include entry(header-focus); box-shadow: none; } &:disabled { @include entry(header-insensitive); } } - &.linked entry { + + > .linked > entry.combo { &:dir(ltr) { border-right-style: none; @@ -1308,7 +1302,7 @@ headerbar { @if $variant=='light' and $darker=='false' { &:focus { box-shadow: -1px 0 $selected_bg_color; } } } } - &.linked button.combo { + > .linked > button.combo { &:dir(ltr) { &, &:hover, &:active, &:checked, &:disabled { border-top-left-radius: 0; -- cgit v1.2.3