From ad1ab4484b5f095307a6637198d97e5abccd868b Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Fri, 19 Feb 2016 11:06:17 +0100 Subject: update headerbar comboboxes --- 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 | 19 ++++++++++++++++--- 7 files changed, 116 insertions(+), 55 deletions(-) (limited to 'common/gtk-3.0') diff --git a/common/gtk-3.0/3.20/gtk-dark.css b/common/gtk-3.0/3.20/gtk-dark.css index 8f086cf..3429261 100644 --- a/common/gtk-3.0/3.20/gtk-dark.css +++ b/common/gtk-3.0/3.20/gtk-dark.css @@ -1173,32 +1173,40 @@ headerbar entry, headerbar button, headerbar separator, headerbar .sidebar separ .primary-toolbar combobox:disabled, headerbar combobox:disabled { color: rgba(207, 218, 231, 0.2); } -.primary-toolbar combobox.combobox-entry button, headerbar combobox.combobox-entry button { +.primary-toolbar combobox.linked button, headerbar combobox.linked button { 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.combobox-entry button image, headerbar combobox.combobox-entry button image, .primary-toolbar combobox.combobox-entry button image:hover, headerbar combobox.combobox-entry button image:hover { + .primary-toolbar combobox.linked button image, headerbar combobox.linked button image, .primary-toolbar combobox.linked button image:hover, headerbar combobox.linked button image:hover { color: inherit; } - .primary-toolbar combobox.combobox-entry button:hover, headerbar combobox.combobox-entry button:hover { + .primary-toolbar combobox.linked button:hover, headerbar combobox.linked button:hover { color: #ffffff; border-color: transparent; background-image: linear-gradient(to bottom, #5294E2); box-shadow: none; } - .primary-toolbar combobox.combobox-entry button:disabled, headerbar combobox.combobox-entry button:disabled { + .primary-toolbar combobox.linked button:disabled, headerbar combobox.linked button:disabled { color: rgba(207, 218, 231, 0.35); background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.22)); } -.primary-toolbar combobox.combobox-entry entry:dir(ltr), headerbar combobox.combobox-entry entry:dir(ltr) { +.primary-toolbar combobox.linked entry:dir(ltr), headerbar combobox.linked entry:dir(ltr) { border-right-style: none; } - .primary-toolbar combobox.combobox-entry entry:dir(ltr):focus, headerbar combobox.combobox-entry entry:dir(ltr):focus { + .primary-toolbar combobox.linked entry:dir(ltr):focus, headerbar combobox.linked entry:dir(ltr):focus { box-shadow: none; } -.primary-toolbar combobox.combobox-entry entry:dir(rtl), headerbar combobox.combobox-entry entry:dir(rtl) { +.primary-toolbar combobox.linked entry:dir(rtl), headerbar combobox.linked entry:dir(rtl) { border-left-style: none; } - .primary-toolbar combobox.combobox-entry entry:dir(rtl):focus, headerbar combobox.combobox-entry entry:dir(rtl):focus { + .primary-toolbar combobox.linked entry:dir(rtl):focus, headerbar combobox.linked entry: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 { + 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 { + border-top-right-radius: 0; + border-bottom-right-radius: 0; } + .primary-toolbar switch:backdrop, headerbar switch:backdrop { opacity: 0.75; } diff --git a/common/gtk-3.0/3.20/gtk-darker.css b/common/gtk-3.0/3.20/gtk-darker.css index 9169e43..994e751 100644 --- a/common/gtk-3.0/3.20/gtk-darker.css +++ b/common/gtk-3.0/3.20/gtk-darker.css @@ -1172,32 +1172,40 @@ headerbar entry, headerbar button, headerbar separator, headerbar .sidebar separ .primary-toolbar combobox:disabled, headerbar combobox:disabled { color: rgba(207, 218, 231, 0.2); } -.primary-toolbar combobox.combobox-entry button, headerbar combobox.combobox-entry button { +.primary-toolbar combobox.linked button, headerbar combobox.linked button { 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.combobox-entry button image, headerbar combobox.combobox-entry button image, .primary-toolbar combobox.combobox-entry button image:hover, headerbar combobox.combobox-entry button image:hover { + .primary-toolbar combobox.linked button image, headerbar combobox.linked button image, .primary-toolbar combobox.linked button image:hover, headerbar combobox.linked button image:hover { color: inherit; } - .primary-toolbar combobox.combobox-entry button:hover, headerbar combobox.combobox-entry button:hover { + .primary-toolbar combobox.linked button:hover, headerbar combobox.linked button:hover { color: #ffffff; border-color: transparent; background-image: linear-gradient(to bottom, #5294E2); box-shadow: none; } - .primary-toolbar combobox.combobox-entry button:disabled, headerbar combobox.combobox-entry button:disabled { + .primary-toolbar combobox.linked button:disabled, headerbar combobox.linked button:disabled { color: rgba(207, 218, 231, 0.35); background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.22)); } -.primary-toolbar combobox.combobox-entry entry:dir(ltr), headerbar combobox.combobox-entry entry:dir(ltr) { +.primary-toolbar combobox.linked entry:dir(ltr), headerbar combobox.linked entry:dir(ltr) { border-right-style: none; } - .primary-toolbar combobox.combobox-entry entry:dir(ltr):focus, headerbar combobox.combobox-entry entry:dir(ltr):focus { + .primary-toolbar combobox.linked entry:dir(ltr):focus, headerbar combobox.linked entry:dir(ltr):focus { box-shadow: none; } -.primary-toolbar combobox.combobox-entry entry:dir(rtl), headerbar combobox.combobox-entry entry:dir(rtl) { +.primary-toolbar combobox.linked entry:dir(rtl), headerbar combobox.linked entry:dir(rtl) { border-left-style: none; } - .primary-toolbar combobox.combobox-entry entry:dir(rtl):focus, headerbar combobox.combobox-entry entry:dir(rtl):focus { + .primary-toolbar combobox.linked entry:dir(rtl):focus, headerbar combobox.linked entry: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 { + 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 { + border-top-right-radius: 0; + border-bottom-right-radius: 0; } + .primary-toolbar switch:backdrop, headerbar switch:backdrop { opacity: 0.75; } 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 78b21c5..469493f 100644 --- a/common/gtk-3.0/3.20/gtk-solid-dark.css +++ b/common/gtk-3.0/3.20/gtk-solid-dark.css @@ -1173,32 +1173,40 @@ headerbar entry, headerbar button, headerbar separator, headerbar .sidebar separ .primary-toolbar combobox:disabled, headerbar combobox:disabled { color: rgba(207, 218, 231, 0.2); } -.primary-toolbar combobox.combobox-entry button, headerbar combobox.combobox-entry button { +.primary-toolbar combobox.linked button, headerbar combobox.linked button { 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.combobox-entry button image, headerbar combobox.combobox-entry button image, .primary-toolbar combobox.combobox-entry button image:hover, headerbar combobox.combobox-entry button image:hover { + .primary-toolbar combobox.linked button image, headerbar combobox.linked button image, .primary-toolbar combobox.linked button image:hover, headerbar combobox.linked button image:hover { color: inherit; } - .primary-toolbar combobox.combobox-entry button:hover, headerbar combobox.combobox-entry button:hover { + .primary-toolbar combobox.linked button:hover, headerbar combobox.linked button:hover { color: #ffffff; border-color: transparent; background-image: linear-gradient(to bottom, #5294E2); box-shadow: none; } - .primary-toolbar combobox.combobox-entry button:disabled, headerbar combobox.combobox-entry button:disabled { + .primary-toolbar combobox.linked button:disabled, headerbar combobox.linked button:disabled { color: rgba(207, 218, 231, 0.35); background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.25)); } -.primary-toolbar combobox.combobox-entry entry:dir(ltr), headerbar combobox.combobox-entry entry:dir(ltr) { +.primary-toolbar combobox.linked entry:dir(ltr), headerbar combobox.linked entry:dir(ltr) { border-right-style: none; } - .primary-toolbar combobox.combobox-entry entry:dir(ltr):focus, headerbar combobox.combobox-entry entry:dir(ltr):focus { + .primary-toolbar combobox.linked entry:dir(ltr):focus, headerbar combobox.linked entry:dir(ltr):focus { box-shadow: none; } -.primary-toolbar combobox.combobox-entry entry:dir(rtl), headerbar combobox.combobox-entry entry:dir(rtl) { +.primary-toolbar combobox.linked entry:dir(rtl), headerbar combobox.linked entry:dir(rtl) { border-left-style: none; } - .primary-toolbar combobox.combobox-entry entry:dir(rtl):focus, headerbar combobox.combobox-entry entry:dir(rtl):focus { + .primary-toolbar combobox.linked entry:dir(rtl):focus, headerbar combobox.linked entry: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 { + 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 { + border-top-right-radius: 0; + border-bottom-right-radius: 0; } + .primary-toolbar switch:backdrop, headerbar switch:backdrop { opacity: 0.75; } 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 d82b1a9..d017aeb 100644 --- a/common/gtk-3.0/3.20/gtk-solid-darker.css +++ b/common/gtk-3.0/3.20/gtk-solid-darker.css @@ -1172,32 +1172,40 @@ headerbar entry, headerbar button, headerbar separator, headerbar .sidebar separ .primary-toolbar combobox:disabled, headerbar combobox:disabled { color: rgba(207, 218, 231, 0.2); } -.primary-toolbar combobox.combobox-entry button, headerbar combobox.combobox-entry button { +.primary-toolbar combobox.linked button, headerbar combobox.linked button { 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.combobox-entry button image, headerbar combobox.combobox-entry button image, .primary-toolbar combobox.combobox-entry button image:hover, headerbar combobox.combobox-entry button image:hover { + .primary-toolbar combobox.linked button image, headerbar combobox.linked button image, .primary-toolbar combobox.linked button image:hover, headerbar combobox.linked button image:hover { color: inherit; } - .primary-toolbar combobox.combobox-entry button:hover, headerbar combobox.combobox-entry button:hover { + .primary-toolbar combobox.linked button:hover, headerbar combobox.linked button:hover { color: #ffffff; border-color: transparent; background-image: linear-gradient(to bottom, #5294E2); box-shadow: none; } - .primary-toolbar combobox.combobox-entry button:disabled, headerbar combobox.combobox-entry button:disabled { + .primary-toolbar combobox.linked button:disabled, headerbar combobox.linked button:disabled { color: rgba(207, 218, 231, 0.35); background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.25)); } -.primary-toolbar combobox.combobox-entry entry:dir(ltr), headerbar combobox.combobox-entry entry:dir(ltr) { +.primary-toolbar combobox.linked entry:dir(ltr), headerbar combobox.linked entry:dir(ltr) { border-right-style: none; } - .primary-toolbar combobox.combobox-entry entry:dir(ltr):focus, headerbar combobox.combobox-entry entry:dir(ltr):focus { + .primary-toolbar combobox.linked entry:dir(ltr):focus, headerbar combobox.linked entry:dir(ltr):focus { box-shadow: none; } -.primary-toolbar combobox.combobox-entry entry:dir(rtl), headerbar combobox.combobox-entry entry:dir(rtl) { +.primary-toolbar combobox.linked entry:dir(rtl), headerbar combobox.linked entry:dir(rtl) { border-left-style: none; } - .primary-toolbar combobox.combobox-entry entry:dir(rtl):focus, headerbar combobox.combobox-entry entry:dir(rtl):focus { + .primary-toolbar combobox.linked entry:dir(rtl):focus, headerbar combobox.linked entry: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 { + 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 { + border-top-right-radius: 0; + border-bottom-right-radius: 0; } + .primary-toolbar switch:backdrop, headerbar switch:backdrop { opacity: 0.75; } diff --git a/common/gtk-3.0/3.20/gtk-solid.css b/common/gtk-3.0/3.20/gtk-solid.css index f5452f4..e6a7b14 100644 --- a/common/gtk-3.0/3.20/gtk-solid.css +++ b/common/gtk-3.0/3.20/gtk-solid.css @@ -1172,36 +1172,44 @@ headerbar entry, headerbar button, headerbar separator, headerbar .sidebar separ .primary-toolbar combobox:disabled, headerbar combobox:disabled { color: rgba(82, 93, 118, 0.2); } -.primary-toolbar combobox.combobox-entry button, headerbar combobox.combobox-entry button { +.primary-toolbar combobox.linked button, headerbar combobox.linked button { 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.combobox-entry button image, headerbar combobox.combobox-entry button image, .primary-toolbar combobox.combobox-entry button image:hover, headerbar combobox.combobox-entry button image:hover { + .primary-toolbar combobox.linked button image, headerbar combobox.linked button image, .primary-toolbar combobox.linked button image:hover, headerbar combobox.linked button image:hover { color: inherit; } - .primary-toolbar combobox.combobox-entry button:hover, headerbar combobox.combobox-entry button:hover { + .primary-toolbar combobox.linked button:hover, headerbar combobox.linked button:hover { color: #ffffff; border-color: #5294E2; background-image: linear-gradient(to bottom, #5294E2); box-shadow: none; } - .primary-toolbar combobox.combobox-entry button:disabled, headerbar combobox.combobox-entry button:disabled { + .primary-toolbar combobox.linked button:disabled, headerbar combobox.linked button:disabled { color: rgba(82, 93, 118, 0.35); background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.75)); } -.primary-toolbar combobox.combobox-entry entry:dir(ltr), headerbar combobox.combobox-entry entry:dir(ltr) { +.primary-toolbar combobox.linked entry:dir(ltr), headerbar combobox.linked entry:dir(ltr) { border-right-style: none; } - .primary-toolbar combobox.combobox-entry entry:dir(ltr):focus, headerbar combobox.combobox-entry entry:dir(ltr):focus { + .primary-toolbar combobox.linked entry:dir(ltr):focus, headerbar combobox.linked entry:dir(ltr):focus { box-shadow: none; } - .primary-toolbar combobox.combobox-entry entry:dir(ltr):focus, headerbar combobox.combobox-entry entry:dir(ltr):focus { + .primary-toolbar combobox.linked entry:dir(ltr):focus, headerbar combobox.linked entry:dir(ltr):focus { box-shadow: 1px 0 #5294E2; } -.primary-toolbar combobox.combobox-entry entry:dir(rtl), headerbar combobox.combobox-entry entry:dir(rtl) { +.primary-toolbar combobox.linked entry:dir(rtl), headerbar combobox.linked entry:dir(rtl) { border-left-style: none; } - .primary-toolbar combobox.combobox-entry entry:dir(rtl):focus, headerbar combobox.combobox-entry entry:dir(rtl):focus { + .primary-toolbar combobox.linked entry:dir(rtl):focus, headerbar combobox.linked entry:dir(rtl):focus { box-shadow: none; } - .primary-toolbar combobox.combobox-entry entry:dir(rtl):focus, headerbar combobox.combobox-entry entry:dir(rtl):focus { + .primary-toolbar combobox.linked entry:dir(rtl):focus, headerbar combobox.linked entry: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 { + 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 { + border-top-right-radius: 0; + border-bottom-right-radius: 0; } + .primary-toolbar switch:backdrop, headerbar switch:backdrop { opacity: 0.75; } diff --git a/common/gtk-3.0/3.20/gtk.css b/common/gtk-3.0/3.20/gtk.css index 2586aba..e405359 100644 --- a/common/gtk-3.0/3.20/gtk.css +++ b/common/gtk-3.0/3.20/gtk.css @@ -1172,36 +1172,44 @@ headerbar entry, headerbar button, headerbar separator, headerbar .sidebar separ .primary-toolbar combobox:disabled, headerbar combobox:disabled { color: rgba(82, 93, 118, 0.2); } -.primary-toolbar combobox.combobox-entry button, headerbar combobox.combobox-entry button { +.primary-toolbar combobox.linked button, headerbar combobox.linked button { 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.combobox-entry button image, headerbar combobox.combobox-entry button image, .primary-toolbar combobox.combobox-entry button image:hover, headerbar combobox.combobox-entry button image:hover { + .primary-toolbar combobox.linked button image, headerbar combobox.linked button image, .primary-toolbar combobox.linked button image:hover, headerbar combobox.linked button image:hover { color: inherit; } - .primary-toolbar combobox.combobox-entry button:hover, headerbar combobox.combobox-entry button:hover { + .primary-toolbar combobox.linked button:hover, headerbar combobox.linked button:hover { color: #ffffff; border-color: #5294E2; background-image: linear-gradient(to bottom, #5294E2); box-shadow: none; } - .primary-toolbar combobox.combobox-entry button:disabled, headerbar combobox.combobox-entry button:disabled { + .primary-toolbar combobox.linked button:disabled, headerbar combobox.linked button:disabled { color: rgba(82, 93, 118, 0.35); background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.75)); } -.primary-toolbar combobox.combobox-entry entry:dir(ltr), headerbar combobox.combobox-entry entry:dir(ltr) { +.primary-toolbar combobox.linked entry:dir(ltr), headerbar combobox.linked entry:dir(ltr) { border-right-style: none; } - .primary-toolbar combobox.combobox-entry entry:dir(ltr):focus, headerbar combobox.combobox-entry entry:dir(ltr):focus { + .primary-toolbar combobox.linked entry:dir(ltr):focus, headerbar combobox.linked entry:dir(ltr):focus { box-shadow: none; } - .primary-toolbar combobox.combobox-entry entry:dir(ltr):focus, headerbar combobox.combobox-entry entry:dir(ltr):focus { + .primary-toolbar combobox.linked entry:dir(ltr):focus, headerbar combobox.linked entry:dir(ltr):focus { box-shadow: 1px 0 #5294E2; } -.primary-toolbar combobox.combobox-entry entry:dir(rtl), headerbar combobox.combobox-entry entry:dir(rtl) { +.primary-toolbar combobox.linked entry:dir(rtl), headerbar combobox.linked entry:dir(rtl) { border-left-style: none; } - .primary-toolbar combobox.combobox-entry entry:dir(rtl):focus, headerbar combobox.combobox-entry entry:dir(rtl):focus { + .primary-toolbar combobox.linked entry:dir(rtl):focus, headerbar combobox.linked entry:dir(rtl):focus { box-shadow: none; } - .primary-toolbar combobox.combobox-entry entry:dir(rtl):focus, headerbar combobox.combobox-entry entry:dir(rtl):focus { + .primary-toolbar combobox.linked entry:dir(rtl):focus, headerbar combobox.linked entry: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 { + 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 { + border-top-right-radius: 0; + border-bottom-right-radius: 0; } + .primary-toolbar switch:backdrop, headerbar switch:backdrop { opacity: 0.75; } diff --git a/common/gtk-3.0/3.20/sass/_common.scss b/common/gtk-3.0/3.20/sass/_common.scss index 3f6a638..684b81e 100644 --- a/common/gtk-3.0/3.20/sass/_common.scss +++ b/common/gtk-3.0/3.20/sass/_common.scss @@ -1181,13 +1181,13 @@ headerbar { combobox { &:disabled { color: transparentize($header_fg, 0.6); } - &.combobox-entry button { + &.linked button { @include entry(header-normal); &:hover { @include entry(header-focus); box-shadow: none; } &:disabled { @include entry(header-insensitive); } } - &.combobox-entry entry { + &.linked entry { &:dir(ltr) { border-right-style: none; @@ -1201,7 +1201,20 @@ headerbar { @if $variant=='light' and $darker=='false' { &:focus { box-shadow: -1px 0 $selected_bg_color; } } } } - + &.linked button.combo { + &:dir(ltr) { + &, &:hover, &:active, &:checked, &:disabled { + border-top-left-radius: 0; + border-bottom-left-radius: 0; + } + } + &:dir(rtl) { + &, &:hover, &:active, &:checked, &:disabled { + border-top-right-radius: 0; + border-bottom-right-radius: 0; + } + } + } } // Headerbar Switches -- cgit v1.2.3