[gtk/gtk-3-24] Adwaita: allow flat list row buttons to be flat

[Jakub Steiner <jimmac src gnome org>]

commit ed691dcba51b440ff0d5a2cd5b0ca8ad5b25c69f
Author: Jakub Steiner <jimmac gmail com>
Date:   Thu Jun 27 12:10:42 2019 +0200

    Adwaita: allow flat list row buttons to be flat
    
    - Be more specific about the list row image buttons
    
    Addresses corner case of https://gitlab.gnome.org/GNOME/gtk/issues/1748

 gtk/theme/Adwaita/_common.scss           | 2 +-
 gtk/theme/Adwaita/gtk-contained-dark.css | 8 ++++----
 gtk/theme/Adwaita/gtk-contained.css      | 8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index b44e03e2b8..530caa00ed 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -1111,7 +1111,7 @@ button.color {
 
 /* list buttons */
 /* tone down as per new designs, see issue #1473, #1748 */
-list row button.image-button {
+list row button.image-button:not(.flat) {
   @extend %undecorated_button;
   border: 1px solid transparentize($borders_color, .5);
   &:hover { @include button(hover); }
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index 0724a0782a..2f8836d897 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -440,7 +440,7 @@ filechooser .path-bar.linked > button:only-child { border-radius: 5px; border-st
 
 .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 { 
border-radius: 5px; border-style: solid; }
 
-modelbutton.flat, .menuitem.button.flat, modelbutton.flat:backdrop, modelbutton.flat:backdrop:hover, 
.menuitem.button.flat:backdrop, .menuitem.button.flat:backdrop:hover, list row button.image-button, 
button:link, button:visited, button:link:hover, button:link:active, button:link:checked, 
button:visited:hover, button:visited:active, button:visited:checked, calendar.button, .scale-popup 
button:hover, .scale-popup button:backdrop:hover, .scale-popup button:backdrop:disabled, .scale-popup 
button:backdrop { background-color: transparent; background-image: none; border-color: transparent; 
box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); text-shadow: none; 
-gtk-icon-shadow: none; }
+modelbutton.flat, .menuitem.button.flat, modelbutton.flat:backdrop, modelbutton.flat:backdrop:hover, 
.menuitem.button.flat:backdrop, .menuitem.button.flat:backdrop:hover, list row 
button.image-button:not(.flat), button:link, button:visited, button:link:hover, button:link:active, 
button:link:checked, button:visited:hover, button:visited:active, button:visited:checked, calendar.button, 
.scale-popup button:hover, .scale-popup button:backdrop:hover, .scale-popup button:backdrop:disabled, 
.scale-popup button:backdrop { background-color: transparent; background-image: none; border-color: 
transparent; box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); text-shadow: none; 
-gtk-icon-shadow: none; }
 
 /* menu buttons */
 modelbutton.flat, .menuitem.button.flat { min-height: 26px; padding-left: 5px; padding-right: 5px; 
border-radius: 5px; outline-offset: -2px; }
@@ -461,11 +461,11 @@ button.color colorswatch:only-child, button.color colorswatch:only-child overlay
 
 /* list buttons */
 /* tone down as per new designs, see issue #1473, #1748 */
-list row button.image-button { border: 1px solid rgba(27, 27, 27, 0.5); }
+list row button.image-button:not(.flat) { border: 1px solid rgba(27, 27, 27, 0.5); }
 
-list row button.image-button:hover { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); border-color: 
#1b1b1b; border-bottom-color: #070707; text-shadow: 0 -1px rgba(0, 0, 0, 0.786353); -gtk-icon-shadow: 0 -1px 
rgba(0, 0, 0, 0.786353); box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px 2px rgba(0, 0, 0, 0.07); 
background-image: linear-gradient(to top, #323232, #373737 1px); }
+list row button.image-button:not(.flat):hover { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); 
border-color: #1b1b1b; border-bottom-color: #070707; text-shadow: 0 -1px rgba(0, 0, 0, 0.786353); 
-gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.786353); box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px 
2px rgba(0, 0, 0, 0.07); background-image: linear-gradient(to top, #323232, #373737 1px); }
 
-list row button.image-button:active, list row button.image-button:checked { color: #eeeeec; outline-color: 
rgba(238, 238, 236, 0.3); border-color: #1b1b1b; background-image: image(#1e1e1e); box-shadow: inset 0 1px 
rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; }
+list row button.image-button:not(.flat):active, list row button.image-button:not(.flat):checked { color: 
#eeeeec; outline-color: rgba(238, 238, 236, 0.3); border-color: #1b1b1b; background-image: image(#1e1e1e); 
box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; }
 
 /********* Links * */
 button:link > label, button:visited > label, *:link, button:link, button:visited { color: #3584e4; }
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index 534cb48984..afd25f37ee 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -442,7 +442,7 @@ filechooser .path-bar.linked > button:only-child { border-radius: 5px; border-st
 
 .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 { 
border-radius: 5px; border-style: solid; }
 
-modelbutton.flat, .menuitem.button.flat, modelbutton.flat:backdrop, modelbutton.flat:backdrop:hover, 
.menuitem.button.flat:backdrop, .menuitem.button.flat:backdrop:hover, list row button.image-button, 
button:link, button:visited, button:link:hover, button:link:active, button:link:checked, 
button:visited:hover, button:visited:active, button:visited:checked, calendar.button, .scale-popup 
button:hover, .scale-popup button:backdrop:hover, .scale-popup button:backdrop:disabled, .scale-popup 
button:backdrop { background-color: transparent; background-image: none; border-color: transparent; 
box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); text-shadow: none; 
-gtk-icon-shadow: none; }
+modelbutton.flat, .menuitem.button.flat, modelbutton.flat:backdrop, modelbutton.flat:backdrop:hover, 
.menuitem.button.flat:backdrop, .menuitem.button.flat:backdrop:hover, list row 
button.image-button:not(.flat), button:link, button:visited, button:link:hover, button:link:active, 
button:link:checked, button:visited:hover, button:visited:active, button:visited:checked, calendar.button, 
.scale-popup button:hover, .scale-popup button:backdrop:hover, .scale-popup button:backdrop:disabled, 
.scale-popup button:backdrop { background-color: transparent; background-image: none; border-color: 
transparent; box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); text-shadow: none; 
-gtk-icon-shadow: none; }
 
 /* menu buttons */
 modelbutton.flat, .menuitem.button.flat { min-height: 26px; padding-left: 5px; padding-right: 5px; 
border-radius: 5px; outline-offset: -2px; }
@@ -469,11 +469,11 @@ button.color colorswatch:only-child, button.color colorswatch:only-child overlay
 
 /* list buttons */
 /* tone down as per new designs, see issue #1473, #1748 */
-list row button.image-button { border: 1px solid rgba(205, 199, 194, 0.5); }
+list row button.image-button:not(.flat) { border: 1px solid rgba(205, 199, 194, 0.5); }
 
-list row button.image-button:hover { color: #2e3436; outline-color: rgba(46, 52, 54, 0.3); border-color: 
#cdc7c2; border-bottom-color: #bfb8b1; text-shadow: 0 1px rgba(255, 255, 255, 0.769231); -gtk-icon-shadow: 0 
1px rgba(255, 255, 255, 0.769231); box-shadow: inset 0 1px white, 0 1px 2px rgba(0, 0, 0, 0.07); 
background-image: linear-gradient(to top, #f6f5f4, #f8f8f7 1px); }
+list row button.image-button:not(.flat):hover { color: #2e3436; outline-color: rgba(46, 52, 54, 0.3); 
border-color: #cdc7c2; border-bottom-color: #bfb8b1; text-shadow: 0 1px rgba(255, 255, 255, 0.769231); 
-gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.769231); box-shadow: inset 0 1px white, 0 1px 2px rgba(0, 0, 0, 
0.07); background-image: linear-gradient(to top, #f6f5f4, #f8f8f7 1px); }
 
-list row button.image-button:active, list row button.image-button:checked { color: #2e3436; outline-color: 
rgba(46, 52, 54, 0.3); border-color: #cdc7c2; background-image: image(#d6d1cd); box-shadow: inset 0 1px 
rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; }
+list row button.image-button:not(.flat):active, list row button.image-button:not(.flat):checked { color: 
#2e3436; outline-color: rgba(46, 52, 54, 0.3); border-color: #cdc7c2; background-image: image(#d6d1cd); 
box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; }
 
 /********* Links * */
 button:link > label, button:visited > label, *:link, button:link, button:visited { color: #1b6acb; }