From e97f2c3cf75b5205bc5ecd6072696327169fde5d Mon Sep 17 00:00:00 2001 From: Mattias Date: Sun, 23 Apr 2017 17:26:52 +0200 Subject: [PATCH] Fix #113 --- Zukitre/gtk-3.0/_common.scss | 51 +++++++++++--------------- Zukitre/gtk-3.0/_other.scss | 5 +++ Zukitre/gtk-3.0/gtk-contained-dark.css | 21 ++++++----- Zukitre/gtk-3.0/gtk-contained.css | 21 ++++++----- Zukitwo/gtk-3.0/_common.scss | 49 ++++++++++--------------- Zukitwo/gtk-3.0/_other.scss | 5 +++ Zukitwo/gtk-3.0/gtk-contained-dark.css | 21 ++++++----- Zukitwo/gtk-3.0/gtk-contained.css | 21 ++++++----- 8 files changed, 99 insertions(+), 95 deletions(-) diff --git a/Zukitre/gtk-3.0/_common.scss b/Zukitre/gtk-3.0/_common.scss index f475e26..df15be9 100644 --- a/Zukitre/gtk-3.0/_common.scss +++ b/Zukitre/gtk-3.0/_common.scss @@ -758,48 +758,38 @@ toolbar.inline-toolbar toolbutton { // Linked shadows variables. $shadow-color: transparentize(black, 0.92); $inset-color: if($variant == 'light', transparentize(white, 0.6), transparentize(white, 0.94)); -$btn-shadow-middle: +$btn-shadow-middle: 0px 0 $shadow-color, 0 1px $shadow-color, 0px 0 $shadow-color, 0 -1px $shadow-color, - inset 0px 0 $inset-color, - inset 0 1px $inset-color, - inset 0px 0 $inset-color, + inset 0px 0 $inset-color, + inset 0 1px $inset-color, + inset 0px 0 $inset-color, inset 0 -1px $inset-color; -$btn-shadow-middle-vert: - 1px 0 $shadow-color, - 0 0px $shadow-color, - 1px 0 $shadow-color, - 0 0px $shadow-color, - inset 1px 0 $inset-color, - inset 0 0px $inset-color, - inset -1px 0 $inset-color, - inset 0 0px $inset-color; -$btn-shadow-left: +$btn-shadow-left: 0px 0 $shadow-color, 0 1px $shadow-color, -1px 0 $shadow-color, 0 -1px $shadow-color, - inset 1px 0 $inset-color, - inset 0 1px $inset-color, - inset 0px 0 $inset-color, + inset 1px 0 $inset-color, + inset 0 1px $inset-color, + inset 0px 0 $inset-color, inset 0 -1px $inset-color; -$btn-shadow-right: +$btn-shadow-right: 1px 0 $shadow-color, 0 1px $shadow-color, 0px 0 $shadow-color, 0 -1px $shadow-color, - inset 0px 0 $inset-color, - inset 0 1px $inset-color, - inset -1px 0 $inset-color, + inset 0px 0 $inset-color, + inset 0 1px $inset-color, + inset -1px 0 $inset-color, inset 0 -1px $inset-color; %linked_middle { border-radius: 0; border-right-style: none; - border-right-width: 0; - border-left-width: 0; + border-left-style: none; box-shadow: $btn-shadow-middle; // FIXME: Figure out how this looks on colored titlebars. &:active { @include button(active); } @@ -813,8 +803,8 @@ $btn-shadow-right: &:first-child { border-top-left-radius: 1px; border-bottom-left-radius: 1px; - border-left-width: 1px; - border-right-width: 0; + border-left-style: solid; + border-right-style: none; box-shadow: $btn-shadow-left; &:active { @include button(active); } &:checked { @include button(active); } @@ -824,9 +814,8 @@ $btn-shadow-right: &:last-child { border-top-right-radius: 1px; border-bottom-right-radius: 1px; + border-left-style: none; border-right-style: solid; - border-left-width: 0; - border-right-width: 1px; box-shadow: $btn-shadow-right; &:active { @include button(active); } &:checked { @include button(active); } @@ -847,19 +836,21 @@ $btn-shadow-right: %linked_vertical_middle { border-style: solid solid none solid; border-radius: 0; - box-shadow: $btn-shadow-middle-vert; + box-shadow: none; } -%linked_vertical{ +%linked_vertical { @extend %linked_vertical_middle; &:first-child { border-top-left-radius: 1px; border-top-right-radius: 1px; + box-shadow: none; } &:last-child { border-bottom-left-radius: 1px; border-bottom-right-radius: 1px; - border-style: solid; + border-bottom-style: solid; + box-shadow: none; } &:only-child { border-radius: 1px; diff --git a/Zukitre/gtk-3.0/_other.scss b/Zukitre/gtk-3.0/_other.scss index 3c33dcf..21049cb 100644 --- a/Zukitre/gtk-3.0/_other.scss +++ b/Zukitre/gtk-3.0/_other.scss @@ -179,3 +179,8 @@ menu, .nemo-window .sidebar treeview .cell:selected { @extend %selected_items; } + +// EoG fix - https://github.com/lassekongo83/zuki-themes/issues/113 +button:last-child { + &.osd.image-button { border-right-style: none; } +} diff --git a/Zukitre/gtk-3.0/gtk-contained-dark.css b/Zukitre/gtk-3.0/gtk-contained-dark.css index 68a56ee..997c32c 100644 --- a/Zukitre/gtk-3.0/gtk-contained-dark.css +++ b/Zukitre/gtk-3.0/gtk-contained-dark.css @@ -940,8 +940,7 @@ button:checked, .linked > button:backdrop, .linked > combobox > box > button.combo:dir(ltr), .linked > combobox > box > button.combo:dir(rtl) { border-radius: 0; border-right-style: none; - border-right-width: 0; - border-left-width: 0; + border-left-style: none; box-shadow: 0px 0 rgba(0, 0, 0, 0.08), 0 1px rgba(0, 0, 0, 0.08), 0px 0 rgba(0, 0, 0, 0.08), 0 -1px rgba(0, 0, 0, 0.08), inset 0px 0 rgba(255, 255, 255, 0.06), inset 0 1px rgba(255, 255, 255, 0.06), inset 0px 0 rgba(255, 255, 255, 0.06), inset 0 -1px rgba(255, 255, 255, 0.06); } toolbar.inline-toolbar toolbutton > button.flat:active, .linked:not(.vertical) > spinbutton:active:not(.vertical), .linked:not(.vertical) > entry:active, .inline-toolbar @@ -980,8 +979,8 @@ button:first-child, .linked > button:first-child, toolbar.inline-toolbar toolbutton:first-child > button.flat, combobox.linked button:nth-child(2):dir(rtl), .linked:not(.vertical) > combobox:first-child > box > button.combo { border-top-left-radius: 1px; border-bottom-left-radius: 1px; - border-left-width: 1px; - border-right-width: 0; + border-left-style: solid; + border-right-style: none; box-shadow: 0px 0 rgba(0, 0, 0, 0.08), 0 1px rgba(0, 0, 0, 0.08), -1px 0 rgba(0, 0, 0, 0.08), 0 -1px rgba(0, 0, 0, 0.08), inset 1px 0 rgba(255, 255, 255, 0.06), inset 0 1px rgba(255, 255, 255, 0.06), inset 0px 0 rgba(255, 255, 255, 0.06), inset 0 -1px rgba(255, 255, 255, 0.06); } .linked:not(.vertical) > spinbutton:first-child:active:not(.vertical), .linked:not(.vertical) > entry:first-child:active, .inline-toolbar @@ -1019,9 +1018,8 @@ button:last-child, .linked > button:last-child, toolbar.inline-toolbar toolbutton:last-child > button.flat, combobox.linked button:nth-child(2):dir(ltr), .linked:not(.vertical) > combobox:last-child > box > button.combo { border-top-right-radius: 1px; border-bottom-right-radius: 1px; + border-left-style: none; border-right-style: solid; - border-left-width: 0; - border-right-width: 1px; box-shadow: 1px 0 rgba(0, 0, 0, 0.08), 0 1px rgba(0, 0, 0, 0.08), 0px 0 rgba(0, 0, 0, 0.08), 0 -1px rgba(0, 0, 0, 0.08), inset 0px 0 rgba(255, 255, 255, 0.06), inset 0 1px rgba(255, 255, 255, 0.06), inset -1px 0 rgba(255, 255, 255, 0.06), inset 0 -1px rgba(255, 255, 255, 0.06); } .linked:not(.vertical) > spinbutton:last-child:active:not(.vertical), .linked:not(.vertical) > entry:last-child:active, .inline-toolbar @@ -1100,19 +1098,21 @@ button:checked, .linked.vertical > button:backdrop, .linked.vertical > combobox > box > button.combo { border-style: solid solid none solid; border-radius: 0; - box-shadow: 1px 0 rgba(0, 0, 0, 0.08), 0 0px rgba(0, 0, 0, 0.08), 1px 0 rgba(0, 0, 0, 0.08), 0 0px rgba(0, 0, 0, 0.08), inset 1px 0 rgba(255, 255, 255, 0.06), inset 0 0px rgba(255, 255, 255, 0.06), inset -1px 0 rgba(255, 255, 255, 0.06), inset 0 0px rgba(255, 255, 255, 0.06); } + box-shadow: none; } .linked.vertical > spinbutton:first-child:not(.vertical), .linked.vertical > entry:first-child, .linked.vertical > button:first-child, .linked.vertical > combobox:first-child > box > button.combo { border-top-left-radius: 1px; - border-top-right-radius: 1px; } + border-top-right-radius: 1px; + box-shadow: none; } .linked.vertical > spinbutton:last-child:not(.vertical), .linked.vertical > entry:last-child, .linked.vertical > button:last-child, .linked.vertical > combobox:last-child > box > button.combo { border-bottom-left-radius: 1px; border-bottom-right-radius: 1px; - border-style: solid; } + border-bottom-style: solid; + box-shadow: none; } .linked.vertical > spinbutton:only-child:not(.vertical), .linked.vertical > entry:only-child, .linked.vertical > button:only-child, .linked.vertical > combobox:only-child > box > button.combo { @@ -4063,6 +4063,9 @@ menu .separator:not(label), .csd menu .separator:not(label), .nautilus-window notebook > stack:not(:only-child) .nemo-window .sidebar searchbar, .nemo-window .sidebar notebook { background-color: #3e5059; } +button:last-child.osd.image-button { + border-right-style: none; } + /* Lightdm styling */ #panel_window { background-color: #273238; diff --git a/Zukitre/gtk-3.0/gtk-contained.css b/Zukitre/gtk-3.0/gtk-contained.css index 8c4f72c..97a7106 100644 --- a/Zukitre/gtk-3.0/gtk-contained.css +++ b/Zukitre/gtk-3.0/gtk-contained.css @@ -943,8 +943,7 @@ button:checked, .linked > button:backdrop, .linked > combobox > box > button.combo:dir(ltr), .linked > combobox > box > button.combo:dir(rtl) { border-radius: 0; border-right-style: none; - border-right-width: 0; - border-left-width: 0; + border-left-style: none; box-shadow: 0px 0 rgba(0, 0, 0, 0.08), 0 1px rgba(0, 0, 0, 0.08), 0px 0 rgba(0, 0, 0, 0.08), 0 -1px rgba(0, 0, 0, 0.08), inset 0px 0 rgba(255, 255, 255, 0.4), inset 0 1px rgba(255, 255, 255, 0.4), inset 0px 0 rgba(255, 255, 255, 0.4), inset 0 -1px rgba(255, 255, 255, 0.4); } toolbar.inline-toolbar toolbutton > button.flat:active, .linked:not(.vertical) > spinbutton:active:not(.vertical), .linked:not(.vertical) > entry:active, .inline-toolbar @@ -983,8 +982,8 @@ button:first-child, .linked > button:first-child, toolbar.inline-toolbar toolbutton:first-child > button.flat, combobox.linked button:nth-child(2):dir(rtl), .linked:not(.vertical) > combobox:first-child > box > button.combo { border-top-left-radius: 1px; border-bottom-left-radius: 1px; - border-left-width: 1px; - border-right-width: 0; + border-left-style: solid; + border-right-style: none; box-shadow: 0px 0 rgba(0, 0, 0, 0.08), 0 1px rgba(0, 0, 0, 0.08), -1px 0 rgba(0, 0, 0, 0.08), 0 -1px rgba(0, 0, 0, 0.08), inset 1px 0 rgba(255, 255, 255, 0.4), inset 0 1px rgba(255, 255, 255, 0.4), inset 0px 0 rgba(255, 255, 255, 0.4), inset 0 -1px rgba(255, 255, 255, 0.4); } .linked:not(.vertical) > spinbutton:first-child:active:not(.vertical), .linked:not(.vertical) > entry:first-child:active, .inline-toolbar @@ -1022,9 +1021,8 @@ button:last-child, .linked > button:last-child, toolbar.inline-toolbar toolbutton:last-child > button.flat, combobox.linked button:nth-child(2):dir(ltr), .linked:not(.vertical) > combobox:last-child > box > button.combo { border-top-right-radius: 1px; border-bottom-right-radius: 1px; + border-left-style: none; border-right-style: solid; - border-left-width: 0; - border-right-width: 1px; box-shadow: 1px 0 rgba(0, 0, 0, 0.08), 0 1px rgba(0, 0, 0, 0.08), 0px 0 rgba(0, 0, 0, 0.08), 0 -1px rgba(0, 0, 0, 0.08), inset 0px 0 rgba(255, 255, 255, 0.4), inset 0 1px rgba(255, 255, 255, 0.4), inset -1px 0 rgba(255, 255, 255, 0.4), inset 0 -1px rgba(255, 255, 255, 0.4); } .linked:not(.vertical) > spinbutton:last-child:active:not(.vertical), .linked:not(.vertical) > entry:last-child:active, .inline-toolbar @@ -1103,19 +1101,21 @@ button:checked, .linked.vertical > button:backdrop, .linked.vertical > combobox > box > button.combo { border-style: solid solid none solid; border-radius: 0; - box-shadow: 1px 0 rgba(0, 0, 0, 0.08), 0 0px rgba(0, 0, 0, 0.08), 1px 0 rgba(0, 0, 0, 0.08), 0 0px rgba(0, 0, 0, 0.08), inset 1px 0 rgba(255, 255, 255, 0.4), inset 0 0px rgba(255, 255, 255, 0.4), inset -1px 0 rgba(255, 255, 255, 0.4), inset 0 0px rgba(255, 255, 255, 0.4); } + box-shadow: none; } .linked.vertical > spinbutton:first-child:not(.vertical), .linked.vertical > entry:first-child, .linked.vertical > button:first-child, .linked.vertical > combobox:first-child > box > button.combo { border-top-left-radius: 1px; - border-top-right-radius: 1px; } + border-top-right-radius: 1px; + box-shadow: none; } .linked.vertical > spinbutton:last-child:not(.vertical), .linked.vertical > entry:last-child, .linked.vertical > button:last-child, .linked.vertical > combobox:last-child > box > button.combo { border-bottom-left-radius: 1px; border-bottom-right-radius: 1px; - border-style: solid; } + border-bottom-style: solid; + box-shadow: none; } .linked.vertical > spinbutton:only-child:not(.vertical), .linked.vertical > entry:only-child, .linked.vertical > button:only-child, .linked.vertical > combobox:only-child > box > button.combo { @@ -4188,6 +4188,9 @@ menu .separator:not(label), .csd menu .separator:not(label), .nautilus-window notebook > stack:not(:only-child) .nemo-window .sidebar searchbar, .nemo-window .sidebar notebook { background-color: #e7e7e7; } +button:last-child.osd.image-button { + border-right-style: none; } + /* Lightdm styling */ #panel_window { background-color: #273238; diff --git a/Zukitwo/gtk-3.0/_common.scss b/Zukitwo/gtk-3.0/_common.scss index adcc6cb..53e8bf1 100644 --- a/Zukitwo/gtk-3.0/_common.scss +++ b/Zukitwo/gtk-3.0/_common.scss @@ -763,43 +763,33 @@ $btn-shadow-middle: 0 1px $shadow-color, 0px 0 $shadow-color, 0 -1px $shadow-color, - inset 0px 0 $inset-color, - inset 0 1px $inset-color, - inset 0px 0 $inset-color, + inset 0px 0 $inset-color, + inset 0 1px $inset-color, + inset 0px 0 $inset-color, inset 0 -1px $inset-color; -$btn-shadow-middle-vert: - 1px 0 $shadow-color, - 0 0px $shadow-color, - 1px 0 $shadow-color, - 0 0px $shadow-color, - inset 1px 0 $inset-color, - inset 0 0px $inset-color, - inset -1px 0 $inset-color, - inset 0 0px $inset-color; -$btn-shadow-left: +$btn-shadow-left: 0px 0 $shadow-color, 0 1px $shadow-color, -1px 0 $shadow-color, 0 -1px $shadow-color, - inset 1px 0 $inset-color, - inset 0 1px $inset-color, - inset 0px 0 $inset-color, + inset 1px 0 $inset-color, + inset 0 1px $inset-color, + inset 0px 0 $inset-color, inset 0 -1px $inset-color; -$btn-shadow-right: +$btn-shadow-right: 1px 0 $shadow-color, 0 1px $shadow-color, 0px 0 $shadow-color, 0 -1px $shadow-color, - inset 0px 0 $inset-color, - inset 0 1px $inset-color, - inset -1px 0 $inset-color, + inset 0px 0 $inset-color, + inset 0 1px $inset-color, + inset -1px 0 $inset-color, inset 0 -1px $inset-color; %linked_middle { border-radius: 0; border-right-style: none; - border-right-width: 0; - border-left-width: 0; + border-left-style: none; box-shadow: $btn-shadow-middle; // FIXME: Figure out how this looks on colored titlebars. &:active { @include button(active); } @@ -813,8 +803,8 @@ $btn-shadow-right: &:first-child { border-top-left-radius: 3px; border-bottom-left-radius: 3px; - border-left-width: 1px; - border-right-width: 0; + border-left-style: solid; + border-right-style: none; box-shadow: $btn-shadow-left; &:active { @include button(active); } &:checked { @include button(active); } @@ -824,9 +814,8 @@ $btn-shadow-right: &:last-child { border-top-right-radius: 3px; border-bottom-right-radius: 3px; + border-left-style: none; border-right-style: solid; - border-left-width: 0; - border-right-width: 1px; box-shadow: $btn-shadow-right; &:active { @include button(active); } &:checked { @include button(active); } @@ -847,19 +836,21 @@ $btn-shadow-right: %linked_vertical_middle { border-style: solid solid none solid; border-radius: 0; - box-shadow: $btn-shadow-middle-vert; + box-shadow: none; } -%linked_vertical{ +%linked_vertical { @extend %linked_vertical_middle; &:first-child { border-top-left-radius: 3px; border-top-right-radius: 3px; + box-shadow: none; } &:last-child { border-bottom-left-radius: 3px; border-bottom-right-radius: 3px; - border-style: solid; + border-bottom-style: solid; + box-shadow: none; } &:only-child { border-radius: 3px; diff --git a/Zukitwo/gtk-3.0/_other.scss b/Zukitwo/gtk-3.0/_other.scss index ee80451..757411e 100644 --- a/Zukitwo/gtk-3.0/_other.scss +++ b/Zukitwo/gtk-3.0/_other.scss @@ -192,3 +192,8 @@ menu, .nemo-window .sidebar treeview .cell:selected { @extend %selected_items; } + +// EoG fix - https://github.com/lassekongo83/zuki-themes/issues/113 +button:last-child { + &.osd.image-button { border-right-style: none; } +} diff --git a/Zukitwo/gtk-3.0/gtk-contained-dark.css b/Zukitwo/gtk-3.0/gtk-contained-dark.css index 8c6b378..7ad4231 100644 --- a/Zukitwo/gtk-3.0/gtk-contained-dark.css +++ b/Zukitwo/gtk-3.0/gtk-contained-dark.css @@ -941,8 +941,7 @@ button:checked, .linked > button:backdrop, .linked > combobox > box > button.combo:dir(ltr), .linked > combobox > box > button.combo:dir(rtl) { border-radius: 0; border-right-style: none; - border-right-width: 0; - border-left-width: 0; + border-left-style: none; box-shadow: 0px 0 rgba(0, 0, 0, 0.08), 0 1px rgba(0, 0, 0, 0.08), 0px 0 rgba(0, 0, 0, 0.08), 0 -1px rgba(0, 0, 0, 0.08), inset 0px 0 rgba(255, 255, 255, 0.06), inset 0 1px rgba(255, 255, 255, 0.06), inset 0px 0 rgba(255, 255, 255, 0.06), inset 0 -1px rgba(255, 255, 255, 0.06); } toolbar.inline-toolbar toolbutton > button.flat:active, .linked:not(.vertical) > spinbutton:active:not(.vertical), .linked:not(.vertical) > entry:active, .inline-toolbar @@ -981,8 +980,8 @@ button:first-child, .linked > button:first-child, toolbar.inline-toolbar toolbutton:first-child > button.flat, combobox.linked button:nth-child(2):dir(rtl), .linked:not(.vertical) > combobox:first-child > box > button.combo { border-top-left-radius: 3px; border-bottom-left-radius: 3px; - border-left-width: 1px; - border-right-width: 0; + border-left-style: solid; + border-right-style: none; box-shadow: 0px 0 rgba(0, 0, 0, 0.08), 0 1px rgba(0, 0, 0, 0.08), -1px 0 rgba(0, 0, 0, 0.08), 0 -1px rgba(0, 0, 0, 0.08), inset 1px 0 rgba(255, 255, 255, 0.06), inset 0 1px rgba(255, 255, 255, 0.06), inset 0px 0 rgba(255, 255, 255, 0.06), inset 0 -1px rgba(255, 255, 255, 0.06); } .linked:not(.vertical) > spinbutton:first-child:active:not(.vertical), .linked:not(.vertical) > entry:first-child:active, .inline-toolbar @@ -1020,9 +1019,8 @@ button:last-child, .linked > button:last-child, toolbar.inline-toolbar toolbutton:last-child > button.flat, combobox.linked button:nth-child(2):dir(ltr), .linked:not(.vertical) > combobox:last-child > box > button.combo { border-top-right-radius: 3px; border-bottom-right-radius: 3px; + border-left-style: none; border-right-style: solid; - border-left-width: 0; - border-right-width: 1px; box-shadow: 1px 0 rgba(0, 0, 0, 0.08), 0 1px rgba(0, 0, 0, 0.08), 0px 0 rgba(0, 0, 0, 0.08), 0 -1px rgba(0, 0, 0, 0.08), inset 0px 0 rgba(255, 255, 255, 0.06), inset 0 1px rgba(255, 255, 255, 0.06), inset -1px 0 rgba(255, 255, 255, 0.06), inset 0 -1px rgba(255, 255, 255, 0.06); } .linked:not(.vertical) > spinbutton:last-child:active:not(.vertical), .linked:not(.vertical) > entry:last-child:active, .inline-toolbar @@ -1101,19 +1099,21 @@ button:checked, .linked.vertical > button:backdrop, .linked.vertical > combobox > box > button.combo { border-style: solid solid none solid; border-radius: 0; - box-shadow: 1px 0 rgba(0, 0, 0, 0.08), 0 0px rgba(0, 0, 0, 0.08), 1px 0 rgba(0, 0, 0, 0.08), 0 0px rgba(0, 0, 0, 0.08), inset 1px 0 rgba(255, 255, 255, 0.06), inset 0 0px rgba(255, 255, 255, 0.06), inset -1px 0 rgba(255, 255, 255, 0.06), inset 0 0px rgba(255, 255, 255, 0.06); } + box-shadow: none; } .linked.vertical > spinbutton:first-child:not(.vertical), .linked.vertical > entry:first-child, .linked.vertical > button:first-child, .linked.vertical > combobox:first-child > box > button.combo { border-top-left-radius: 3px; - border-top-right-radius: 3px; } + border-top-right-radius: 3px; + box-shadow: none; } .linked.vertical > spinbutton:last-child:not(.vertical), .linked.vertical > entry:last-child, .linked.vertical > button:last-child, .linked.vertical > combobox:last-child > box > button.combo { border-bottom-left-radius: 3px; border-bottom-right-radius: 3px; - border-style: solid; } + border-bottom-style: solid; + box-shadow: none; } .linked.vertical > spinbutton:only-child:not(.vertical), .linked.vertical > entry:only-child, .linked.vertical > button:only-child, .linked.vertical > combobox:only-child > box > button.combo { @@ -4093,3 +4093,6 @@ menu .separator:not(label), .csd menu .separator:not(label), .nemo-window .sidebar .nautilus-window notebook > stack:not(:only-child) searchbar, .nautilus-window notebook > stack:not(:only-child) .nemo-window .sidebar searchbar, .nemo-window .sidebar notebook { background-color: #374049; } + +button:last-child.osd.image-button { + border-right-style: none; } diff --git a/Zukitwo/gtk-3.0/gtk-contained.css b/Zukitwo/gtk-3.0/gtk-contained.css index a15e958..e0ba03f 100644 --- a/Zukitwo/gtk-3.0/gtk-contained.css +++ b/Zukitwo/gtk-3.0/gtk-contained.css @@ -944,8 +944,7 @@ button:checked, .linked > button:backdrop, .linked > combobox > box > button.combo:dir(ltr), .linked > combobox > box > button.combo:dir(rtl) { border-radius: 0; border-right-style: none; - border-right-width: 0; - border-left-width: 0; + border-left-style: none; box-shadow: 0px 0 rgba(0, 0, 0, 0.08), 0 1px rgba(0, 0, 0, 0.08), 0px 0 rgba(0, 0, 0, 0.08), 0 -1px rgba(0, 0, 0, 0.08), inset 0px 0 rgba(255, 255, 255, 0.4), inset 0 1px rgba(255, 255, 255, 0.4), inset 0px 0 rgba(255, 255, 255, 0.4), inset 0 -1px rgba(255, 255, 255, 0.4); } toolbar.inline-toolbar toolbutton > button.flat:active, .linked:not(.vertical) > spinbutton:active:not(.vertical), .linked:not(.vertical) > entry:active, .inline-toolbar @@ -984,8 +983,8 @@ button:first-child, .linked > button:first-child, toolbar.inline-toolbar toolbutton:first-child > button.flat, combobox.linked button:nth-child(2):dir(rtl), .linked:not(.vertical) > combobox:first-child > box > button.combo { border-top-left-radius: 3px; border-bottom-left-radius: 3px; - border-left-width: 1px; - border-right-width: 0; + border-left-style: solid; + border-right-style: none; box-shadow: 0px 0 rgba(0, 0, 0, 0.08), 0 1px rgba(0, 0, 0, 0.08), -1px 0 rgba(0, 0, 0, 0.08), 0 -1px rgba(0, 0, 0, 0.08), inset 1px 0 rgba(255, 255, 255, 0.4), inset 0 1px rgba(255, 255, 255, 0.4), inset 0px 0 rgba(255, 255, 255, 0.4), inset 0 -1px rgba(255, 255, 255, 0.4); } .linked:not(.vertical) > spinbutton:first-child:active:not(.vertical), .linked:not(.vertical) > entry:first-child:active, .inline-toolbar @@ -1023,9 +1022,8 @@ button:last-child, .linked > button:last-child, toolbar.inline-toolbar toolbutton:last-child > button.flat, combobox.linked button:nth-child(2):dir(ltr), .linked:not(.vertical) > combobox:last-child > box > button.combo { border-top-right-radius: 3px; border-bottom-right-radius: 3px; + border-left-style: none; border-right-style: solid; - border-left-width: 0; - border-right-width: 1px; box-shadow: 1px 0 rgba(0, 0, 0, 0.08), 0 1px rgba(0, 0, 0, 0.08), 0px 0 rgba(0, 0, 0, 0.08), 0 -1px rgba(0, 0, 0, 0.08), inset 0px 0 rgba(255, 255, 255, 0.4), inset 0 1px rgba(255, 255, 255, 0.4), inset -1px 0 rgba(255, 255, 255, 0.4), inset 0 -1px rgba(255, 255, 255, 0.4); } .linked:not(.vertical) > spinbutton:last-child:active:not(.vertical), .linked:not(.vertical) > entry:last-child:active, .inline-toolbar @@ -1104,19 +1102,21 @@ button:checked, .linked.vertical > button:backdrop, .linked.vertical > combobox > box > button.combo { border-style: solid solid none solid; border-radius: 0; - box-shadow: 1px 0 rgba(0, 0, 0, 0.08), 0 0px rgba(0, 0, 0, 0.08), 1px 0 rgba(0, 0, 0, 0.08), 0 0px rgba(0, 0, 0, 0.08), inset 1px 0 rgba(255, 255, 255, 0.4), inset 0 0px rgba(255, 255, 255, 0.4), inset -1px 0 rgba(255, 255, 255, 0.4), inset 0 0px rgba(255, 255, 255, 0.4); } + box-shadow: none; } .linked.vertical > spinbutton:first-child:not(.vertical), .linked.vertical > entry:first-child, .linked.vertical > button:first-child, .linked.vertical > combobox:first-child > box > button.combo { border-top-left-radius: 3px; - border-top-right-radius: 3px; } + border-top-right-radius: 3px; + box-shadow: none; } .linked.vertical > spinbutton:last-child:not(.vertical), .linked.vertical > entry:last-child, .linked.vertical > button:last-child, .linked.vertical > combobox:last-child > box > button.combo { border-bottom-left-radius: 3px; border-bottom-right-radius: 3px; - border-style: solid; } + border-bottom-style: solid; + box-shadow: none; } .linked.vertical > spinbutton:only-child:not(.vertical), .linked.vertical > entry:only-child, .linked.vertical > button:only-child, .linked.vertical > combobox:only-child > box > button.combo { @@ -4218,3 +4218,6 @@ menu .separator:not(label), .csd menu .separator:not(label), .nemo-window .sidebar .nautilus-window notebook > stack:not(:only-child) searchbar, .nautilus-window notebook > stack:not(:only-child) .nemo-window .sidebar searchbar, .nemo-window .sidebar notebook { background-color: #e7e7e7; } + +button:last-child.osd.image-button { + border-right-style: none; }