Commit e0befe02 authored by Daniel Boles's avatar Daniel Boles

Merge branch 'searchbar-double-border-fix' into 'gtk-3-22'

Fix the double border in windows with a search bar.

See merge request GNOME/gtk!50
parents 3e68abdd 4e2f59ad
......@@ -1404,7 +1404,7 @@ toolbar {
border-radius: 0 0 5px 5px;
}
searchbar,
searchbar > revealer > box,
.location-bar {
@extend %toolbar;
......@@ -1414,6 +1414,12 @@ searchbar,
padding: 3px;
}
searchbar > revealer > box {
// workaround: undo the GtkContainer::border-width and use CSS padding instead
margin: -6px;
padding: 6px;
}
%darkbar {
border-style: solid;
border-color: $borders_color;
......
......@@ -553,7 +553,7 @@ combobox arrow { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); min-heig
combobox:drop(active) { box-shadow: none; }
/************ Toolbars * */
toolbar, .inline-toolbar, searchbar, .location-bar { -GtkWidget-window-dragging: true; padding: 4px; background-color: #33393b; }
toolbar, .inline-toolbar, searchbar > revealer > box, .location-bar { -GtkWidget-window-dragging: true; padding: 4px; background-color: #33393b; }
toolbar { padding: 4px 3px 3px 4px; }
......@@ -571,11 +571,13 @@ toolbar:not(.inline-toolbar):not(.osd) switch, toolbar:not(.inline-toolbar):not(
.inline-toolbar { padding: 3px; border-width: 0 1px 1px; border-radius: 0 0 5px 5px; }
searchbar, .location-bar { border-width: 0 0 1px; padding: 3px; }
searchbar > revealer > box, .location-bar { border-width: 0 0 1px; padding: 3px; }
.inline-toolbar, searchbar, .location-bar { border-style: solid; border-color: #1b1f20; background-color: #2c3133; }
searchbar > revealer > box { margin: -6px; padding: 6px; }
.inline-toolbar:backdrop, searchbar:backdrop, .location-bar:backdrop { border-color: #202425; background-color: #2c3233; box-shadow: none; transition: 200ms ease-out; }
.inline-toolbar, searchbar > revealer > box, .location-bar { border-style: solid; border-color: #1b1f20; background-color: #2c3133; }
.inline-toolbar:backdrop, searchbar > revealer > box:backdrop, .location-bar:backdrop { border-color: #202425; background-color: #2c3233; box-shadow: none; transition: 200ms ease-out; }
/*************** Header bars * */
.titlebar:not(headerbar), headerbar { padding: 0 6px; min-height: 46px; border-width: 0 0 1px; border-style: solid; border-color: #0b0c0c; border-radius: 0; background: #2c3133 linear-gradient(to top, #25292b, #2a2e30 2px, #2c3133 3px); box-shadow: inset 0 1px rgba(238, 238, 236, 0.07); }
......
......@@ -561,7 +561,7 @@ combobox arrow { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); min-heig
combobox:drop(active) { box-shadow: none; }
/************ Toolbars * */
toolbar, .inline-toolbar, searchbar, .location-bar { -GtkWidget-window-dragging: true; padding: 4px; background-color: #e8e8e7; }
toolbar, .inline-toolbar, searchbar > revealer > box, .location-bar { -GtkWidget-window-dragging: true; padding: 4px; background-color: #e8e8e7; }
toolbar { padding: 4px 3px 3px 4px; }
......@@ -579,11 +579,13 @@ toolbar:not(.inline-toolbar):not(.osd) switch, toolbar:not(.inline-toolbar):not(
.inline-toolbar { padding: 3px; border-width: 0 1px 1px; border-radius: 0 0 5px 5px; }
searchbar, .location-bar { border-width: 0 0 1px; padding: 3px; }
searchbar > revealer > box, .location-bar { border-width: 0 0 1px; padding: 3px; }
.inline-toolbar, searchbar, .location-bar { border-style: solid; border-color: #b6b6b3; background-color: #d9d9d7; }
searchbar > revealer > box { margin: -6px; padding: 6px; }
.inline-toolbar:backdrop, searchbar:backdrop, .location-bar:backdrop { border-color: #c0c0bd; background-color: #dadad8; box-shadow: none; transition: 200ms ease-out; }
.inline-toolbar, searchbar > revealer > box, .location-bar { border-style: solid; border-color: #b6b6b3; background-color: #d9d9d7; }
.inline-toolbar:backdrop, searchbar > revealer > box:backdrop, .location-bar:backdrop { border-color: #c0c0bd; background-color: #dadad8; box-shadow: none; transition: 200ms ease-out; }
/*************** Header bars * */
.titlebar:not(headerbar), headerbar { padding: 0 6px; min-height: 46px; border-width: 0 0 1px; border-style: solid; border-color: #91918c; border-radius: 0; background: #f4f4f4 linear-gradient(to top, #d4d4d2, #efefef 2px, #f4f4f4 3px); box-shadow: inset 0 1px rgba(255, 255, 255, 0.8); }
......
......@@ -1172,12 +1172,15 @@ toolbar { //FIXME: why is all this being ignored?
}
}
searchbar {
searchbar > revealer > box {
@extend toolbar;
border-width: 0 0 1px;
border-color: $borders_color;
border-style: none none solid none;
padding: 3px;
// workaround: undo the GtkContainer::border-width and use CSS padding instead
margin: -6px;
padding: 9px;
}
%inset-bar {
......
......@@ -332,13 +332,13 @@ button.destructive-action:disabled:active, button.destructive-action:disabled:ch
.inline-toolbar toolbutton > button:backdrop:disabled:active, .inline-toolbar toolbutton > button:backdrop:disabled:checked { border-width: 2px; border-style: solid; color: gray; border-color: #494949; background-image: none; background-color: #090909; }
toolbar.inline-toolbar toolbutton > button.flat, searchbar.inline-toolbar toolbutton > button.flat, toolbar.inline-toolbar toolbutton:backdrop > button.flat, searchbar.inline-toolbar toolbutton:backdrop > button.flat, .linked:not(.vertical) > spinbutton:not(.vertical), .linked:not(.vertical) > entry, .inline-toolbar button, .inline-toolbar button:backdrop, .linked > button, .linked > button:hover, .linked > button:active, .linked > 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; }
toolbar.inline-toolbar toolbutton > button.flat, searchbar > revealer > .inline-toolbar toolbutton > button.flat, toolbar.inline-toolbar toolbutton:backdrop > button.flat, searchbar > revealer > .inline-toolbar toolbutton:backdrop > button.flat, .linked:not(.vertical) > spinbutton:not(.vertical), .linked:not(.vertical) > entry, .inline-toolbar button, .inline-toolbar button:backdrop, .linked > button, .linked > button:hover, .linked > button:active, .linked > 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; }
.linked:not(.vertical) > spinbutton:first-child:not(.vertical), .linked:not(.vertical) > entry:first-child, .inline-toolbar button:first-child, .linked > button:first-child, toolbar.inline-toolbar toolbutton:first-child > button.flat, searchbar.inline-toolbar toolbutton:first-child > button.flat, toolbar.inline-toolbar toolbutton:backdrop:first-child > button.flat, searchbar.inline-toolbar toolbutton:backdrop: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; }
.linked:not(.vertical) > spinbutton:first-child:not(.vertical), .linked:not(.vertical) > entry:first-child, .inline-toolbar button:first-child, .linked > button:first-child, toolbar.inline-toolbar toolbutton:first-child > button.flat, searchbar > revealer > .inline-toolbar toolbutton:first-child > button.flat, toolbar.inline-toolbar toolbutton:backdrop:first-child > button.flat, searchbar > revealer > .inline-toolbar toolbutton:backdrop: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; }
.linked:not(.vertical) > spinbutton:last-child:not(.vertical), .linked:not(.vertical) > entry:last-child, .inline-toolbar button:last-child, .linked > button:last-child, toolbar.inline-toolbar toolbutton:last-child > button.flat, searchbar.inline-toolbar toolbutton:last-child > button.flat, toolbar.inline-toolbar toolbutton:backdrop:last-child > button.flat, searchbar.inline-toolbar toolbutton:backdrop: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-right-style: solid; }
.linked:not(.vertical) > spinbutton:last-child:not(.vertical), .linked:not(.vertical) > entry:last-child, .inline-toolbar button:last-child, .linked > button:last-child, toolbar.inline-toolbar toolbutton:last-child > button.flat, searchbar > revealer > .inline-toolbar toolbutton:last-child > button.flat, toolbar.inline-toolbar toolbutton:backdrop:last-child > button.flat, searchbar > revealer > .inline-toolbar toolbutton:backdrop: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-right-style: solid; }
.linked:not(.vertical) > spinbutton:only-child:not(.vertical), .linked:not(.vertical) > entry:only-child, .inline-toolbar button:only-child, .linked > button:only-child, toolbar.inline-toolbar toolbutton:only-child > button.flat, searchbar.inline-toolbar toolbutton:only-child > button.flat, toolbar.inline-toolbar toolbutton:backdrop:only-child > button.flat, searchbar.inline-toolbar toolbutton:backdrop:only-child > button.flat, .linked:not(.vertical) > combobox:only-child > box > button.combo { border-radius: 3px; border-style: solid; }
.linked:not(.vertical) > spinbutton:only-child:not(.vertical), .linked:not(.vertical) > entry:only-child, .inline-toolbar button:only-child, .linked > button:only-child, toolbar.inline-toolbar toolbutton:only-child > button.flat, searchbar > revealer > .inline-toolbar toolbutton:only-child > button.flat, toolbar.inline-toolbar toolbutton:backdrop:only-child > button.flat, searchbar > revealer > .inline-toolbar toolbutton:backdrop:only-child > button.flat, .linked:not(.vertical) > combobox:only-child > box > button.combo { border-radius: 3px; border-style: solid; }
.linked.vertical > spinbutton:not(.vertical), .linked.vertical > entry, .linked.vertical > button, .linked.vertical > button:hover, .linked.vertical > button:active, .linked.vertical > button:checked, .linked.vertical > button:backdrop, .linked.vertical > combobox > box > button.combo { border-style: solid solid none solid; border-radius: 0; }
......@@ -463,23 +463,23 @@ combobox arrow { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); min-heig
combobox:drop(active) { box-shadow: none; }
/************ Toolbars * */
toolbar, searchbar { padding: 6px; background-color: #000; }
toolbar, searchbar > revealer > * { padding: 6px; background-color: #000; }
toolbar.osd, searchbar.osd { background-color: rgba(0, 0, 0, 0.8); border-radius: 6px; padding: 12px; }
toolbar.osd, searchbar > revealer > .osd { background-color: rgba(0, 0, 0, 0.8); border-radius: 6px; padding: 12px; }
toolbar.osd label, searchbar.osd label { color: #fff; }
toolbar.osd label, searchbar > revealer > .osd label { color: #fff; }
toolbar.inline-toolbar, searchbar.inline-toolbar { border-width: 0 1px 1px; padding: 3px; border-radius: 0 0 4px 4px; }
toolbar.inline-toolbar, searchbar > revealer > .inline-toolbar { border-width: 0 1px 1px; padding: 3px; border-radius: 0 0 4px 4px; }
toolbar.vertical, searchbar.vertical { border-right: 1px solid gray; }
toolbar.vertical, searchbar > revealer > .vertical { border-right: 1px solid gray; }
toolbar.vertical:dir(rtl), searchbar.vertical:dir(rtl) { border-right: none; border-left: 1px solid gray; }
toolbar.vertical:dir(rtl), searchbar > revealer > .vertical:dir(rtl) { border-right: none; border-left: 1px solid gray; }
searchbar { border-width: 0 0 1px; border-color: gray; border-style: none none solid none; padding: 3px; }
searchbar > revealer > * { border-width: 0 0 1px; border-color: gray; border-style: none none solid none; margin: -6px; padding: 9px; }
toolbar.inline-toolbar, searchbar.inline-toolbar { border-style: solid; border-color: gray; background-color: #262626; box-shadow: inset 0 2px 3px -1px #5c5c5c; }
toolbar.inline-toolbar, searchbar > revealer > .inline-toolbar { border-style: solid; border-color: gray; background-color: #262626; box-shadow: inset 0 2px 3px -1px #5c5c5c; }
toolbar.inline-toolbar:backdrop, searchbar.inline-toolbar:backdrop { border-color: #737373; background-color: #282828; box-shadow: none; }
toolbar.inline-toolbar:backdrop, searchbar > revealer > .inline-toolbar:backdrop { border-color: #737373; background-color: #282828; box-shadow: none; }
/*************** Header bars * */
.titlebar:not(headerbar), headerbar { min-height: 46px; border-width: 0 0 1px; border-style: solid; border-color: gray; border-radius: 7px 7px 0 0; background-color: transparent; background-image: linear-gradient(to bottom, #0a0a0a, #000); box-shadow: inset 0 -1px #262626, inset 0 1px #000; padding: 6px; }
......@@ -654,7 +654,7 @@ popover.background, .csd popover.background { border: 1px solid gray; }
popover.background:backdrop { background-color: #000; box-shadow: none; }
popover.background > list, popover.background > .view, textview popover.background > text, popover.background > iconview, popover.background > toolbar, popover.background > searchbar { border-style: none; background-color: transparent; }
popover.background > list, popover.background > .view, textview popover.background > text, popover.background > iconview, popover.background > toolbar { border-style: none; background-color: transparent; }
popover.background.touch-selection, popover.background.magnifier, .csd popover.background.touch-selection, .csd popover.background.magnifier { border: 1px solid rgba(255, 255, 255, 0.1); }
......
......@@ -334,13 +334,13 @@ button.destructive-action:disabled:active, button.destructive-action:disabled:ch
.inline-toolbar toolbutton > button:backdrop:disabled:active, .inline-toolbar toolbutton > button:backdrop:disabled:checked { border-width: 2px; border-style: solid; color: gray; border-color: silver; background-image: none; background-color: #f6f6f6; }
toolbar.inline-toolbar toolbutton > button.flat, searchbar.inline-toolbar toolbutton > button.flat, toolbar.inline-toolbar toolbutton:backdrop > button.flat, searchbar.inline-toolbar toolbutton:backdrop > button.flat, .linked:not(.vertical) > spinbutton:not(.vertical), .linked:not(.vertical) > entry, .inline-toolbar button, .inline-toolbar button:backdrop, .linked > button, .linked > button:hover, .linked > button:active, .linked > 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; }
toolbar.inline-toolbar toolbutton > button.flat, searchbar > revealer > .inline-toolbar toolbutton > button.flat, toolbar.inline-toolbar toolbutton:backdrop > button.flat, searchbar > revealer > .inline-toolbar toolbutton:backdrop > button.flat, .linked:not(.vertical) > spinbutton:not(.vertical), .linked:not(.vertical) > entry, .inline-toolbar button, .inline-toolbar button:backdrop, .linked > button, .linked > button:hover, .linked > button:active, .linked > 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; }
.linked:not(.vertical) > spinbutton:first-child:not(.vertical), .linked:not(.vertical) > entry:first-child, .inline-toolbar button:first-child, .linked > button:first-child, toolbar.inline-toolbar toolbutton:first-child > button.flat, searchbar.inline-toolbar toolbutton:first-child > button.flat, toolbar.inline-toolbar toolbutton:backdrop:first-child > button.flat, searchbar.inline-toolbar toolbutton:backdrop: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; }
.linked:not(.vertical) > spinbutton:first-child:not(.vertical), .linked:not(.vertical) > entry:first-child, .inline-toolbar button:first-child, .linked > button:first-child, toolbar.inline-toolbar toolbutton:first-child > button.flat, searchbar > revealer > .inline-toolbar toolbutton:first-child > button.flat, toolbar.inline-toolbar toolbutton:backdrop:first-child > button.flat, searchbar > revealer > .inline-toolbar toolbutton:backdrop: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; }
.linked:not(.vertical) > spinbutton:last-child:not(.vertical), .linked:not(.vertical) > entry:last-child, .inline-toolbar button:last-child, .linked > button:last-child, toolbar.inline-toolbar toolbutton:last-child > button.flat, searchbar.inline-toolbar toolbutton:last-child > button.flat, toolbar.inline-toolbar toolbutton:backdrop:last-child > button.flat, searchbar.inline-toolbar toolbutton:backdrop: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-right-style: solid; }
.linked:not(.vertical) > spinbutton:last-child:not(.vertical), .linked:not(.vertical) > entry:last-child, .inline-toolbar button:last-child, .linked > button:last-child, toolbar.inline-toolbar toolbutton:last-child > button.flat, searchbar > revealer > .inline-toolbar toolbutton:last-child > button.flat, toolbar.inline-toolbar toolbutton:backdrop:last-child > button.flat, searchbar > revealer > .inline-toolbar toolbutton:backdrop: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-right-style: solid; }
.linked:not(.vertical) > spinbutton:only-child:not(.vertical), .linked:not(.vertical) > entry:only-child, .inline-toolbar button:only-child, .linked > button:only-child, toolbar.inline-toolbar toolbutton:only-child > button.flat, searchbar.inline-toolbar toolbutton:only-child > button.flat, toolbar.inline-toolbar toolbutton:backdrop:only-child > button.flat, searchbar.inline-toolbar toolbutton:backdrop:only-child > button.flat, .linked:not(.vertical) > combobox:only-child > box > button.combo { border-radius: 3px; border-style: solid; }
.linked:not(.vertical) > spinbutton:only-child:not(.vertical), .linked:not(.vertical) > entry:only-child, .inline-toolbar button:only-child, .linked > button:only-child, toolbar.inline-toolbar toolbutton:only-child > button.flat, searchbar > revealer > .inline-toolbar toolbutton:only-child > button.flat, toolbar.inline-toolbar toolbutton:backdrop:only-child > button.flat, searchbar > revealer > .inline-toolbar toolbutton:backdrop:only-child > button.flat, .linked:not(.vertical) > combobox:only-child > box > button.combo { border-radius: 3px; border-style: solid; }
.linked.vertical > spinbutton:not(.vertical), .linked.vertical > entry, .linked.vertical > button, .linked.vertical > button:hover, .linked.vertical > button:active, .linked.vertical > button:checked, .linked.vertical > button:backdrop, .linked.vertical > combobox > box > button.combo { border-style: solid solid none solid; border-radius: 0; }
......@@ -467,23 +467,23 @@ combobox arrow { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); min-heig
combobox:drop(active) { box-shadow: none; }
/************ Toolbars * */
toolbar, searchbar { padding: 6px; background-color: #fff; }
toolbar, searchbar > revealer > * { padding: 6px; background-color: #fff; }
toolbar.osd, searchbar.osd { background-color: rgba(0, 0, 0, 0.8); border-radius: 6px; padding: 12px; }
toolbar.osd, searchbar > revealer > .osd { background-color: rgba(0, 0, 0, 0.8); border-radius: 6px; padding: 12px; }
toolbar.osd label, searchbar.osd label { color: #fff; }
toolbar.osd label, searchbar > revealer > .osd label { color: #fff; }
toolbar.inline-toolbar, searchbar.inline-toolbar { border-width: 0 1px 1px; padding: 3px; border-radius: 0 0 4px 4px; }
toolbar.inline-toolbar, searchbar > revealer > .inline-toolbar { border-width: 0 1px 1px; padding: 3px; border-radius: 0 0 4px 4px; }
toolbar.vertical, searchbar.vertical { border-right: 1px solid gray; }
toolbar.vertical, searchbar > revealer > .vertical { border-right: 1px solid gray; }
toolbar.vertical:dir(rtl), searchbar.vertical:dir(rtl) { border-right: none; border-left: 1px solid gray; }
toolbar.vertical:dir(rtl), searchbar > revealer > .vertical:dir(rtl) { border-right: none; border-left: 1px solid gray; }
searchbar { border-width: 0 0 1px; border-color: gray; border-style: none none solid none; padding: 3px; }
searchbar > revealer > * { border-width: 0 0 1px; border-color: gray; border-style: none none solid none; margin: -6px; padding: 9px; }
toolbar.inline-toolbar, searchbar.inline-toolbar { border-style: solid; border-color: gray; background-color: #d9d9d9; box-shadow: inset 0 2px 3px -1px #a4a4a4; }
toolbar.inline-toolbar, searchbar > revealer > .inline-toolbar { border-style: solid; border-color: gray; background-color: #d9d9d9; box-shadow: inset 0 2px 3px -1px #a4a4a4; }
toolbar.inline-toolbar:backdrop, searchbar.inline-toolbar:backdrop { border-color: #8d8d8d; background-color: #d7d7d7; box-shadow: none; }
toolbar.inline-toolbar:backdrop, searchbar > revealer > .inline-toolbar:backdrop { border-color: #8d8d8d; background-color: #d7d7d7; box-shadow: none; }
/*************** Header bars * */
.titlebar:not(headerbar), headerbar { min-height: 46px; border-width: 0 0 1px; border-style: solid; border-color: gray; border-radius: 7px 7px 0 0; background-color: transparent; background-image: linear-gradient(to bottom, white, #fff); box-shadow: inset 0 -1px #d9d9d9, inset 0 1px #fff; padding: 6px; }
......@@ -658,7 +658,7 @@ popover.background, .csd popover.background { border: 1px solid gray; }
popover.background:backdrop { background-color: #fff; box-shadow: none; }
popover.background > list, popover.background > .view, textview popover.background > text, popover.background > iconview, popover.background > toolbar, popover.background > searchbar { border-style: none; background-color: transparent; }
popover.background > list, popover.background > .view, textview popover.background > text, popover.background > iconview, popover.background > toolbar { border-style: none; background-color: transparent; }
popover.background.touch-selection, popover.background.magnifier, .csd popover.background.touch-selection, .csd popover.background.magnifier { border: 1px solid rgba(255, 255, 255, 0.1); }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment