Merge lp:~cjohnston/ubuntu/utopic/horizon/1308651 into lp:ubuntu/utopic/horizon

Proposed by Chris Johnston
Status: Merged
Approved by: James Page
Approved revision: 71
Merge reported by: James Page
Merged at revision: not available
Proposed branch: lp:~cjohnston/ubuntu/utopic/horizon/1308651
Merge into: lp:ubuntu/utopic/horizon
Diff against target: 54 lines (+34/-0)
3 files modified
debian/changelog (+7/-0)
debian/patches/fix-ubuntu-theme.patch (+26/-0)
debian/patches/series (+1/-0)
To merge this branch: bzr merge lp:~cjohnston/ubuntu/utopic/horizon/1308651
Reviewer Review Type Date Requested Status
James Page Approve
Review via email: mp+235741@code.launchpad.net

Commit message

debian/patches/fix-ubuntu-theme.patch: Fix Ubuntu theme dropdown and confirmation button. (LP: #1308651)

Description of the change

Fixes dropdown text not being visible and confirmation button text coloring.

To post a comment you must log in.
71. By Chris Johnston

debian/patches/fix-ubuntu-theme.patch: Fix Ubuntu theme dropdown and confirmation button. (LP: #1308651)

Revision history for this message
James Page (james-page) :
review: Approve
Revision history for this message
James Page (james-page) wrote :

I'll merge this with my next upload - thanks!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2014-07-25 11:39:09 +0000
3+++ debian/changelog 2014-09-24 03:33:38 +0000
4@@ -1,3 +1,10 @@
5+horizon (1:2014.2~b2-0ubuntu2) utopic; urgency=medium
6+
7+ * debian/patches/fix-ubuntu-theme.patch: Fix Ubuntu theme dropdown and
8+ confirmation button. (LP: #1308651)
9+
10+ -- Chris Johnston <chrisjohnston@ubuntu.com> Tue, 23 Sep 2014 23:24:19 -0400
11+
12 horizon (1:2014.2~b2-0ubuntu1) utopic; urgency=medium
13
14 * New upstream release.
15
16=== added file 'debian/patches/fix-ubuntu-theme.patch'
17--- debian/patches/fix-ubuntu-theme.patch 1970-01-01 00:00:00 +0000
18+++ debian/patches/fix-ubuntu-theme.patch 2014-09-24 03:33:38 +0000
19@@ -0,0 +1,26 @@
20+Index: test2/debian/theme/css/ubuntu.css
21+===================================================================
22+--- test2.orig/debian/theme/css/ubuntu.css
23++++ test2/debian/theme/css/ubuntu.css
24+@@ -1805,7 +1805,7 @@ table .span12 {
25+ .btn-inverse,
26+ .btn-inverse:hover {
27+ text-shadow: 0 -1px 0 rgba(0,0,0,.25);
28+- color: #ffffff;
29++ color: #ffffff !important;
30+ }
31+ .btn-primary.active,
32+ .btn-warning.active,
33+@@ -3868,6 +3868,12 @@ dt {
34+ line-height: 20px;
35+ font-size: 13px !important;
36+ }
37++#editor_list li > a {
38++ color: #555555;
39++}
40++#editor_list li > a:hover {
41++ color: #ffffff;
42++}
43+ .page-header {
44+ margin: 0 0 5px 0;
45+ padding: 0 0 5px 0;
46
47=== modified file 'debian/patches/series'
48--- debian/patches/series 2014-07-25 11:39:09 +0000
49+++ debian/patches/series 2014-09-24 03:33:38 +0000
50@@ -6,3 +6,4 @@
51
52 #fix-ubuntu-tests.patch
53 ubuntu_settings.patch
54+fix-ubuntu-theme.patch

Subscribers

People subscribed via source and target branches