[gnome-shell/wip/aday/standardise-text-styles: 17/17] adjust UI to new text styles
- From: Allan Day <allanday src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell/wip/aday/standardise-text-styles: 17/17] adjust UI to new text styles
- Date: Wed, 26 Jun 2019 15:11:48 +0000 (UTC)
commit 9ba46a01ea319621f8d428f7d9e77916c26a67ad
Author: Allan Day <allanpday gmail com>
Date: Wed Jun 26 14:52:09 2019 +0100
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 | 27 +++++++++++++++++++--------
3 files changed, 25 insertions(+), 13 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 fdef0b9d2..be590715b 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 ExtensionUtils = imports.misc.extensionUtils;
@@ -194,19 +194,30 @@ class InstallExtensionDialog extends ModalDialog.ModalDialog {
default: true
}]);
- let message = _("Download and install “%s” from extensions.gnome.org?").format(info.name);
+ let title_text = _("Install “%s”?").format(info.name);
- let box = new St.BoxLayout({ style_class: 'message-dialog-main-layout',
+ let description_text = _("“%s” will be downloaded and installed from
extensions.gnome.org.").format(info.name);
+
+ let mainContentLayout = new St.BoxLayout({ style_class: 'message-dialog-main-layout',
vertical: false });
- this.contentLayout.add(box);
+ this.contentLayout.add(mainContentLayout);
let gicon = new Gio.FileIcon({ file: Gio.File.new_for_uri(REPOSITORY_URL_BASE + info.icon) })
let icon = new St.Icon({ gicon: gicon });
- box.add(icon);
+ mainContentLayout.add(icon);
+
+ let dialogContent = new St.BoxLayout({ style_class: 'message-dialog-content',
+ vertical: true });
+
+ let title = new St.Label({ style_class: 'message-dialog-title headline',
+ text: title_text });
+ dialogContent.add(title);
- let label = new St.Label({ style_class: 'message-dialog-title headline',
- text: message });
- box.add(label);
+ let description = new St.Label({ text: description_text });
+ description.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
+ description.clutter_text.line_wrap = true;
+ dialogContent.add(description);
+ mainContentLayout.add(dialogContent);
}
_onCancelButtonPressed(button, event) {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]