Tweaked comboboxes and views

gtk-3.0/scss/_entry.scss

@@ -73,3 +73,26 @@
 }
 
 .entry { @include entry($base_color, $text_color); }
+
+
+/******************
+ ! Combobox entry *
+*******************/
+
+GtkComboBox.combobox-entry {
+	.entry {
+		&, &:hover, &:focus, &:active, &:insensitive {
+			border-width: 1px 0 1px 1px;
+			border-top-right-radius: 0;
+			border-bottom-right-radius: 0;
+		}
+	}
+
+	.button {
+		&, &:hover, &:focus, &:active, &:insensitive {
+			border-width: 1px 1px 1px 1px;
+			border-bottom-left-radius: 0;
+			border-top-left-radius: 0;
+		}
+	}
+}

gtk-3.0/scss/_menu.scss

@@ -3,6 +3,38 @@
 @import "entry";
 
 
+/*********
+ ! Menubar
+**********/
+
+.menubar {
+    -GtkWidget-window-dragging: true;
+
+    border: none;
+    background-color: $menubar_bg_color;
+    background-image: none;
+    color: $menubar_fg_color;
+
+
+    &.menuitem, .menuitem {
+        padding: $spacing ($spacing * 2);
+        border: 1px solid transparent;
+        background-color: transparent;
+        background-image: none;
+        color: $menubar_fg_color;
+
+        &:hover {
+            border-color: mix($menubar_bg_color, $menubar_fg_color, 0.21);
+            background-color: mix($menubar_bg_color, $menubar_fg_color, 0.21);
+            background-image: none;
+            color: shade($menubar_fg_color, 1.08);
+        }
+
+        & *:hover { color: shade($menubar_fg_color, 1.08); }
+    }
+}
+
+
 /******
  ! Menu
 *******/
@@ -80,7 +112,7 @@ GtkTreeMenu, GtkMenuToolButton, GtkComboBox {
     }
 
     &.button {
-        &, &:active, &:insensitive, &:active:insensitive {
+        &, &:focus, &:active, &:insensitive, &:active:insensitive {
             background-color: transparent;
             background-image: none;
             border-color: transparent;
@@ -89,7 +121,7 @@ GtkTreeMenu, GtkMenuToolButton, GtkComboBox {
             color: currentColor;
         }
 
-        &:hover, &:active:hover, &:selected {
+        &:hover, &:focus:hover, &:active:hover, &:selected {
             background-color: $selected_bg_color;
             background-image: none;
             color: $selected_fg_color;
@@ -134,9 +166,16 @@ GtkPopover {
     border-style: solid;
     background-clip: border-box;
     background-color: $menu_bg_color;
+    background-image: none;
     color: $menu_fg_color;
     box-shadow: 0 2px 3px alpha(black, .5);
 
+    &.background {
+        background-image: none;
+        background-color: $menu_bg_color;
+        color: $menu_fg_color;
+    }
+
     &:backdrop { box-shadow: none; }
 
     &.osd {
@@ -160,3 +199,25 @@ GtkPopover {
         font-weight: bold;
     }
 }
+
+GtkModelButton.button {
+    &, &:focus, &:active, &:insensitive, &:active:insensitive {
+        &, &:backdrop {
+            background-color: transparent;
+            background-image: none;
+            border-color: transparent;
+            border-image: none;
+            border-style: none;
+            box-shadow: none;
+            color: $menu_fg_color;
+        }
+    }
+
+    &:focus:hover, &:active:hover, &:hover, &:selected {
+        background-image: none;
+        background-color: $selected_bg_color;
+        color: $selected_fg_color;
+        border: none;
+        border-radius: 2px;
+    }
+}

gtk-3.0/scss/_view.scss

@@ -123,3 +123,55 @@ column-header {
         &:last-child .button { border-width: 0 0 1px 0; }
     }
 }
+
+
+/**********
+ ! Frames *
+***********/
+
+.frame { border: none; }
+
+GtkScrolledWindow {
+    &.frame { border: 1px solid border_normal($bg_color); }
+
+    /* avoid double borders when a viewport is packed into a GtkScrolledWindow */
+    GtkViewport.frame { border: none; }
+}
+
+
+/*************
+ ! Expanders *
+**************/
+
+GtkExpander {
+    padding: $spacing;
+    outline-offset: 1px;
+}
+
+.expander {
+    color: alpha(currentColor, 0.7);
+    border: alpha(currentColor, 0.7);
+
+    &:hover {
+        color: alpha(currentColor, 0.8);
+        border-color: alpha(currentColor, 0.8);
+    }
+
+    &:active {
+        color: alpha(currentColor, 0.9);
+        border-color: alpha(currentColor, 0.9);
+    }
+}
+
+
+/*******************
+ ! Symbolic images *
+********************/
+
+.image {
+    color: alpha(currentColor, 0.5);
+
+    &:hover { color: alpha(currentColor, 0.9); }
+
+    &:selected, &:selected:hover { color: $selected_fg_color; }
+}