[gnome-shell] accessibility/keyboard: Align the panelMenu button style

[Marge Bot <marge-bot src gnome org>]

commit ed628b90d7f8a66bb0b2850566c40c62210ae4c3
Author: Razze <razzeee gmail com>
Date:   Tue Feb 2 01:51:15 2021 +0100

    accessibility/keyboard: Align the panelMenu button style
    
    This get's rid of the single-indicator introduced in one of the latest
    commits. This was causing the accessibility pill in the top panel
     to have different padding from the keyboard layout pill.
    
    Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1615>

 data/theme/gnome-shell-sass/widgets/_panel.scss | 12 ++++++------
 js/ui/status/accessibility.js                   |  2 +-
 js/ui/status/keyboard.js                        |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/data/theme/gnome-shell-sass/widgets/_panel.scss b/data/theme/gnome-shell-sass/widgets/_panel.scss
index e751a94b65..bc526f0fe7 100644
--- a/data/theme/gnome-shell-sass/widgets/_panel.scss
+++ b/data/theme/gnome-shell-sass/widgets/_panel.scss
@@ -72,16 +72,16 @@ $panel_transition_duration: 250ms; // same as the overview transition duration
       }
     }
 
-    // single indicator
-    .single-indicator {
-      margin-left: $base_margin + 3px;
-      margin-right: $base_margin + 3px;
-    }
-
     // status area icons
     .system-status-icon {
       icon-size: $base_icon_size;
       padding: $base_padding - 1px;
+      margin: 0 $base_margin;
+    }
+
+    .panel-status-indicators-box .system-status-icon,
+    .panel-status-menu-box .system-status-icon {
+      margin: 0;
     }
 
     // app menu icon
diff --git a/js/ui/status/accessibility.js b/js/ui/status/accessibility.js
index f5dc77efc4..a0513f68c8 100644
--- a/js/ui/status/accessibility.js
+++ b/js/ui/status/accessibility.js
@@ -35,7 +35,7 @@ class ATIndicator extends PanelMenu.Button {
         super._init(0.5, _("Accessibility"));
 
         this.add_child(new St.Icon({
-            style_class: 'single-indicator system-status-icon',
+            style_class: 'system-status-icon',
             icon_name: 'preferences-desktop-accessibility-symbolic',
         }));
 
diff --git a/js/ui/status/keyboard.js b/js/ui/status/keyboard.js
index f79fc54447..e34b603134 100644
--- a/js/ui/status/keyboard.js
+++ b/js/ui/status/keyboard.js
@@ -829,7 +829,7 @@ class InputSourceIndicator extends PanelMenu.Button {
         this._menuItems = {};
         this._indicatorLabels = {};
 
-        this._container = new InputSourceIndicatorContainer({ style_class: 'single-indicator' });
+        this._container = new InputSourceIndicatorContainer({ style_class: 'system-status-icon' });
         this.add_child(this._container);
 
         this._propSeparator = new PopupMenu.PopupSeparatorMenuItem();