From c6048e47d0f653b743d09b3f812cedb8112609ea Mon Sep 17 00:00:00 2001
From: Horst3180 <horst3180@users.noreply.github.com>
Date: Wed, 2 Mar 2016 13:28:11 +0100
Subject: [PATCH] cleanup

---
 common/gtk-3.0/3.20/gtk-dark.css         | 45 ++++++--------
 common/gtk-3.0/3.20/gtk-darker.css       | 45 ++++++--------
 common/gtk-3.0/3.20/gtk-solid-dark.css   | 45 ++++++--------
 common/gtk-3.0/3.20/gtk-solid-darker.css | 45 ++++++--------
 common/gtk-3.0/3.20/gtk-solid.css        | 45 ++++++--------
 common/gtk-3.0/3.20/gtk.css              | 45 ++++++--------
 common/gtk-3.0/3.20/sass/_common.scss    | 78 +++++++++++-------------
 7 files changed, 155 insertions(+), 193 deletions(-)

diff --git a/common/gtk-3.0/3.20/gtk-dark.css b/common/gtk-3.0/3.20/gtk-dark.css
index c4f9e82..0c00ae0 100644
--- a/common/gtk-3.0/3.20/gtk-dark.css
+++ b/common/gtk-3.0/3.20/gtk-dark.css
@@ -59,6 +59,9 @@ textview text {
       color: rgba(255, 255, 255, 0.65);
       text-shadow: none; }
 
