From c361a65cc27b0ebab7f388517135d4201bd16bd2 Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Fri, 19 Feb 2016 11:06:17 +0100 Subject: simplify comboboxes --- common/gtk-3.0/3.20/gtk-dark.css | 31 ++------------ common/gtk-3.0/3.20/gtk-darker.css | 35 ++-------------- common/gtk-3.0/3.20/gtk-solid-dark.css | 31 ++------------ common/gtk-3.0/3.20/gtk-solid-darker.css | 35 ++-------------- common/gtk-3.0/3.20/gtk-solid.css | 35 ++-------------- common/gtk-3.0/3.20/gtk.css | 35 ++-------------- common/gtk-3.0/3.20/sass/_common.scss | 69 +++++++++----------------------- 7 files changed, 36 insertions(+), 235 deletions(-) (limited to 'common') diff --git a/common/gtk-3.0/3.20/gtk-dark.css b/common/gtk-3.0/3.20/gtk-dark.css index 68bff8c..13a69c8 100644 --- a/common/gtk-3.0/3.20/gtk-dark.css +++ b/common/gtk-3.0/3.20/gtk-dark.css @@ -691,16 +691,16 @@ NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > b border-radius: 0; border-right-style: none; } -.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, .linked:not(.vertical):not(.pathbar) > entry:first-child, .linked:not(.vertical):not(.pathbar) > spinbutton:first-child, .linked > combobox:first-child > 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, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button: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, .linked:not(.vertical):not(.pathbar) > entry:first-child, .linked:not(.vertical):not(.pathbar) > spinbutton:first-child, combobox.linked button:nth-child(2):dir(rtl), .linked:not(.vertical) > combobox:first-child > 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, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:first-child { border-top-left-radius: 3px; border-bottom-left-radius: 3px; } -.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, .linked:not(.vertical):not(.pathbar) > entry:last-child, .linked:not(.vertical):not(.pathbar) > spinbutton:last-child, .linked > combobox:last-child > 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, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button: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, .linked:not(.vertical):not(.pathbar) > entry:last-child, .linked:not(.vertical):not(.pathbar) > spinbutton:last-child, combobox.linked button:nth-child(2):dir(ltr), .linked:not(.vertical) > combobox:last-child > 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, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:last-child { border-top-right-radius: 3px; border-bottom-right-radius: 3px; border-right-style: solid; } -.inline-toolbar button:only-child, .linked:not(.vertical) > button:only-child, toolbar.inline-toolbar toolbutton:only-child > button.flat, .inline-toolbar toolbutton:only-child > button.flat, toolbar.inline-toolbar toolbutton:only-child > button.sidebar-button, .inline-toolbar toolbutton:only-child > button.sidebar-button, .linked:not(.vertical):not(.pathbar) > entry:only-child, .linked:not(.vertical):not(.pathbar) > spinbutton:only-child, .linked > combobox:only-child > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:only-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:only-child, .primary-toolbar .linked:not(.vertical).path-bar > button:only-child, headerbar .linked:not(.vertical).path-bar > button:only-child, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:only-child { +.inline-toolbar button:only-child, .linked:not(.vertical) > button:only-child, toolbar.inline-toolbar toolbutton:only-child > button.flat, .inline-toolbar toolbutton:only-child > button.flat, toolbar.inline-toolbar toolbutton:only-child > button.sidebar-button, .inline-toolbar toolbutton:only-child > button.sidebar-button, .linked:not(.vertical):not(.pathbar) > entry:only-child, .linked:not(.vertical):not(.pathbar) > spinbutton:only-child, .linked:not(.vertical) > combobox:only-child > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:only-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:only-child, .primary-toolbar .linked:not(.vertical).path-bar > button:only-child, headerbar .linked:not(.vertical).path-bar > button:only-child, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:only-child { border-radius: 3px; border-style: solid; } @@ -881,36 +881,11 @@ treeview spinbutton entry, treeview spinbutton spinbutton, treeview spinbutton e border-radius: 0; box-shadow: none; } -combobox > button.combo { - padding-left: 8px; - padding-right: 8px; } - -combobox:disabled { - color: rgba(211, 218, 227, 0.45); } - combobox arrow { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); min-height: 16px; min-width: 16px; } -combobox > entry.combo:dir(ltr), combobox > spinbutton.combo:dir(ltr) { - border-top-right-radius: 0; - border-bottom-right-radius: 0; - border-right-style: none; } - -combobox > entry.combo:dir(rtl), combobox > spinbutton.combo:dir(rtl) { - border-top-left-radius: 0; - border-bottom-left-radius: 0; - border-left-style: none; } - -combobox > button.combo:not(:only-child):dir(ltr) { - border-top-left-radius: 0; - border-bottom-left-radius: 0; } - -combobox > button.combo:not(:only-child):dir(rtl) { - border-top-right-radius: 0; - border-bottom-right-radius: 0; } - toolbar, .inline-toolbar { -GtkWidget-window-dragging: true; padding: 4px; diff --git a/common/gtk-3.0/3.20/gtk-darker.css b/common/gtk-3.0/3.20/gtk-darker.css index ed57a6e..493b71d 100644 --- a/common/gtk-3.0/3.20/gtk-darker.css +++ b/common/gtk-3.0/3.20/gtk-darker.css @@ -690,16 +690,16 @@ NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > b border-radius: 0; border-right-style: none; } -.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, .linked:not(.vertical):not(.pathbar) > entry:first-child, .linked:not(.vertical):not(.pathbar) > spinbutton:first-child, .linked > combobox:first-child > 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, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button: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, .linked:not(.vertical):not(.pathbar) > entry:first-child, .linked:not(.vertical):not(.pathbar) > spinbutton:first-child, combobox.linked button:nth-child(2):dir(rtl), .linked:not(.vertical) > combobox:first-child > 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, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:first-child { border-top-left-radius: 3px; border-bottom-left-radius: 3px; } -.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, .linked:not(.vertical):not(.pathbar) > entry:last-child, .linked:not(.vertical):not(.pathbar) > spinbutton:last-child, .linked > combobox:last-child > 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, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button: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, .linked:not(.vertical):not(.pathbar) > entry:last-child, .linked:not(.vertical):not(.pathbar) > spinbutton:last-child, combobox.linked button:nth-child(2):dir(ltr), .linked:not(.vertical) > combobox:last-child > 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, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:last-child { border-top-right-radius: 3px; border-bottom-right-radius: 3px; border-right-style: solid; } -.inline-toolbar button:only-child, .linked:not(.vertical) > button:only-child, toolbar.inline-toolbar toolbutton:only-child > button.flat, .inline-toolbar toolbutton:only-child > button.flat, toolbar.inline-toolbar toolbutton:only-child > button.sidebar-button, .inline-toolbar toolbutton:only-child > button.sidebar-button, .linked:not(.vertical):not(.pathbar) > entry:only-child, .linked:not(.vertical):not(.pathbar) > spinbutton:only-child, .linked > combobox:only-child > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:only-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:only-child, .primary-toolbar .linked:not(.vertical).path-bar > button:only-child, headerbar .linked:not(.vertical).path-bar > button:only-child, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:only-child { +.inline-toolbar button:only-child, .linked:not(.vertical) > button:only-child, toolbar.inline-toolbar toolbutton:only-child > button.flat, .inline-toolbar toolbutton:only-child > button.flat, toolbar.inline-toolbar toolbutton:only-child > button.sidebar-button, .inline-toolbar toolbutton:only-child > button.sidebar-button, .linked:not(.vertical):not(.pathbar) > entry:only-child, .linked:not(.vertical):not(.pathbar) > spinbutton:only-child, .linked:not(.vertical) > combobox:only-child > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:only-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:only-child, .primary-toolbar .linked:not(.vertical).path-bar > button:only-child, headerbar .linked:not(.vertical).path-bar > button:only-child, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:only-child { border-radius: 3px; border-style: solid; } @@ -880,40 +880,11 @@ treeview spinbutton entry, treeview spinbutton spinbutton, treeview spinbutton e border-radius: 0; box-shadow: none; } -combobox > button.combo { - padding-left: 8px; - padding-right: 8px; } - -combobox:disabled { - color: rgba(92, 97, 108, 0.55); } - combobox arrow { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); min-height: 16px; min-width: 16px; } -combobox > entry.combo:dir(ltr), combobox > spinbutton.combo:dir(ltr) { - border-top-right-radius: 0; - border-bottom-right-radius: 0; - border-right-style: none; } - combobox > entry.combo:dir(ltr):focus, combobox > spinbutton.combo:dir(ltr):focus { - box-shadow: 1px 0 #5294E2; } - -combobox > entry.combo:dir(rtl), combobox > spinbutton.combo:dir(rtl) { - border-top-left-radius: 0; - border-bottom-left-radius: 0; - border-left-style: none; } - combobox > entry.combo:dir(rtl):focus, combobox > spinbutton.combo:dir(rtl):focus { - box-shadow: -1px 0 #5294E2; } - -combobox > button.combo:not(:only-child):dir(ltr) { - border-top-left-radius: 0; - border-bottom-left-radius: 0; } - -combobox > button.combo:not(:only-child):dir(rtl) { - border-top-right-radius: 0; - border-bottom-right-radius: 0; } - toolbar, .inline-toolbar { -GtkWidget-window-dragging: true; padding: 4px; 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 78f586b..1b3f5d1 100644 --- a/common/gtk-3.0/3.20/gtk-solid-dark.css +++ b/common/gtk-3.0/3.20/gtk-solid-dark.css @@ -691,16 +691,16 @@ NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > b border-radius: 0; border-right-style: none; } -.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, .linked:not(.vertical):not(.pathbar) > entry:first-child, .linked:not(.vertical):not(.pathbar) > spinbutton:first-child, .linked > combobox:first-child > 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, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button: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, .linked:not(.vertical):not(.pathbar) > entry:first-child, .linked:not(.vertical):not(.pathbar) > spinbutton:first-child, combobox.linked button:nth-child(2):dir(rtl), .linked:not(.vertical) > combobox:first-child > 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, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:first-child { border-top-left-radius: 3px; border-bottom-left-radius: 3px; } -.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, .linked:not(.vertical):not(.pathbar) > entry:last-child, .linked:not(.vertical):not(.pathbar) > spinbutton:last-child, .linked > combobox:last-child > 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, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button: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, .linked:not(.vertical):not(.pathbar) > entry:last-child, .linked:not(.vertical):not(.pathbar) > spinbutton:last-child, combobox.linked button:nth-child(2):dir(ltr), .linked:not(.vertical) > combobox:last-child > 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, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:last-child { border-top-right-radius: 3px; border-bottom-right-radius: 3px; border-right-style: solid; } -.inline-toolbar button:only-child, .linked:not(.vertical) > button:only-child, toolbar.inline-toolbar toolbutton:only-child > button.flat, .inline-toolbar toolbutton:only-child > button.flat, toolbar.inline-toolbar toolbutton:only-child > button.sidebar-button, .inline-toolbar toolbutton:only-child > button.sidebar-button, .linked:not(.vertical):not(.pathbar) > entry:only-child, .linked:not(.vertical):not(.pathbar) > spinbutton:only-child, .linked > combobox:only-child > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:only-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:only-child, .primary-toolbar .linked:not(.vertical).path-bar > button:only-child, headerbar .linked:not(.vertical).path-bar > button:only-child, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:only-child { +.inline-toolbar button:only-child, .linked:not(.vertical) > button:only-child, toolbar.inline-toolbar toolbutton:only-child > button.flat, .inline-toolbar toolbutton:only-child > button.flat, toolbar.inline-toolbar toolbutton:only-child > button.sidebar-button, .inline-toolbar toolbutton:only-child > button.sidebar-button, .linked:not(.vertical):not(.pathbar) > entry:only-child, .linked:not(.vertical):not(.pathbar) > spinbutton:only-child, .linked:not(.vertical) > combobox:only-child > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:only-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:only-child, .primary-toolbar .linked:not(.vertical).path-bar > button:only-child, headerbar .linked:not(.vertical).path-bar > button:only-child, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:only-child { border-radius: 3px; border-style: solid; } @@ -881,36 +881,11 @@ treeview spinbutton entry, treeview spinbutton spinbutton, treeview spinbutton e border-radius: 0; box-shadow: none; } -combobox > button.combo { - padding-left: 8px; - padding-right: 8px; } - -combobox:disabled { - color: rgba(211, 218, 227, 0.45); } - combobox arrow { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); min-height: 16px; min-width: 16px; } -combobox > entry.combo:dir(ltr), combobox > spinbutton.combo:dir(ltr) { - border-top-right-radius: 0; - border-bottom-right-radius: 0; - border-right-style: none; } - -combobox > entry.combo:dir(rtl), combobox > spinbutton.combo:dir(rtl) { - border-top-left-radius: 0; - border-bottom-left-radius: 0; - border-left-style: none; } - -combobox > button.combo:not(:only-child):dir(ltr) { - border-top-left-radius: 0; - border-bottom-left-radius: 0; } - -combobox > button.combo:not(:only-child):dir(rtl) { - border-top-right-radius: 0; - border-bottom-right-radius: 0; } - toolbar, .inline-toolbar { -GtkWidget-window-dragging: true; padding: 4px; 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 4005772..a4e77cc 100644 --- a/common/gtk-3.0/3.20/gtk-solid-darker.css +++ b/common/gtk-3.0/3.20/gtk-solid-darker.css @@ -690,16 +690,16 @@ NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > b border-radius: 0; border-right-style: none; } -.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, .linked:not(.vertical):not(.pathbar) > entry:first-child, .linked:not(.vertical):not(.pathbar) > spinbutton:first-child, .linked > combobox:first-child > 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, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button: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, .linked:not(.vertical):not(.pathbar) > entry:first-child, .linked:not(.vertical):not(.pathbar) > spinbutton:first-child, combobox.linked button:nth-child(2):dir(rtl), .linked:not(.vertical) > combobox:first-child > 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, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:first-child { border-top-left-radius: 3px; border-bottom-left-radius: 3px; } -.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, .linked:not(.vertical):not(.pathbar) > entry:last-child, .linked:not(.vertical):not(.pathbar) > spinbutton:last-child, .linked > combobox:last-child > 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, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button: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, .linked:not(.vertical):not(.pathbar) > entry:last-child, .linked:not(.vertical):not(.pathbar) > spinbutton:last-child, combobox.linked button:nth-child(2):dir(ltr), .linked:not(.vertical) > combobox:last-child > 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, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:last-child { border-top-right-radius: 3px; border-bottom-right-radius: 3px; border-right-style: solid; } -.inline-toolbar button:only-child, .linked:not(.vertical) > button:only-child, toolbar.inline-toolbar toolbutton:only-child > button.flat, .inline-toolbar toolbutton:only-child > button.flat, toolbar.inline-toolbar toolbutton:only-child > button.sidebar-button, .inline-toolbar toolbutton:only-child > button.sidebar-button, .linked:not(.vertical):not(.pathbar) > entry:only-child, .linked:not(.vertical):not(.pathbar) > spinbutton:only-child, .linked > combobox:only-child > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:only-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:only-child, .primary-toolbar .linked:not(.vertical).path-bar > button:only-child, headerbar .linked:not(.vertical).path-bar > button:only-child, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:only-child { +.inline-toolbar button:only-child, .linked:not(.vertical) > button:only-child, toolbar.inline-toolbar toolbutton:only-child > button.flat, .inline-toolbar toolbutton:only-child > button.flat, toolbar.inline-toolbar toolbutton:only-child > button.sidebar-button, .inline-toolbar toolbutton:only-child > button.sidebar-button, .linked:not(.vertical):not(.pathbar) > entry:only-child, .linked:not(.vertical):not(.pathbar) > spinbutton:only-child, .linked:not(.vertical) > combobox:only-child > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:only-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:only-child, .primary-toolbar .linked:not(.vertical).path-bar > button:only-child, headerbar .linked:not(.vertical).path-bar > button:only-child, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:only-child { border-radius: 3px; border-style: solid; } @@ -880,40 +880,11 @@ treeview spinbutton entry, treeview spinbutton spinbutton, treeview spinbutton e border-radius: 0; box-shadow: none; } -combobox > button.combo { - padding-left: 8px; - padding-right: 8px; } - -combobox:disabled { - color: rgba(92, 97, 108, 0.55); } - combobox arrow { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); min-height: 16px; min-width: 16px; } -combobox > entry.combo:dir(ltr), combobox > spinbutton.combo:dir(ltr) { - border-top-right-radius: 0; - border-bottom-right-radius: 0; - border-right-style: none; } - combobox > entry.combo:dir(ltr):focus, combobox > spinbutton.combo:dir(ltr):focus { - box-shadow: 1px 0 #5294E2; } - -combobox > entry.combo:dir(rtl), combobox > spinbutton.combo:dir(rtl) { - border-top-left-radius: 0; - border-bottom-left-radius: 0; - border-left-style: none; } - combobox > entry.combo:dir(rtl):focus, combobox > spinbutton.combo:dir(rtl):focus { - box-shadow: -1px 0 #5294E2; } - -combobox > button.combo:not(:only-child):dir(ltr) { - border-top-left-radius: 0; - border-bottom-left-radius: 0; } - -combobox > button.combo:not(:only-child):dir(rtl) { - border-top-right-radius: 0; - border-bottom-right-radius: 0; } - toolbar, .inline-toolbar { -GtkWidget-window-dragging: true; padding: 4px; diff --git a/common/gtk-3.0/3.20/gtk-solid.css b/common/gtk-3.0/3.20/gtk-solid.css index 986013b..83f45b3 100644 --- a/common/gtk-3.0/3.20/gtk-solid.css +++ b/common/gtk-3.0/3.20/gtk-solid.css @@ -690,16 +690,16 @@ NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > b border-radius: 0; border-right-style: none; } -.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, .linked:not(.vertical):not(.pathbar) > entry:first-child, .linked:not(.vertical):not(.pathbar) > spinbutton:first-child, .linked > combobox:first-child > 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, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button: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, .linked:not(.vertical):not(.pathbar) > entry:first-child, .linked:not(.vertical):not(.pathbar) > spinbutton:first-child, combobox.linked button:nth-child(2):dir(rtl), .linked:not(.vertical) > combobox:first-child > 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, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:first-child { border-top-left-radius: 3px; border-bottom-left-radius: 3px; } -.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, .linked:not(.vertical):not(.pathbar) > entry:last-child, .linked:not(.vertical):not(.pathbar) > spinbutton:last-child, .linked > combobox:last-child > 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, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button: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, .linked:not(.vertical):not(.pathbar) > entry:last-child, .linked:not(.vertical):not(.pathbar) > spinbutton:last-child, combobox.linked button:nth-child(2):dir(ltr), .linked:not(.vertical) > combobox:last-child > 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, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:last-child { border-top-right-radius: 3px; border-bottom-right-radius: 3px; border-right-style: solid; } -.inline-toolbar button:only-child, .linked:not(.vertical) > button:only-child, toolbar.inline-toolbar toolbutton:only-child > button.flat, .inline-toolbar toolbutton:only-child > button.flat, toolbar.inline-toolbar toolbutton:only-child > button.sidebar-button, .inline-toolbar toolbutton:only-child > button.sidebar-button, .linked:not(.vertical):not(.pathbar) > entry:only-child, .linked:not(.vertical):not(.pathbar) > spinbutton:only-child, .linked > combobox:only-child > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:only-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:only-child, .primary-toolbar .linked:not(.vertical).path-bar > button:only-child, headerbar .linked:not(.vertical).path-bar > button:only-child, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:only-child { +.inline-toolbar button:only-child, .linked:not(.vertical) > button:only-child, toolbar.inline-toolbar toolbutton:only-child > button.flat, .inline-toolbar toolbutton:only-child > button.flat, toolbar.inline-toolbar toolbutton:only-child > button.sidebar-button, .inline-toolbar toolbutton:only-child > button.sidebar-button, .linked:not(.vertical):not(.pathbar) > entry:only-child, .linked:not(.vertical):not(.pathbar) > spinbutton:only-child, .linked:not(.vertical) > combobox:only-child > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:only-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:only-child, .primary-toolbar .linked:not(.vertical).path-bar > button:only-child, headerbar .linked:not(.vertical).path-bar > button:only-child, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:only-child { border-radius: 3px; border-style: solid; } @@ -880,40 +880,11 @@ treeview spinbutton entry, treeview spinbutton spinbutton, treeview spinbutton e border-radius: 0; box-shadow: none; } -combobox > button.combo { - padding-left: 8px; - padding-right: 8px; } - -combobox:disabled { - color: rgba(92, 97, 108, 0.55); } - combobox arrow { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); min-height: 16px; min-width: 16px; } -combobox > entry.combo:dir(ltr), combobox > spinbutton.combo:dir(ltr) { - border-top-right-radius: 0; - border-bottom-right-radius: 0; - border-right-style: none; } - combobox > entry.combo:dir(ltr):focus, combobox > spinbutton.combo:dir(ltr):focus { - box-shadow: 1px 0 #5294E2; } - -combobox > entry.combo:dir(rtl), combobox > spinbutton.combo:dir(rtl) { - border-top-left-radius: 0; - border-bottom-left-radius: 0; - border-left-style: none; } - combobox > entry.combo:dir(rtl):focus, combobox > spinbutton.combo:dir(rtl):focus { - box-shadow: -1px 0 #5294E2; } - -combobox > button.combo:not(:only-child):dir(ltr) { - border-top-left-radius: 0; - border-bottom-left-radius: 0; } - -combobox > button.combo:not(:only-child):dir(rtl) { - border-top-right-radius: 0; - border-bottom-right-radius: 0; } - toolbar, .inline-toolbar { -GtkWidget-window-dragging: true; padding: 4px; diff --git a/common/gtk-3.0/3.20/gtk.css b/common/gtk-3.0/3.20/gtk.css index 94dfc47..3924291 100644 --- a/common/gtk-3.0/3.20/gtk.css +++ b/common/gtk-3.0/3.20/gtk.css @@ -690,16 +690,16 @@ NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > b border-radius: 0; border-right-style: none; } -.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, .linked:not(.vertical):not(.pathbar) > entry:first-child, .linked:not(.vertical):not(.pathbar) > spinbutton:first-child, .linked > combobox:first-child > 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, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button: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, .linked:not(.vertical):not(.pathbar) > entry:first-child, .linked:not(.vertical):not(.pathbar) > spinbutton:first-child, combobox.linked button:nth-child(2):dir(rtl), .linked:not(.vertical) > combobox:first-child > 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, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:first-child { border-top-left-radius: 3px; border-bottom-left-radius: 3px; } -.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, .linked:not(.vertical):not(.pathbar) > entry:last-child, .linked:not(.vertical):not(.pathbar) > spinbutton:last-child, .linked > combobox:last-child > 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, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button: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, .linked:not(.vertical):not(.pathbar) > entry:last-child, .linked:not(.vertical):not(.pathbar) > spinbutton:last-child, combobox.linked button:nth-child(2):dir(ltr), .linked:not(.vertical) > combobox:last-child > 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, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:last-child { border-top-right-radius: 3px; border-bottom-right-radius: 3px; border-right-style: solid; } -.inline-toolbar button:only-child, .linked:not(.vertical) > button:only-child, toolbar.inline-toolbar toolbutton:only-child > button.flat, .inline-toolbar toolbutton:only-child > button.flat, toolbar.inline-toolbar toolbutton:only-child > button.sidebar-button, .inline-toolbar toolbutton:only-child > button.sidebar-button, .linked:not(.vertical):not(.pathbar) > entry:only-child, .linked:not(.vertical):not(.pathbar) > spinbutton:only-child, .linked > combobox:only-child > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:only-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:only-child, .primary-toolbar .linked:not(.vertical).path-bar > button:only-child, headerbar .linked:not(.vertical).path-bar > button:only-child, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:only-child { +.inline-toolbar button:only-child, .linked:not(.vertical) > button:only-child, toolbar.inline-toolbar toolbutton:only-child > button.flat, .inline-toolbar toolbutton:only-child > button.flat, toolbar.inline-toolbar toolbutton:only-child > button.sidebar-button, .inline-toolbar toolbutton:only-child > button.sidebar-button, .linked:not(.vertical):not(.pathbar) > entry:only-child, .linked:not(.vertical):not(.pathbar) > spinbutton:only-child, .linked:not(.vertical) > combobox:only-child > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:only-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:only-child, .primary-toolbar .linked:not(.vertical).path-bar > button:only-child, headerbar .linked:not(.vertical).path-bar > button:only-child, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:only-child { border-radius: 3px; border-style: solid; } @@ -880,40 +880,11 @@ treeview spinbutton entry, treeview spinbutton spinbutton, treeview spinbutton e border-radius: 0; box-shadow: none; } -combobox > button.combo { - padding-left: 8px; - padding-right: 8px; } - -combobox:disabled { - color: rgba(92, 97, 108, 0.55); } - combobox arrow { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); min-height: 16px; min-width: 16px; } -combobox > entry.combo:dir(ltr), combobox > spinbutton.combo:dir(ltr) { - border-top-right-radius: 0; - border-bottom-right-radius: 0; - border-right-style: none; } - combobox > entry.combo:dir(ltr):focus, combobox > spinbutton.combo:dir(ltr):focus { - box-shadow: 1px 0 #5294E2; } - -combobox > entry.combo:dir(rtl), combobox > spinbutton.combo:dir(rtl) { - border-top-left-radius: 0; - border-bottom-left-radius: 0; - border-left-style: none; } - combobox > entry.combo:dir(rtl):focus, combobox > spinbutton.combo:dir(rtl):focus { - box-shadow: -1px 0 #5294E2; } - -combobox > button.combo:not(:only-child):dir(ltr) { - border-top-left-radius: 0; - border-bottom-left-radius: 0; } - -combobox > button.combo:not(:only-child):dir(rtl) { - border-top-right-radius: 0; - border-bottom-right-radius: 0; } - toolbar, .inline-toolbar { -GtkWidget-window-dragging: true; padding: 4px; diff --git a/common/gtk-3.0/3.20/sass/_common.scss b/common/gtk-3.0/3.20/sass/_common.scss index a148fba..ae3a0a8 100644 --- a/common/gtk-3.0/3.20/sass/_common.scss +++ b/common/gtk-3.0/3.20/sass/_common.scss @@ -890,68 +890,35 @@ spinbutton { // combobox { - > button.combo { - padding-left: 8px; - padding-right: 8px; - } - - &:disabled { - color: $insensitive_fg_color; - } arrow { -gtk-icon-source: -gtk-icontheme('pan-down-symbolic'); min-height: 16px; min-width: 16px; } - > entry.combo { - &:dir(ltr) { - border-top-right-radius: 0; - border-bottom-right-radius: 0; - border-right-style: none; - - @if $variant=='light' { &:focus { box-shadow: 1px 0 $selected_bg_color; } } - } - &:dir(rtl) { - border-top-left-radius: 0; - border-bottom-left-radius: 0; - border-left-style: none; - @if $variant=='light' { &:focus { box-shadow: -1px 0 $selected_bg_color; } } + &.linked { + button:nth-child(2) { + &:dir(ltr) { @extend %linked:last-child; } + &:dir(rtl) { @extend %linked:first-child; } } } - > button.combo:not(:only-child) { - &:dir(ltr) { - border-top-left-radius: 0; - border-bottom-left-radius: 0; - } - &:dir(rtl) { - border-top-right-radius: 0; - border-bottom-right-radius: 0; - } + + .linked > & > button.combo { + // the combobox is a composite widget so the way we do button linking doesn't + // work, special case needed. + &:dir(ltr), + &:dir(rtl) { @extend %linked_middle; } // specificity bump } -} -.linked > combobox > button.combo { - // the combo is a composite widget so the way we do button linkind doesn't - // work, special case needed. See - // https://bugzilla.gnome.org/show_bug.cgi?id=733979 - &:dir(ltr), - &:dir(rtl) { @extend %linked_middle; } // specificity bump -} -.linked > combobox:first-child > button.combo { - @extend %linked:first-child; -} -.linked > combobox:last-child > button.combo { - @extend %linked:last-child; -} -.linked > combobox:only-child > button.combo { - @extend %linked:only-child; -} + .linked:not(.vertical) > &:first-child > button.combo { @extend %linked:first-child; } + .linked:not(.vertical) > &:last-child > button.combo { @extend %linked:last-child; } + .linked:not(.vertical) > &:only-child > button.combo { @extend %linked:only-child; } -.linked.vertical > combobox > button.combo { @extend %linked_vertical_middle; } -.linked.vertical > combobox:first-child > button.combo { @extend %linked_vertical:first-child; } -.linked.vertical > combobox:last-child > button.combo { @extend %linked_vertical:last-child; } -.linked.vertical > combobox:only-child > button.combo { @extend %linked_vertical:only-child; } + .linked.vertical > & > button.combo { @extend %linked_vertical_middle; } + .linked.vertical > &:first-child > button.combo { @extend %linked_vertical:first-child; } + .linked.vertical > &:last-child > button.combo { @extend %linked_vertical:last-child; } + .linked.vertical > &:only-child > button.combo { @extend %linked_vertical:only-child; } +} // // Toolbars -- cgit v1.2.3