[gnome-themes-standard] check and radios popover rewrite - code still needs refactoring but works right now - removed te

[Lapo Calamandrei <lapo src gnome org>]

commit 45bc2e79c837bf75eb255d1815aea6f85e38f9e0
Author: Lapo Calamandrei <calamandrei gmail com>
Date:   Wed Jun 11 18:36:14 2014 +0200

    check and radios popover rewrite
      - code still needs refactoring but works right now
      - removed text-shadow on popovers

 themes/Adwaita/gtk-3.0/_common.scss           |   60 ++++++++----------
 themes/Adwaita/gtk-3.0/gtk-contained-dark.css |   86 ++++++++----------------
 themes/Adwaita/gtk-3.0/gtk-contained.css      |   86 ++++++++----------------
 3 files changed, 84 insertions(+), 148 deletions(-)
---
diff --git a/themes/Adwaita/gtk-3.0/_common.scss b/themes/Adwaita/gtk-3.0/_common.scss
index b7c17ee..d1edc3c 100644
--- a/themes/Adwaita/gtk-3.0/_common.scss
+++ b/themes/Adwaita/gtk-3.0/_common.scss
@@ -708,17 +708,16 @@ column-header { // FIXME: something better
  ***************/
 
 GtkPopover {
-  border-radius: 5px;
-  //background-clip: border-box;
-  background-color: $bg_color;
-
+  margin: 10px;
+  padding: 2px;
   border-color: $borders-color;
   border-width: 1px;
   border-style: solid;
+  border-radius: 5px;
+  //background-clip: border-box;
+  background-color: $bg_color;
 
   box-shadow: 0 2px 3px transparentize(black, 0.5);
-  margin: 10px;
-  padding: 2px;
   &:backdrop {
     box-shadow: none;
   }
@@ -736,6 +735,14 @@ GtkPopover {
     icon-shadow: none;
     border: 0;
   }
+  .button,
+  .button:hover {
+    text-shadow: none;
+    transition: none;
+  }
+  .button:selected {
+    color:red;
+  }
   &.osd { // Also used for touch cutnpaste overlays
           // FIXME Doesn't work
     background-image: none;
@@ -1093,32 +1100,7 @@ $asset_suffix: if($variant=='dark', '-dark', '');
     }    
   }
 
-/*
-  // treeview, menu and popover
-  GtkPopover GtkModelButton.button.#{$w},
-  .menuitem.#{$w},
-  GtkTreeView.#{$w} {
-    color: transparentize($fg_color, 0.9);
-    background-image: none;
-    background-color: transparent;
-    -gtk-icon-source: -gtk-icontheme('#{$a}-checked-symbolic');
-    &:hover { background-image: none; }
-    &:selected:selected, &:selected:hover { //yeah, it's a gross hack
-      background-image: none;
-      color: transparentize($base_color,0.9);
-    }
-    &:active, &:active:hover { -gtk-icon-source: -gtk-icontheme('#{$a}-checked-symbolic'); color: $fg_color; 
}
-    &:selected:active, &:selected:active:hover { color: $selected_fg_color; };
-    &:inconsistent, &:inconsistent:hover { -gtk-icon-source: -gtk-icontheme('#{$a}-mixed-symbolic'); }
-    &:backdrop { background-image: none; }
-  }
-  .menuitem.#{$w} {
-    &:hover, &:active:hover { color: $selected_fg_color; }
-  }
-  GtkPopover GtkModelButton.button.#{$w} {
-    &:hover, &:active:hover { color: $fg_color; }
-  }
-*/
+  //menu
   .menuitem.#{$w} {
     color: transparentize($fg_color,0.9);
     background-image: none;
@@ -1143,6 +1125,7 @@ $asset_suffix: if($variant=='dark', '-dark', '');
     }
   }
 
+  //treeview
   GtkTreeView.view.#{$w} {
     color: transparentize($fg_color,0.9);
     background-image: none;
@@ -1173,8 +1156,17 @@ $asset_suffix: if($variant=='dark', '-dark', '');
       }
     }
   }
