[gtk: 2/2] Merge branch 'fix-and-improve-linked-button-style' into 'master'

[Matthias Clasen <matthiasc src gnome org>]

commit ec37e1e46294c992ea70fbc19edf81783d6b13cd
Merge: 79180f62d7 ca233ad9ae
Author: Matthias Clasen <mclasen redhat com>
Date:   Wed Apr 24 19:23:12 2019 +0000

    Merge branch 'fix-and-improve-linked-button-style' into 'master'
    
    themes: Fix and improve linked button style
    
    Closes #1294
    
    See merge request GNOME/gtk!730

 gtk/theme/Adwaita/_common.scss                   | 134 +++++++----------------
 gtk/theme/Adwaita/gtk-contained-dark.css         |  22 +---
 gtk/theme/Adwaita/gtk-contained.css              |  22 +---
 gtk/theme/HighContrast/_common.scss              | 134 +++++++----------------
 gtk/theme/HighContrast/gtk-contained-inverse.css |  22 +---
 gtk/theme/HighContrast/gtk-contained.css         |  22 +---
 6 files changed, 106 insertions(+), 250 deletions(-)
---
diff --cc gtk/theme/Adwaita/gtk-contained-dark.css
index d1cd399c48,51c513a5bc..fe1fc4bae4
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@@ -564,13 -543,13 +554,13 @@@ spinbutton.vertical text { min-height: 
  
  spinbutton.vertical button { min-height: 32px; min-width: 32px; padding: 0; }
  
- spinbutton.vertical button.up { border-radius: 5px 5px 0 0; border-style: solid solid none solid; }
+ spinbutton.vertical button.up { border-bottom-style: none; border-bottom-left-radius: 0; 
border-bottom-right-radius: 0; }
  
- spinbutton.vertical button.down { border-radius: 0 0 5px 5px; border-style: none solid solid solid; }
+ spinbutton.vertical button.down { border-top-style: none; border-top-left-radius: 0; 
border-top-right-radius: 0; }
  
 -.osd spinbutton.vertical button:first-child { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); 
background-color: transparent; background-image: image(rgba(36, 33, 42, 0.7)); background-clip: padding-box; 
box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); text-shadow: 0 1px black; -gtk-icon-shadow: 0 1px black; 
outline-color: rgba(238, 238, 236, 0.3); }
 +.osd spinbutton.vertical button:first-child { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); 
background-color: transparent; background-image: image(rgba(53, 53, 53, 0.7)); background-clip: padding-box; 
box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); text-shadow: 0 1px black; -gtk-icon-shadow: 0 1px black; 
outline-color: rgba(238, 238, 236, 0.3); }
  
 -.osd spinbutton.vertical button:first-child:hover { color: white; border-color: rgba(0, 0, 0, 0.7); 
background-color: transparent; background-image: image(rgba(66, 61, 76, 0.7)); background-clip: padding-box; 
box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); text-shadow: 0 1px black; -gtk-icon-shadow: 0 1px black; 
outline-color: rgba(238, 238, 236, 0.3); }
 +.osd spinbutton.vertical button:first-child:hover { color: white; border-color: rgba(0, 0, 0, 0.7); 
background-color: transparent; background-image: image(rgba(83, 83, 83, 0.7)); background-clip: padding-box; 
box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); text-shadow: 0 1px black; -gtk-icon-shadow: 0 1px black; 
outline-color: rgba(238, 238, 236, 0.3); }
  
  .osd spinbutton.vertical button:first-child:active { color: white; border-color: rgba(0, 0, 0, 0.7); 
background-color: transparent; background-image: image(rgba(0, 0, 0, 0.7)); background-clip: padding-box; 
box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; outline-color: rgba(238, 238, 236, 0.3); }
  
diff --cc gtk/theme/Adwaita/gtk-contained.css
index f3f09d395e,84f8b4230d..89db9afb1d
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@@ -572,13 -551,13 +562,13 @@@ spinbutton.vertical text { min-height: 
  
  spinbutton.vertical button { min-height: 32px; min-width: 32px; padding: 0; }
  
- spinbutton.vertical button.up { border-radius: 5px 5px 0 0; border-style: solid solid none solid; }
+ spinbutton.vertical button.up { border-bottom-style: none; border-bottom-left-radius: 0; 
border-bottom-right-radius: 0; }
  
- spinbutton.vertical button.down { border-radius: 0 0 5px 5px; border-style: none solid solid solid; }
+ spinbutton.vertical button.down { border-top-style: none; border-top-left-radius: 0; 
border-top-right-radius: 0; }
  
 -.osd spinbutton.vertical button:first-child { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); 
background-color: transparent; background-image: image(rgba(36, 33, 42, 0.7)); background-clip: padding-box; 
box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); text-shadow: 0 1px black; -gtk-icon-shadow: 0 1px black; 
outline-color: rgba(238, 238, 236, 0.3); }
 +.osd spinbutton.vertical button:first-child { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); 
background-color: transparent; background-image: image(rgba(53, 53, 53, 0.7)); background-clip: padding-box; 
box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); text-shadow: 0 1px black; -gtk-icon-shadow: 0 1px black; 
outline-color: rgba(238, 238, 236, 0.3); }
  
 -.osd spinbutton.vertical button:first-child:hover { color: white; border-color: rgba(0, 0, 0, 0.7); 
background-color: transparent; background-image: image(rgba(66, 61, 76, 0.7)); background-clip: padding-box; 
box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); text-shadow: 0 1px black; -gtk-icon-shadow: 0 1px black; 
outline-color: rgba(238, 238, 236, 0.3); }
 +.osd spinbutton.vertical button:first-child:hover { color: white; border-color: rgba(0, 0, 0, 0.7); 
background-color: transparent; background-image: image(rgba(83, 83, 83, 0.7)); background-clip: padding-box; 
box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); text-shadow: 0 1px black; -gtk-icon-shadow: 0 1px black; 
outline-color: rgba(238, 238, 236, 0.3); }
  
  .osd spinbutton.vertical button:first-child:active { color: white; border-color: rgba(0, 0, 0, 0.7); 
background-color: transparent; background-image: image(rgba(0, 0, 0, 0.7)); background-clip: padding-box; 
box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; outline-color: rgba(238, 238, 236, 0.3); }