From fb9db4e171778a63bd85ac6fde15b7acfdede2c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
Date: Sun, 19 Nov 2017 20:35:25 +0100
Subject: [PATCH] system: Align submenu labels with parent

All section titles use an icon, while all corresponding submenu items
are plain-text. As a result, labels in submenus aren't aligned with
the labels in the parent, which makes them harder to read and look
unbalanced. Address this by adding additional whitespace to submenu
items to account for the additional elements in the title.

https://bugzilla.gnome.org/show_bug.cgi?id=706191
---
 data/theme/gnome-shell-high-contrast.css | 8 ++++++++
 data/theme/gnome-shell-sass              | 2 +-
 data/theme/gnome-shell.css               | 8 ++++++++
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/data/theme/gnome-shell-high-contrast.css b/data/theme/gnome-shell-high-contrast.css
index 03a29f314..ff0ebcabe 100644
--- a/data/theme/gnome-shell-high-contrast.css
+++ b/data/theme/gnome-shell-high-contrast.css
@@ -987,6 +987,14 @@ StScrollBar {
   min-width: 21em; }
   .aggregate-menu .popup-menu-icon {
     padding: 0 4px; }
+  .aggregate-menu .popup-sub-menu .popup-menu-item :first-child:ltr {
+    /* 12px spacing + 2*4px padding */
+    padding-left: 20px;
+    margin-left: 1.09em; }
+  .aggregate-menu .popup-sub-menu .popup-menu-item :first-child:rtl {
+    /* 12px spacing + 2*4px padding */
+    padding-right: 20px;
+    margin-right: 1.09em; }
 
 .system-menu-action {
   color: #fff;
diff --git a/data/theme/gnome-shell-sass b/data/theme/gnome-shell-sass
index 32361ac69..57a2e5bfe 160000
--- a/data/theme/gnome-shell-sass
+++ b/data/theme/gnome-shell-sass
@@ -1 +1 @@
-Subproject commit 32361ac692945e4c2c3ff80d20a4b03649699828
+Subproject commit 57a2e5bfe179d9db1e05c3edaffdcb3fee307be0
diff --git a/data/theme/gnome-shell.css b/data/theme/gnome-shell.css
index f22a61ea6..61a78d379 100644
--- a/data/theme/gnome-shell.css
+++ b/data/theme/gnome-shell.css
@@ -987,6 +987,14 @@ StScrollBar {
   min-width: 21em; }
   .aggregate-menu .popup-menu-icon {
     padding: 0 4px; }
+  .aggregate-menu .popup-sub-menu .popup-menu-item :first-child:ltr {
+    /* 12px spacing + 2*4px padding */
+    padding-left: 20px;
+    margin-left: 1.09em; }
+  .aggregate-menu .popup-sub-menu .popup-menu-item :first-child:rtl {
+    /* 12px spacing + 2*4px padding */
+    padding-right: 20px;
+    margin-right: 1.09em; }
 
 .system-menu-action {
   color: #eeeeec;