-  GtkPopover GtkModelButton.button.#{$w} {
-    //FIXME
+
+  //popover
+  GtkPopover .button.#{$w} {
+    &:hover {
+      color: transparentize($fg_color,0.9);
+      &:active {
+        color: $fg_color;
+        &:selected { color: $selected_fg_color; }
+        &:backdrop { color: $backdrop_fg_color; }
+      }
+    }
   }
 }
 
diff --git a/themes/Adwaita/gtk-3.0/gtk-contained-dark.css b/themes/Adwaita/gtk-3.0/gtk-contained-dark.css
index 9c09d3b..6760a99 100644
--- a/themes/Adwaita/gtk-3.0/gtk-contained-dark.css
+++ b/themes/Adwaita/gtk-3.0/gtk-contained-dark.css
@@ -779,14 +779,14 @@ column-header .button:backdrop {
  * Popovers   *
  ***************/
 GtkPopover {
-  border-radius: 5px;
-  background-color: #393f3f;
+  margin: 10px;
+  padding: 2px;
   border-color: #1c1f1f;
   border-width: 1px;
   border-style: solid;
-  box-shadow: 0 2px 3px rgba(0, 0, 0, 0.5);
-  margin: 10px;
-  padding: 2px; }
+  border-radius: 5px;
+  background-color: #393f3f;
+  box-shadow: 0 2px 3px rgba(0, 0, 0, 0.5); }
   GtkPopover:backdrop {
     box-shadow: none; }
   GtkPopover > .list, GtkPopover > .view, GtkPopover > .toolbar {
@@ -799,6 +799,12 @@ GtkPopover {
     background-color: transparent;
     icon-shadow: none;
     border: 0; }
+  GtkPopover .button,
+  GtkPopover .button:hover {
+    text-shadow: none;
+    transition: none; }
+  GtkPopover .button:selected {
+    color: red; }
   GtkPopover.osd {
     background-image: none;
     background-color: rgba(0, 0, 0, 0.8);
@@ -1194,32 +1200,6 @@ GtkSwitch {
   background-repeat: no-repeat;
   background-position: center; }
 
-/*
-  // treeview, menu and popover
-  GtkPopover GtkModelButton.button.check,
-  .menuitem.check,
-  GtkTreeView.check {
-    color: transparentize($fg_color, 0.9);
-    background-image: none;
-    background-color: transparent;
-    -gtk-icon-source: -gtk-icontheme('checkbox-checked-symbolic');
-    &:hover { background-image: none; }
-    &:selected:selected, &:selected:hover { //yeah, it's a gross hack
-      background-image: none;
-      color: transparentize($base_color,0.9);
-    }
-    &:active, &:active:hover { -gtk-icon-source: -gtk-icontheme('checkbox-checked-symbolic'); color: 
$fg_color; }
-    &:selected:active, &:selected:active:hover { color: $selected_fg_color; };
-    &:inconsistent, &:inconsistent:hover { -gtk-icon-source: -gtk-icontheme('checkbox-mixed-symbolic'); }
-    &:backdrop { background-image: none; }
-  }
-  .menuitem.check {
-    &:hover, &:active:hover { color: $selected_fg_color; }
-  }
-  GtkPopover GtkModelButton.button.check {
-    &:hover, &:active:hover { color: $fg_color; }
-  }
-*/
 .menuitem.check {
   color: rgba(238, 238, 236, 0.1);
   background-image: none;
@@ -1271,6 +1251,15 @@ GtkTreeView.view.check {
     GtkTreeView.view.check:selected:backdrop {
       color: rgba(201, 203, 201, 0.1); }
 
+GtkPopover .button.check:hover {
+  color: rgba(238, 238, 236, 0.1); }
+  GtkPopover .button.check:hover:active {
+    color: #eeeeec; }
+    GtkPopover .button.check:hover:active:selected {
+      color: white; }
+    GtkPopover .button.check:hover:active:backdrop {
+      color: #c9cbc9; }
+
 .radio {
   background-image: -gtk-scaled(url("assets/radio-unchecked-dark.png"), url("assets/radio-unchecked-dark 2 
png"));
   background-repeat: no-repeat;
@@ -1356,32 +1345,6 @@ GtkTreeView.view.check {
   background-repeat: no-repeat;
   background-position: center; }
 
-/*
-  // treeview, menu and popover
-  GtkPopover GtkModelButton.button.radio,
-  .menuitem.radio,
-  GtkTreeView.radio {
-    color: transparentize($fg_color, 0.9);
-    background-image: none;
-    background-color: transparent;
-    -gtk-icon-source: -gtk-icontheme('radio-checked-symbolic');
-    &:hover { background-image: none; }
-    &:selected:selected, &:selected:hover { //yeah, it's a gross hack
-      background-image: none;
-      color: transparentize($base_color,0.9);
-    }
-    &:active, &:active:hover { -gtk-icon-source: -gtk-icontheme('radio-checked-symbolic'); color: $fg_color; 
}
-    &:selected:active, &:selected:active:hover { color: $selected_fg_color; };
-    &:inconsistent, &:inconsistent:hover { -gtk-icon-source: -gtk-icontheme('radio-mixed-symbolic'); }
-    &:backdrop { background-image: none; }
-  }
-  .menuitem.radio {
-    &:hover, &:active:hover { color: $selected_fg_color; }
-  }
-  GtkPopover GtkModelButton.button.radio {
-    &:hover, &:active:hover { color: $fg_color; }
-  }
-*/
 .menuitem.radio {
   color: rgba(238, 238, 236, 0.1);
   background-image: none;
@@ -1433,6 +1396,15 @@ GtkTreeView.view.radio {
     GtkTreeView.view.radio:selected:backdrop {
       color: rgba(201, 203, 201, 0.1); }
 
+GtkPopover .button.radio:hover {
+  color: rgba(238, 238, 236, 0.1); }
+  GtkPopover .button.radio:hover:active {
+    color: #eeeeec; }
+    GtkPopover .button.radio:hover:active:selected {
+      color: white; }
+    GtkPopover .button.radio:hover:active:backdrop {
+      color: #c9cbc9; }
+
 GtkCheckButton.text-button:selected {
   background-color: transparent; }
 
diff --git a/themes/Adwaita/gtk-3.0/gtk-contained.css b/themes/Adwaita/gtk-3.0/gtk-contained.css
index d9bb550..996a5b6 100644
--- a/themes/Adwaita/gtk-3.0/gtk-contained.css
+++ b/themes/Adwaita/gtk-3.0/gtk-contained.css
@@ -779,14 +779,14 @@ column-header .button:backdrop {
  * Popovers   *
  ***************/
 GtkPopover {
-  border-radius: 5px;
-  background-color: #ededed;
+  margin: 10px;
+  padding: 2px;
   border-color: #a1a1a1;
   border-width: 1px;
   border-style: solid;
-  box-shadow: 0 2px 3px rgba(0, 0, 0, 0.5);
-  margin: 10px;
-  padding: 2px; }
+  border-radius: 5px;
+  background-color: #ededed;
+  box-shadow: 0 2px 3px rgba(0, 0, 0, 0.5); }
   GtkPopover:backdrop {
     box-shadow: none; }
   GtkPopover > .list, GtkPopover > .view, GtkPopover > .toolbar {
@@ -799,6 +799,12 @@ GtkPopover {
     background-color: transparent;
     icon-shadow: none;
     border: 0; }
+  GtkPopover .button,
+  GtkPopover .button:hover {
+    text-shadow: none;
+    transition: none; }
+  GtkPopover .button:selected {
+    color: red; }
   GtkPopover.osd {
     background-image: none;
     background-color: rgba(0, 0, 0, 0.8);
@@ -1194,32 +1200,6 @@ GtkSwitch {
   background-repeat: no-repeat;
   background-position: center; }
 
-/*
-  // treeview, menu and popover
-  GtkPopover GtkModelButton.button.check,
-  .menuitem.check,
-  GtkTreeView.check {
-    color: transparentize($fg_color, 0.9);
-    background-image: none;
-    background-color: transparent;
-    -gtk-icon-source: -gtk-icontheme('checkbox-checked-symbolic');
-    &:hover { background-image: none; }
-    &:selected:selected, &:selected:hover { //yeah, it's a gross hack
-      background-image: none;
-      color: transparentize($base_color,0.9);
-    }
-    &:active, &:active:hover { -gtk-icon-source: -gtk-icontheme('checkbox-checked-symbolic'); color: 
$fg_color; }
-    &:selected:active, &:selected:active:hover { color: $selected_fg_color; };
-    &:inconsistent, &:inconsistent:hover { -gtk-icon-source: -gtk-icontheme('checkbox-mixed-symbolic'); }
-    &:backdrop { background-image: none; }
-  }
-  .menuitem.check {
-    &:hover, &:active:hover { color: $selected_fg_color; }
-  }
-  GtkPopover GtkModelButton.button.check {
-    &:hover, &:active:hover { color: $fg_color; }
-  }
-*/
 .menuitem.check {
   color: rgba(46, 52, 54, 0.1);
   background-image: none;
@@ -1271,6 +1251,15 @@ GtkTreeView.view.check {
     GtkTreeView.view.check:selected:backdrop {
       color: rgba(84, 89, 90, 0.1); }
 
+GtkPopover .button.check:hover {
+  color: rgba(46, 52, 54, 0.1); }
+  GtkPopover .button.check:hover:active {
+    color: #2e3436; }
+    GtkPopover .button.check:hover:active:selected {
+      color: white; }
+    GtkPopover .button.check:hover:active:backdrop {
+      color: #54595a; }
+
 .radio {
   background-image: -gtk-scaled(url("assets/radio-unchecked.png"), url("assets/radio-unchecked 2 png"));
   background-repeat: no-repeat;
@@ -1356,32 +1345,6 @@ GtkTreeView.view.check {
   background-repeat: no-repeat;
   background-position: center; }
 
-/*
-  // treeview, menu and popover
-  GtkPopover GtkModelButton.button.radio,
-  .menuitem.radio,
-  GtkTreeView.radio {
-    color: transparentize($fg_color, 0.9);
-    background-image: none;
-    background-color: transparent;
-    -gtk-icon-source: -gtk-icontheme('radio-checked-symbolic');
-    &:hover { background-image: none; }
-    &:selected:selected, &:selected:hover { //yeah, it's a gross hack
-      background-image: none;
-      color: transparentize($base_color,0.9);
-    }
-    &:active, &:active:hover { -gtk-icon-source: -gtk-icontheme('radio-checked-symbolic'); color: $fg_color; 
}
-    &:selected:active, &:selected:active:hover { color: $selected_fg_color; };
-    &:inconsistent, &:inconsistent:hover { -gtk-icon-source: -gtk-icontheme('radio-mixed-symbolic'); }
-    &:backdrop { background-image: none; }
-  }
-  .menuitem.radio {
-    &:hover, &:active:hover { color: $selected_fg_color; }
-  }
-  GtkPopover GtkModelButton.button.radio {
-    &:hover, &:active:hover { color: $fg_color; }
-  }
-*/
 .menuitem.radio {
   color: rgba(46, 52, 54, 0.1);
   background-image: none;
@@ -1433,6 +1396,15 @@ GtkTreeView.view.radio {
     GtkTreeView.view.radio:selected:backdrop {
       color: rgba(84, 89, 90, 0.1); }
 
+GtkPopover .button.radio:hover {
+  color: rgba(46, 52, 54, 0.1); }
+  GtkPopover .button.radio:hover:active {
+    color: #2e3436; }
+    GtkPopover .button.radio:hover:active:selected {
+      color: white; }
+    GtkPopover .button.radio:hover:active:backdrop {
+      color: #54595a; }
+
 GtkCheckButton.text-button:selected {
   background-color: transparent; }