Merge remote-tracking branch 'upstream/master'

3 files changed, 18 insertions, 7 deletions

diff --git a/common/gtk-3.0/3.20/sass/_applications.scss b/common/gtk-3.0/3.20/sass/_applications.scss
index 7f1012d..9697e9d 100644
--- a/common/gtk-3.0/3.20/sass/_applications.scss
+++ b/common/gtk-3.0/3.20/sass/_applications.scss
@@ -502,6 +502,14 @@ button.documents-favorite:active:hover {
 }
 
 //
+// Gnome Tweak Tool
+//
+.tweak-categories,
+.tweak-category:not(:selected):not(:hover) {
+  background-image: _solid($base_color);
+}
+
+//
 // Transmission
 //
 .tr-workarea undershoot,
diff --git a/common/gtk-3.0/3.20/sass/_common.scss b/common/gtk-3.0/3.20/sass/_common.scss
index 8b0ec66..9671ae6 100644
--- a/common/gtk-3.0/3.20/sass/_common.scss
+++ b/common/gtk-3.0/3.20/sass/_common.scss
@@ -939,10 +939,10 @@ toolbar {
   //&:backdrop { background-color: opacify($header_bg_backdrop, 1); }
 
   separator { @extend %header_separator; }
-
-  @extend %header_widgets;
 }
 
+.primary-toolbar { @extend %header_widgets; }
+
 .inline-toolbar {
   @extend toolbar;
   background-color: darken($bg_color, 3%);
diff --git a/common/gtk-3.0/3.20/sass/_lightdm.scss b/common/gtk-3.0/3.20/sass/_lightdm.scss
index 0b91ff2..a9ab2fd 100644
--- a/common/gtk-3.0/3.20/sass/_lightdm.scss
+++ b/common/gtk-3.0/3.20/sass/_lightdm.scss
@@ -6,11 +6,14 @@
   box-shadow: inset 0 -1px darken($panel_bg, 7%);
 
   // the menubars/menus of the panel, i.e. indicators
-  menubar,
-  menubar > menuitem {
-    background-color: transparent;
-    color: $panel_fg;
-    font-weight: bold;
+  menubar {
+    padding-left: 5px;
+
+    &, > menuitem {
+      background-color: transparent;
+      color: $panel_fg;
+      font-weight: bold;
+    }
   }
 
   menubar menuitem:disabled {