+textview {
+  background-color: #3c414e; }
+
 iconview {
   color: #D3DAE3;
   background-color: #404552; }
@@ -105,12 +108,9 @@ assistant .sidebar label.highlight {
   background-color: #5294E2;
   color: #ffffff; }
 
-textview {
-  background-color: #3c414e; }
-
-popover.osd, popover.magnifier,
+popover.osd, popover.magnifier, .csd popover.osd, .csd popover.magnifier,
 popover.background.osd,
-popover.background.magnifier, .osd {
+popover.background.magnifier, .csd popover.background.osd, .csd popover.background.magnifier, .osd {
   color: #BAC3CF;
   border: none;
   background-color: rgba(53, 57, 69, 0.95);
@@ -429,17 +429,11 @@ button {
     padding-left: 16px;
     padding-right: 16px; }
   button.text-button.image-button {
-    padding-left: 0;
-    padding-right: 0; }
-    button.text-button.image-button label:first-child {
-      padding-left: 12px;
-      padding-right: 0; }
-    button.text-button.image-button label:last-child {
-      padding-left: 0;
-      padding-right: 12px; }
-    button.text-button.image-button image {
-      padding-left: 6px;
-      padding-right: 6px; }
+    padding-left: 8px;
+    padding-right: 8px; }
+    button.text-button.image-button label {
+      padding-left: 8px;
+      padding-right: 8px; }
   .stack-switcher > button {
     outline-offset: -3px; }
     .stack-switcher > button > label {
@@ -1307,7 +1301,8 @@ treeview.view {
     treeview.view:disabled:selected {
       color: #97bfee; }
   treeview.view.separator {
-    min-height: 2px; }
+    min-height: 2px;
+    color: rgba(0, 0, 0, 0.1); }
   treeview.view.dnd {
     border-style: solid none;
     border-width: 1px;
@@ -1423,8 +1418,9 @@ menu,
     background-color: #383C4A; }
   menu menuitem,
   .menu menuitem {
-    padding: 4px;
+    min-height: 16px;
     min-width: 40px;
+    padding: 4px;
     border: solid transparent;
     border-width: 1px 0 1px 0; }
     menu menuitem:hover,
@@ -2208,9 +2204,8 @@ separator, .sidebar separator, .sidebar .view separator {
 list {
   background-color: #404552;
   border-color: #2b2e39; }
-
-row {
-  padding: 2px; }
+  list row {
+    padding: 2px; }
 
 row.activatable.has-open-popup, row.activatable:hover {
   background-color: rgba(255, 255, 255, 0.03); }
@@ -2230,9 +2225,9 @@ row.activatable:selected:disabled {
   row.activatable:selected:disabled label {
     color: inherit; }
 
-row, row.activatable {
+row {
   transition: all 150ms cubic-bezier(0.25, 0.46, 0.45, 0.94); }
-  row:hover, row.activatable:hover {
+  row:hover {
     transition: none; }
 
 .app-notification {
@@ -2579,8 +2574,8 @@ button.color {
   border-color: #2b2e39;
   background-color: #505666; }
 
-.context-menu, popover.touch-selection,
-popover.background.touch-selection {
+.context-menu, popover.touch-selection, .csd popover.touch-selection,
+popover.background.touch-selection, .csd popover.background.touch-selection {
   font: initial; }
 
 .monospace {
diff --git a/common/gtk-3.0/3.20/gtk-darker.css b/common/gtk-3.0/3.20/gtk-darker.css
index ad88065..ea67ac8 100644
--- a/common/gtk-3.0/3.20/gtk-darker.css
+++ b/common/gtk-3.0/3.20/gtk-darker.css
@@ -59,6 +59,9 @@ textview text {
       color: rgba(255, 255, 255, 0.65);
       text-shadow: none; }
 
+textview {
+  background-color: #fafbfb; }
+
 iconview {
   color: #5c616c;
   background-color: #ffffff; }
@@ -105,12 +108,9 @@ assistant .sidebar label.highlight {
   background-color: #5294E2;
   color: #ffffff; }
 
-textview {
-  background-color: #fafbfb; }
-
-popover.osd, popover.magnifier,
+popover.osd, popover.magnifier, .csd popover.osd, .csd popover.magnifier,
 popover.background.osd,
-popover.background.magnifier, .osd {
+popover.background.magnifier, .csd popover.background.osd, .csd popover.background.magnifier, .osd {
   color: #BAC3CF;
   border: none;
   background-color: rgba(53, 57, 69, 0.95);
@@ -428,17 +428,11 @@ button {
     padding-left: 16px;
     padding-right: 16px; }
   button.text-button.image-button {
-    padding-left: 0;
-    padding-right: 0; }
-    button.text-button.image-button label:first-child {
-      padding-left: 12px;
-      padding-right: 0; }
-    button.text-button.image-button label:last-child {
-      padding-left: 0;
-      padding-right: 12px; }
-    button.text-button.image-button image {
-      padding-left: 6px;
-      padding-right: 6px; }
+    padding-left: 8px;
+    padding-right: 8px; }
+    button.text-button.image-button label {
+      padding-left: 8px;
+      padding-right: 8px; }
   .stack-switcher > button {
     outline-offset: -3px; }
     .stack-switcher > button > label {
@@ -1306,7 +1300,8 @@ treeview.view {
     treeview.view:disabled:selected {
       color: #97bfee; }
   treeview.view.separator {
-    min-height: 2px; }
+    min-height: 2px;
+    color: rgba(0, 0, 0, 0.1); }
   treeview.view.dnd {
     border-style: solid none;
     border-width: 1px;
@@ -1422,8 +1417,9 @@ menu,
     background-color: #ffffff; }
   menu menuitem,
   .menu menuitem {
-    padding: 4px;
+    min-height: 16px;
     min-width: 40px;
+    padding: 4px;
     border: solid transparent;
     border-width: 1px 0 1px 0; }
     menu menuitem:hover,
@@ -2207,9 +2203,8 @@ separator, .sidebar separator, .sidebar .view separator {
 list {
   background-color: #ffffff;
   border-color: #dcdfe3; }
-
-row {
-  padding: 2px; }
+  list row {
+    padding: 2px; }
 
 row.activatable.has-open-popup, row.activatable:hover {
   background-color: rgba(0, 0, 0, 0.05); }
@@ -2229,9 +2224,9 @@ row.activatable:selected:disabled {
   row.activatable:selected:disabled label {
     color: inherit; }
 
-row, row.activatable {
+row {
   transition: all 150ms cubic-bezier(0.25, 0.46, 0.45, 0.94); }
-  row:hover, row.activatable:hover {
+  row:hover {
     transition: none; }
 
 .app-notification {
@@ -2578,8 +2573,8 @@ button.color {
   border-color: #cfd6e6;
   background-color: white; }
 
-.context-menu, popover.touch-selection,
-popover.background.touch-selection {
+.context-menu, popover.touch-selection, .csd popover.touch-selection,
+popover.background.touch-selection, .csd popover.background.touch-selection {
   font: initial; }
 
 .monospace {
diff --git a/common/gtk-3.0/3.20/gtk-solid-dark.css b/common/gtk-3.0/3.20/gtk-solid-dark.css
index 20fb194..f2adfdd 100644
--- a/common/gtk-3.0/3.20/gtk-solid-dark.css
+++ b/common/gtk-3.0/3.20/gtk-solid-dark.css
@@ -59,6 +59,9 @@ textview text {
       color: rgba(255, 255, 255, 0.65);
       text-shadow: none; }
 
+textview {
+  background-color: #3c414e; }
+
 iconview {
   color: #D3DAE3;
   background-color: #404552; }
@@ -105,12 +108,9 @@ assistant .sidebar label.highlight {
   background-color: #5294E2;
   color: #ffffff; }
 
-textview {
-  background-color: #3c414e; }
-
-popover.osd, popover.magnifier,
+popover.osd, popover.magnifier, .csd popover.osd, .csd popover.magnifier,
 popover.background.osd,
-popover.background.magnifier, .osd {
+popover.background.magnifier, .csd popover.background.osd, .csd popover.background.magnifier, .osd {
   color: #BAC3CF;
   border: none;
   background-color: #353945;
@@ -429,17 +429,11 @@ button {
     padding-left: 16px;
     padding-right: 16px; }
   button.text-button.image-button {
-    padding-left: 0;
-    padding-right: 0; }
-    button.text-button.image-button label:first-child {
-      padding-left: 12px;
-      padding-right: 0; }
-    button.text-button.image-button label:last-child {
-      padding-left: 0;
-      padding-right: 12px; }
-    button.text-button.image-button image {
-      padding-left: 6px;
-      padding-right: 6px; }
+    padding-left: 8px;
+    padding-right: 8px; }
+    button.text-button.image-button label {
+      padding-left: 8px;
+      padding-right: 8px; }
   .stack-switcher > button {
     outline-offset: -3px; }
     .stack-switcher > button > label {
@@ -1307,7 +1301,8 @@ treeview.view {
     treeview.view:disabled:selected {
       color: #97bfee; }
   treeview.view.separator {
-    min-height: 2px; }
+    min-height: 2px;
+    color: rgba(0, 0, 0, 0.1); }
   treeview.view.dnd {
     border-style: solid none;
     border-width: 1px;
@@ -1423,8 +1418,9 @@ menu,
     background-color: #383C4A; }
   menu menuitem,
   .menu menuitem {
-    padding: 4px;
+    min-height: 16px;
     min-width: 40px;
+    padding: 4px;
     border: solid transparent;
     border-width: 1px 0 1px 0; }
     menu menuitem:hover,
@@ -2208,9 +2204,8 @@ separator, .sidebar separator, .sidebar .view separator {
 list {
   background-color: #404552;
   border-color: #2b2e39; }
-
-row {
-  padding: 2px; }
+  list row {
+    padding: 2px; }
 
 row.activatable.has-open-popup, row.activatable:hover {
   background-color: rgba(255, 255, 255, 0.03); }
@@ -2230,9 +2225,9 @@ row.activatable:selected:disabled {
   row.activatable:selected:disabled label {
     color: inherit; }
 
-row, row.activatable {
+row {
   transition: all 150ms cubic-bezier(0.25, 0.46, 0.45, 0.94); }
-  row:hover, row.activatable:hover {
+  row:hover {
     transition: none; }
 
 .app-notification {
@@ -2579,8 +2574,8 @@ button.color {
   border-color: #2b2e39;
   background-color: #505666; }
 
-.context-menu, popover.touch-selection,
-popover.background.touch-selection {
+.context-menu, popover.touch-selection, .csd popover.touch-selection,
+popover.background.touch-selection, .csd popover.background.touch-selection {
   font: initial; }
 
 .monospace {
diff --git a/common/gtk-3.0/3.20/gtk-solid-darker.css b/common/gtk-3.0/3.20/gtk-solid-darker.css
index ad518c2..c44bedd 100644
--- a/common/gtk-3.0/3.20/gtk-solid-darker.css
+++ b/common/gtk-3.0/3.20/gtk-solid-darker.css
@@ -59,6 +59,9 @@ textview text {
       color: rgba(255, 255, 255, 0.65);
       text-shadow: none; }
 
+textview {
+  background-color: #fafbfb; }
+
 iconview {
   color: #5c616c;
   background-color: #ffffff; }
@@ -105,12 +108,9 @@ assistant .sidebar label.highlight {
   background-color: #5294E2;
   color: #ffffff; }
 
-textview {
-  background-color: #fafbfb; }
-
-popover.osd, popover.magnifier,
+popover.osd, popover.magnifier, .csd popover.osd, .csd popover.magnifier,
 popover.background.osd,
-popover.background.magnifier, .osd {
+popover.background.magnifier, .csd popover.background.osd, .csd popover.background.magnifier, .osd {
   color: #BAC3CF;
   border: none;
   background-color: #353945;
@@ -428,17 +428,11 @@ button {
     padding-left: 16px;
     padding-right: 16px; }
   button.text-button.image-button {
-    padding-left: 0;
-    padding-right: 0; }
-    button.text-button.image-button label:first-child {
-      padding-left: 12px;
-      padding-right: 0; }
-    button.text-button.image-button label:last-child {
-      padding-left: 0;
-      padding-right: 12px; }
-    button.text-button.image-button image {
-      padding-left: 6px;
-      padding-right: 6px; }
+    padding-left: 8px;
+    padding-right: 8px; }
+    button.text-button.image-button label {
+      padding-left: 8px;
+      padding-right: 8px; }
   .stack-switcher > button {
     outline-offset: -3px; }
     .stack-switcher > button > label {
@@ -1306,7 +1300,8 @@ treeview.view {
     treeview.view:disabled:selected {
       color: #97bfee; }
   treeview.view.separator {
-    min-height: 2px; }
+    min-height: 2px;
+    color: rgba(0, 0, 0, 0.1); }
   treeview.view.dnd {
     border-style: solid none;
     border-width: 1px;
@@ -1422,8 +1417,9 @@ menu,
     background-color: #ffffff; }
   menu menuitem,
   .menu menuitem {
-    padding: 4px;
+    min-height: 16px;
     min-width: 40px;
+    padding: 4px;
     border: solid transparent;
     border-width: 1px 0 1px 0; }
     menu menuitem:hover,
@@ -2207,9 +2203,8 @@ separator, .sidebar separator, .sidebar .view separator {
 list {
   background-color: #ffffff;
   border-color: #dcdfe3; }
-
-row {
-  padding: 2px; }
+  list row {
+    padding: 2px; }
 
 row.activatable.has-open-popup, row.activatable:hover {
   background-color: rgba(0, 0, 0, 0.05); }
@@ -2229,9 +2224,9 @@ row.activatable:selected:disabled {
   row.activatable:selected:disabled label {
     color: inherit; }
 
-row, row.activatable {
+row {
   transition: all 150ms cubic-bezier(0.25, 0.46, 0.45, 0.94); }
-  row:hover, row.activatable:hover {
+  row:hover {
     transition: none; }
 
 .app-notification {
@@ -2578,8 +2573,8 @@ button.color {
   border-color: #cfd6e6;
   background-color: white; }
 
-.context-menu, popover.touch-selection,
-popover.background.touch-selection {
+.context-menu, popover.touch-selection, .csd popover.touch-selection,
+popover.background.touch-selection, .csd popover.background.touch-selection {
   font: initial; }
 
 .monospace {
diff --git a/common/gtk-3.0/3.20/gtk-solid.css b/common/gtk-3.0/3.20/gtk-solid.css
index a4a1e20..a2b762d 100644
--- a/common/gtk-3.0/3.20/gtk-solid.css
+++ b/common/gtk-3.0/3.20/gtk-solid.css
@@ -59,6 +59,9 @@ textview text {
       color: rgba(255, 255, 255, 0.65);
       text-shadow: none; }
 
+textview {
+  background-color: #fafbfb; }
+
 iconview {
   color: #5c616c;
   background-color: #ffffff; }
@@ -105,12 +108,9 @@ assistant .sidebar label.highlight {
   background-color: #5294E2;
   color: #ffffff; }
 
-textview {
-  background-color: #fafbfb; }
-
-popover.osd, popover.magnifier,
+popover.osd, popover.magnifier, .csd popover.osd, .csd popover.magnifier,
 popover.background.osd,
-popover.background.magnifier, .osd {
+popover.background.magnifier, .csd popover.background.osd, .csd popover.background.magnifier, .osd {
   color: #BAC3CF;
   border: none;
   background-color: #353945;
@@ -428,17 +428,11 @@ button {
     padding-left: 16px;
     padding-right: 16px; }
   button.text-button.image-button {
-    padding-left: 0;
-    padding-right: 0; }
-    button.text-button.image-button label:first-child {
-      padding-left: 12px;
-      padding-right: 0; }
-    button.text-button.image-button label:last-child {
-      padding-left: 0;
-      padding-right: 12px; }
-    button.text-button.image-button image {
-      padding-left: 6px;
-      padding-right: 6px; }
+    padding-left: 8px;
+    padding-right: 8px; }
+    button.text-button.image-button label {
+      padding-left: 8px;
+      padding-right: 8px; }
   .stack-switcher > button {
     outline-offset: -3px; }
     .stack-switcher > button > label {
@@ -1310,7 +1304,8 @@ treeview.view {
     treeview.view:disabled:selected {
       color: #97bfee; }
   treeview.view.separator {
-    min-height: 2px; }
+    min-height: 2px;
+    color: rgba(0, 0, 0, 0.1); }
   treeview.view.dnd {
     border-style: solid none;
     border-width: 1px;
@@ -1426,8 +1421,9 @@ menu,
     background-color: #ffffff; }
   menu menuitem,
   .menu menuitem {
-    padding: 4px;
+    min-height: 16px;
     min-width: 40px;
+    padding: 4px;
     border: solid transparent;
     border-width: 1px 0 1px 0; }
     menu menuitem:hover,
@@ -2211,9 +2207,8 @@ separator, .sidebar separator, .sidebar .view separator {
 list {
   background-color: #ffffff;
   border-color: #dcdfe3; }
-
-row {
-  padding: 2px; }
+  list row {
+    padding: 2px; }
 
 row.activatable.has-open-popup, row.activatable:hover {
   background-color: rgba(0, 0, 0, 0.05); }
@@ -2233,9 +2228,9 @@ row.activatable:selected:disabled {
   row.activatable:selected:disabled label {
     color: inherit; }
 
-row, row.activatable {
+row {
   transition: all 150ms cubic-bezier(0.25, 0.46, 0.45, 0.94); }
-  row:hover, row.activatable:hover {
+  row:hover {
     transition: none; }
 
 .app-notification {
@@ -2582,8 +2577,8 @@ button.color {
   border-color: #cfd6e6;
   background-color: white; }
 
-.context-menu, popover.touch-selection,
-popover.background.touch-selection {
+.context-menu, popover.touch-selection, .csd popover.touch-selection,
+popover.background.touch-selection, .csd popover.background.touch-selection {
   font: initial; }
 
 .monospace {
diff --git a/common/gtk-3.0/3.20/gtk.css b/common/gtk-3.0/3.20/gtk.css
index ea80786..bb19796 100644
--- a/common/gtk-3.0/3.20/gtk.css
+++ b/common/gtk-3.0/3.20/gtk.css
@@ -59,6 +59,9 @@ textview text {
       color: rgba(255, 255, 255, 0.65);
       text-shadow: none; }
 
+textview {
+  background-color: #fafbfb; }
+
 iconview {
   color: #5c616c;
   background-color: #ffffff; }
@@ -105,12 +108,9 @@ assistant .sidebar label.highlight {
   background-color: #5294E2;
   color: #ffffff; }
 
-textview {
-  background-color: #fafbfb; }
-
-popover.osd, popover.magnifier,
+popover.osd, popover.magnifier, .csd popover.osd, .csd popover.magnifier,
 popover.background.osd,
-popover.background.magnifier, .osd {
+popover.background.magnifier, .csd popover.background.osd, .csd popover.background.magnifier, .osd {
   color: #BAC3CF;
   border: none;
   background-color: rgba(53, 57, 69, 0.95);
@@ -428,17 +428,11 @@ button {
     padding-left: 16px;
     padding-right: 16px; }
   button.text-button.image-button {
-    padding-left: 0;
-    padding-right: 0; }
-    button.text-button.image-button label:first-child {
-      padding-left: 12px;
-      padding-right: 0; }
-    button.text-button.image-button label:last-child {
-      padding-left: 0;
-      padding-right: 12px; }
-    button.text-button.image-button image {
-      padding-left: 6px;
-      padding-right: 6px; }
+    padding-left: 8px;
+    padding-right: 8px; }
+    button.text-button.image-button label {
+      padding-left: 8px;
+      padding-right: 8px; }
   .stack-switcher > button {
     outline-offset: -3px; }
     .stack-switcher > button > label {
@@ -1310,7 +1304,8 @@ treeview.view {
     treeview.view:disabled:selected {
       color: #97bfee; }
   treeview.view.separator {
-    min-height: 2px; }
+    min-height: 2px;
+    color: rgba(0, 0, 0, 0.1); }
   treeview.view.dnd {
     border-style: solid none;
     border-width: 1px;
@@ -1426,8 +1421,9 @@ menu,
     background-color: #ffffff; }
   menu menuitem,
   .menu menuitem {
-    padding: 4px;
+    min-height: 16px;
     min-width: 40px;
+    padding: 4px;
     border: solid transparent;
     border-width: 1px 0 1px 0; }
     menu menuitem:hover,
@@ -2211,9 +2207,8 @@ separator, .sidebar separator, .sidebar .view separator {
 list {
   background-color: #ffffff;
   border-color: #dcdfe3; }
-
-row {
-  padding: 2px; }
+  list row {
+    padding: 2px; }
 
 row.activatable.has-open-popup, row.activatable:hover {
   background-color: rgba(0, 0, 0, 0.05); }
@@ -2233,9 +2228,9 @@ row.activatable:selected:disabled {
   row.activatable:selected:disabled label {
     color: inherit; }
 
-row, row.activatable {
+row {
   transition: all 150ms cubic-bezier(0.25, 0.46, 0.45, 0.94); }
-  row:hover, row.activatable:hover {
+  row:hover {
     transition: none; }
 
 .app-notification {
@@ -2582,8 +2577,8 @@ button.color {
   border-color: #cfd6e6;
   background-color: white; }
 
-.context-menu, popover.touch-selection,
-popover.background.touch-selection {
+.context-menu, popover.touch-selection, .csd popover.touch-selection,
+popover.background.touch-selection, .csd popover.background.touch-selection {
   font: initial; }
 
 .monospace {
diff --git a/common/gtk-3.0/3.20/sass/_common.scss b/common/gtk-3.0/3.20/sass/_common.scss
index d901b99..2027c32 100644
--- a/common/gtk-3.0/3.20/sass/_common.scss
+++ b/common/gtk-3.0/3.20/sass/_common.scss
@@ -77,7 +77,7 @@ textview text {
   selection:hover {
     @extend %selected_items;
   }
-  &.dim-label { 
+  &.dim-label {
     color: transparentize($text_color, 0.45);
 
     selection, selection:focus {
@@ -87,6 +87,10 @@ textview text {
   }
 }
 
+textview { // This will get overridden by .view, needed by gedit line numbers
+  background-color: mix($bg_color, $base_color, 50%);
+}
+
 iconview {
   color: $text_color;
   background-color: $base_color;
@@ -114,7 +118,7 @@ flowbox {
     &:selected {
       outline-offset: -2px;
 
-      @extend %selected_items
+      @extend %selected_items;
     }
   }
 }
@@ -146,20 +150,16 @@ assistant {
     &:dir(ltr) { border-right: 1px solid $borders_color; }
     &:dir(rtl) { border-left: 1px solid $borders_color; }
   }
+
   &.csd .sidebar { border-top-style: none; }
-  .sidebar label {
-    padding: 6px 12px;
-  }
+  .sidebar label { padding: 6px 12px; }
+
   .sidebar label.highlight {
     background-color: $selected_bg_color;
     color: $selected_fg_color;
   }
 }
 
-textview { // This will get overridden by .view, needed by gedit line numbers
-  background-color: mix($bg_color, $base_color, 50%);
-}
-
 %osd, .osd {
   color: $osd_fg_color;
   border: none;
@@ -433,27 +433,12 @@ button {
   }
 
   &.text-button.image-button {
-    // those buttons needs uneven horizontal padding, we want the icon side
-    // to have the image-button padding, while the text side the text-button
-    // one, so we're adding the missing padding to the label depending on
-    // its position inside the button
-    padding-left: 0;
-    padding-right: 0;
+    padding-left: 8px;
+    padding-right: 8px;
 
     label {
-      &:first-child {
-        padding-left: 12px;
-        padding-right: 0;
-      }
-      &:last-child {
-        padding-left: 0;
-        padding-right: 12px;
-      }
-    }
-
-    image {
-      padding-left: 6px;
-      padding-right: 6px;
+      padding-left: 8px;
+      padding-right: 8px;
     }
   }
 
@@ -728,6 +713,7 @@ modelbutton.flat arrow {
 button:link, button:visited {
   @extend %undecorated_button;
   @extend *:link;
+
   &:hover, &:active, &:checked {
     @extend %undecorated_button;
   }
@@ -1345,7 +1331,7 @@ treeview.view {
   &:selected {
     border-radius: 0;
     border-left-color: mix($selected_fg_color, $selected_bg_color, 50%);
-    border-top-color: transparentize($fg_color, 0.9);   // doesn't work unfortunatelly
+    border-top-color: transparentize($fg_color, 0.9);   // doesn't work unfortunately
 
     @extend %selected_items;
   }
@@ -1357,7 +1343,10 @@ treeview.view {
     }
   }
 
-  &.separator { min-height: 2px; }
+  &.separator {
+    min-height: 2px;
+    color: transparentize(black, 0.9);
+  }
 
   &.dnd {
     border-style: solid none;
@@ -1367,6 +1356,7 @@ treeview.view {
 
   &.expander {
     -gtk-icon-source: -gtk-icontheme('pan-end-symbolic');
+
     &:dir(rtl) { -gtk-icon-source: -gtk-icontheme('pan-end-symbolic-rtl'); }
 
     color: mix($fg_color, $base_color, 50%);
@@ -1378,9 +1368,7 @@ treeview.view {
       &:hover { color: $selected_fg_color; }
     }
 
-    &:checked {
-      -gtk-icon-source: -gtk-icontheme('pan-down-symbolic');
-    }
+    &:checked { -gtk-icon-source: -gtk-icontheme('pan-down-symbolic'); }
   }
 
   &.progressbar { // progress bar in treeviews
@@ -1466,7 +1454,7 @@ menubar,
     //background-color: opacify($header_bg_backdrop, 1);
   }
 
-  & > menuitem {
+  > menuitem {
     padding: 6px 8px;
     border: solid transparent;
     border-width: 0;
@@ -1504,8 +1492,9 @@ menu,
   }
 
   menuitem {
-    padding: 4px;
+    min-height: 16px;
     min-width: 40px;
+    padding: 4px;
     border: solid transparent;
     border-width: 1px 0 1px 0;
     &:hover {
@@ -1592,9 +1581,11 @@ popover.background {
     border-style: none;
     background-color: transparent;
   }
-  &.osd, &.magnifier { @extend %osd; }
 
-  &.touch-selection { @extend .context-menu }
+  &, .csd & {
+    &.osd, &.magnifier { @extend %osd; }
+    &.touch-selection { @extend .context-menu }
+  }
 }
 
 //touch selection handlebars for the Popover.osd above
@@ -1955,6 +1946,7 @@ checkbutton, radiobutton {
     &.text-button {
     padding: 1px 2px 4px;
     outline-offset: 0;
+
     &:disabled,
     &:disabled:active,
     &:disabled:indeterminate {
@@ -2162,7 +2154,6 @@ progressbar {
 // Level Bar
 //
 levelbar {
-
   block {
     min-width: 32px;
     min-height: 1px;
@@ -2277,13 +2268,12 @@ separator {
 list {
   background-color: $base_color;
   border-color: $borders_color;
-}
 
-row { padding: 2px; }
+  row { padding: 2px; }
+}
 
 row.activatable {
-
-  &.has-open-popup, // this is for indicathing which row generated a popover see https://bugzilla.gnome.org/show_bug.cgi?id=754411
+  &.has-open-popup,
   &:hover { background-color: if($variant == 'light', transparentize(black, 0.95), transparentize(white, 0.97)); }
 
   &:active { color: $fg_color; }
@@ -2308,7 +2298,7 @@ row:selected {
 }
 
 // transition
-row, row.activatable {
+row {
   transition: all 150ms $ease-out-quad;
   &:hover { transition: none; }
 }
@@ -2350,6 +2340,7 @@ expander {
     min-width: 16px;
     min-height: 16px;
     -gtk-icon-source: -gtk-icontheme('pan-end-symbolic');
+
     &:dir(rtl) { -gtk-icon-source: -gtk-icontheme('pan-end-symbolic-rtl'); }
     &:hover { color: lighten($fg_color,30%); } //only lightens the arrow
     &:checked { -gtk-icon-source: -gtk-icontheme('pan-down-symbolic'); }
@@ -2458,6 +2449,7 @@ filechooser {
 stacksidebar {
   row {
     padding: 10px 4px;
+
     > label {
       padding-left: 6px;
       padding-right: 6px;