From 5cc088128f0394e1ca7c210e3529aec482d442a8 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 23 Jan 2020 00:11:10 -0500 Subject: [PATCH] Adwaita: Remove .rubberband class All GTK widget are using a rubberband element now. --- gtk/theme/Adwaita/_common.scss | 3 +-- gtk/theme/Adwaita/gtk-contained-dark.css | 10 ++++------ gtk/theme/Adwaita/gtk-contained.css | 10 ++++------ 3 files changed, 9 insertions(+), 14 deletions(-) diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss index fb6b01158d..a8404b0702 100644 --- a/gtk/theme/Adwaita/_common.scss +++ b/gtk/theme/Adwaita/_common.scss @@ -132,7 +132,6 @@ iconview { } } -.rubberband, rubberband { border: 1px solid darken($selected_bg_color, 10%); background-color: transparentize(darken($selected_bg_color, 10%), 0.8); @@ -4525,7 +4524,7 @@ colorchooser .popover.osd { border-radius: 5px; } &:backdrop { background-color: darken($bg_color,7%); } - rubberband, .rubberband { @extend rubberband; } + rubberband { @extend rubberband; } } .scale-popup { diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css index ea1d9437cd..2a04ce0376 100644 --- a/gtk/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/theme/Adwaita/gtk-contained-dark.css @@ -37,7 +37,7 @@ iconview:drop(active) { box-shadow: none; } iconview dndtarget:drop(active) { border-style: solid; border-width: 1px; border-color: #030c17; } -.rubberband, rubberband, flowbox rubberband, treeview.view rubberband, .content-view rubberband, .content-view .rubberband { border: 1px solid #0f3b71; background-color: rgba(15, 59, 113, 0.2); } +rubberband, flowbox rubberband, treeview.view rubberband, .content-view rubberband { border: 1px solid #0f3b71; background-color: rgba(15, 59, 113, 0.2); } flowbox flowboxchild { padding: 3px; } @@ -543,7 +543,7 @@ combobox arrow { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); min-heig combobox:drop(active) { box-shadow: none; } /************ Toolbars * */ -toolbar, .inline-toolbar, .location-bar, searchbar > revealer > box { padding: 4px; background-color: #353535; } +toolbar, .inline-toolbar, searchbar > revealer > box { padding: 4px; background-color: #353535; } toolbar { padding: 4px 3px 3px 4px; } @@ -561,15 +561,13 @@ toolbar:not(.inline-toolbar):not(.osd) > *:not(.toggle):not(.popup) > * { margin .inline-toolbar { padding: 3px; border-width: 0 1px 1px; border-radius: 0 0 5px 5px; } -.location-bar { border-width: 0 0 1px; padding: 0px; } - searchbar { padding: 0px; } searchbar > revealer > box { padding: 6px; border-width: 0 0 1px; } -.inline-toolbar, .location-bar, searchbar > revealer > box { border-style: solid; border-color: #1b1b1b; background-color: #2d2d2d; } +.inline-toolbar, searchbar > revealer > box { border-style: solid; border-color: #1b1b1b; background-color: #2d2d2d; } -.inline-toolbar:backdrop, .location-bar:backdrop, searchbar > revealer > box:backdrop { border-color: #202020; background-color: #2e2e2e; box-shadow: none; transition: 200ms ease-out; } +.inline-toolbar:backdrop, searchbar > revealer > box:backdrop { border-color: #202020; background-color: #2e2e2e; 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: #070707; border-radius: 0; background: #1b1b1b linear-gradient(to top, #262626, #2b2b2b); box-shadow: inset 0 1px rgba(238, 238, 236, 0.07); /* Darken switchbuttons for headerbars. issue #1588 */ /* hide the close button separator */ } diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css index 7158305578..c97096a54d 100644 --- a/gtk/theme/Adwaita/gtk-contained.css +++ b/gtk/theme/Adwaita/gtk-contained.css @@ -37,7 +37,7 @@ iconview:drop(active) { box-shadow: none; } iconview dndtarget:drop(active) { border-style: solid; border-width: 1px; border-color: #185fb4; } -.rubberband, rubberband, flowbox rubberband, treeview.view rubberband, .content-view rubberband, .content-view .rubberband { border: 1px solid #1b6acb; background-color: rgba(27, 106, 203, 0.2); } +rubberband, flowbox rubberband, treeview.view rubberband, .content-view rubberband { border: 1px solid #1b6acb; background-color: rgba(27, 106, 203, 0.2); } flowbox flowboxchild { padding: 3px; } @@ -551,7 +551,7 @@ combobox arrow { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); min-heig combobox:drop(active) { box-shadow: none; } /************ Toolbars * */ -toolbar, .inline-toolbar, .location-bar, searchbar > revealer > box { padding: 4px; background-color: #f6f5f4; } +toolbar, .inline-toolbar, searchbar > revealer > box { padding: 4px; background-color: #f6f5f4; } toolbar { padding: 4px 3px 3px 4px; } @@ -569,15 +569,13 @@ toolbar:not(.inline-toolbar):not(.osd) > *:not(.toggle):not(.popup) > * { margin .inline-toolbar { padding: 3px; border-width: 0 1px 1px; border-radius: 0 0 5px 5px; } -.location-bar { border-width: 0 0 1px; padding: 0px; } - searchbar { padding: 0px; } searchbar > revealer > box { padding: 6px; border-width: 0 0 1px; } -.inline-toolbar, .location-bar, searchbar > revealer > box { border-style: solid; border-color: #cdc7c2; background-color: #eae7e5; } +.inline-toolbar, searchbar > revealer > box { border-style: solid; border-color: #cdc7c2; background-color: #eae7e5; } -.inline-toolbar:backdrop, .location-bar:backdrop, searchbar > revealer > box:backdrop { border-color: #d5d0cc; background-color: #eae8e6; box-shadow: none; transition: 200ms ease-out; } +.inline-toolbar:backdrop, searchbar > revealer > box:backdrop { border-color: #d5d0cc; background-color: #eae8e6; 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: #bfb8b1; border-radius: 0; background: #dfdcd8 linear-gradient(to top, #dad6d2, #e1dedb); box-shadow: inset 0 1px rgba(255, 255, 255, 0.8); /* Darken switchbuttons for headerbars. issue #1588 */ /* hide the close button separator */ }