From 34e9513e1fd4457a202d4174e98510e302456d0f Mon Sep 17 00:00:00 2001
From: Allan Day <allanpday@gmail.com>
Date: Wed, 26 Jun 2019 14:52:09 +0100
Subject: [PATCH] adjust UI to new text styles

With the new text styles, some UI needs to adjusted, primarily to
accommodate larger heading text.
---
 data/theme/gnome-shell-sass/_common.scss | 5 +++--
 js/ui/components/networkAgent.js         | 6 +++---
 js/ui/extensionDownloader.js             | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/data/theme/gnome-shell-sass/_common.scss b/data/theme/gnome-shell-sass/_common.scss
index 3d0a62125..f0a2b8d11 100644
--- a/data/theme/gnome-shell-sass/_common.scss
+++ b/data/theme/gnome-shell-sass/_common.scss
@@ -252,6 +252,7 @@ StScrollBar {
   }
 
   .end-session-dialog-layout {
+    spacing: 12px;
     padding-left: 17px;
     &:rtl { padding-right: 17px; }
   }
@@ -1092,10 +1093,10 @@ StScrollBar {
 
           .message-secondary-bin > .event-time {
             @extend %caption;
-            color: $fg_color;
+            color: darken($fg_color,40%);
             /* HACK: the label should be baseline-aligned with a 1em label,
                      fake this with some bottom padding */
-            padding-bottom: 0.13em;
+           padding-bottom: 1px;
           }
 
           .message-secondary-bin > StIcon {
diff --git a/js/ui/components/networkAgent.js b/js/ui/components/networkAgent.js
index 48bbd308f..486c04f46 100644
--- a/js/ui/components/networkAgent.js
+++ b/js/ui/components/networkAgent.js
@@ -310,7 +310,7 @@ class NetworkSecretDialog extends ModalDialog.ModalDialog {
         case '802-11-wireless':
             wirelessSetting = this._connection.get_setting_wireless();
             ssid = NM.utils_ssid_to_utf8(wirelessSetting.get_ssid().get_data());
-            content.title = _("Authentication required by wireless network");
+            content.title = _("Authentication required");
             content.message = _("Passwords or encryption keys are required to access the wireless network “%s”.").format(ssid);
             this._getWirelessSecrets(content.secrets, wirelessSetting);
             break;
@@ -338,7 +338,7 @@ class NetworkSecretDialog extends ModalDialog.ModalDialog {
             // fall through
         case 'cdma':
         case 'bluetooth':
-            content.title = _("Mobile broadband network password");
+            content.title = _("Mobile broadband password");
             content.message = _("A password is required to connect to “%s”.").format(connectionSetting.get_id());
             this._getMobileSecrets(content.secrets, connectionType);
             break;
@@ -683,7 +683,7 @@ var NetworkAgent = class {
         case '802-11-wireless':
             let wirelessSetting = connection.get_setting_wireless();
             let ssid = NM.utils_ssid_to_utf8(wirelessSetting.get_ssid().get_data());
-            title = _("Authentication required by wireless network");
+            title = _("Authentication required");
             body = _("Passwords or encryption keys are required to access the wireless network “%s”.").format(ssid);
             break;
         case '802-3-ethernet':
diff --git a/js/ui/extensionDownloader.js b/js/ui/extensionDownloader.js
index 184db2464..d57aa293d 100644
--- a/js/ui/extensionDownloader.js
+++ b/js/ui/extensionDownloader.js
@@ -1,6 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const { Clutter, Gio, GLib, GObject, Soup, St } = imports.gi;
+const { Clutter, Gio, GLib, GObject, Pango, Soup, St } = imports.gi;
 
 const Config = imports.misc.config;
 const Dialog = imports.ui.dialog;