Merge ~3v1n0/ubuntu/+source/gnome-shell:ubuntu/bionic-theming-fixes into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/bionic

Proposed by Marco Trevisan (Treviño)
Status: Merged
Merged at revision: 42c4c95026391cfc7eca905378d7fa1de3f9da86
Proposed branch: ~3v1n0/ubuntu/+source/gnome-shell:ubuntu/bionic-theming-fixes
Merge into: ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/bionic
Diff against target: 42 lines (+10/-2)
2 files modified
debian/changelog (+4/-1)
debian/ubuntu-session-mods/ubuntu.css (+6/-1)
Reviewer Review Type Date Requested Status
Didier Roche-Tolomelli Approve
Review via email: mp+356023@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

Please ensure the bugs are SRU-able. LGTM otherwise.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/debian/changelog b/debian/changelog
index 610ea63..0ce4a7d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,11 @@ gnome-shell (3.28.3-0ubuntu0.18.04.3) UNRELEASED; urgency=medium
6 d/p/ubuntu/search-call-XUbuntuCancel-method-on-providers-when-no-dat.patch:6 d/p/ubuntu/search-call-XUbuntuCancel-method-on-providers-when-no-dat.patch:
7 - Add support for cancelling remote search providers when the overlay7 - Add support for cancelling remote search providers when the overlay
8 is closed (and actually stop searches when requested from UI, LP: #1756826)8 is closed (and actually stop searches when requested from UI, LP: #1756826)
9 * debian/ubuntu.css:
10 - use defined color for menu separators (LP: #1739931)
11 - set StEntry minimun height to work properly with Ubuntu font (LP: #1743058)
912
10 -- Marco Trevisan (Treviño) <marco@ubuntu.com> Wed, 05 Sep 2018 14:31:58 +020013 -- Marco Trevisan (Treviño) <marco@ubuntu.com> Wed, 03 Oct 2018 00:50:42 +0200
1114
12gnome-shell (3.28.3-0ubuntu0.18.04.2) bionic; urgency=medium15gnome-shell (3.28.3-0ubuntu0.18.04.2) bionic; urgency=medium
1316
diff --git a/debian/ubuntu-session-mods/ubuntu.css b/debian/ubuntu-session-mods/ubuntu.css
index da34f04..4bb58e4 100644
--- a/debian/ubuntu-session-mods/ubuntu.css
+++ b/debian/ubuntu-session-mods/ubuntu.css
@@ -519,7 +519,7 @@ StScrollBar {
519 height: 1px;519 height: 1px;
520 margin: 6px 64px;520 margin: 6px 64px;
521 background-color: transparent;521 background-color: transparent;
522 border-color: #3a3a34;522 border-color: #2c2c28;
523 border-bottom-width: 1px;523 border-bottom-width: 1px;
524 border-bottom-style: solid; }524 border-bottom-style: solid; }
525525
@@ -1911,6 +1911,11 @@ stage {
1911 font-family: Ubuntu, Cantarell, Sans-Serif;1911 font-family: Ubuntu, Cantarell, Sans-Serif;
1912}1912}
19131913
1914/* Set minimum height as per Ubuntu font usage, fixes password entries (LP: #1743058) */
1915StEntry {
1916 min-height: 19px;
1917}
1918
1914/* switch colors */1919/* switch colors */
1915.toggle-switch-us:checked {1920.toggle-switch-us:checked {
1916 background-image: url("ubuntu-toggle-on-us.svg");1921 background-image: url("ubuntu-toggle-on-us.svg");

Subscribers

People subscribed via source and target branches