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

[Chris Johnston]

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

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

[lp:~cjohnston/ubuntu/utopic/horizon/1308651]

71. By Chris Johnston on 2014-09-24

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

[James Page (james-page)]

review: Approve

[James Page (james-page)]

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

=== modified file 'debian/changelog'
--- debian/changelog	2014-07-25 11:39:09 +0000
+++ debian/changelog	2014-09-24 03:33:38 +0000
@@ -1,3 +1,10 @@
+horizon (1:2014.2~b2-0ubuntu2) utopic; urgency=medium
+
+  * debian/patches/fix-ubuntu-theme.patch: Fix Ubuntu theme dropdown and
+    confirmation button. (LP: #1308651)
+
+ -- Chris Johnston <[e-mail]>  Tue, 23 Sep 2014 23:24:19 -0400
+
 horizon (1:2014.2~b2-0ubuntu1) utopic; urgency=medium
 
   * New upstream release.
 
=== added file 'debian/patches/fix-ubuntu-theme.patch'
--- debian/patches/fix-ubuntu-theme.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/fix-ubuntu-theme.patch	2014-09-24 03:33:38 +0000
@@ -0,0 +1,26 @@
+Index: test2/debian/theme/css/ubuntu.css
+===================================================================
+--- test2.orig/debian/theme/css/ubuntu.css
++++ test2/debian/theme/css/ubuntu.css
+@@ -1805,7 +1805,7 @@ table .span12 {
+ .btn-inverse,
+ .btn-inverse:hover {
+   text-shadow: 0 -1px 0 rgba(0,0,0,.25);
+-  color: #ffffff;
++  color: #ffffff !important;
+ }
+ .btn-primary.active,
+ .btn-warning.active,
+@@ -3868,6 +3868,12 @@ dt {
+   line-height: 20px;
+   font-size: 13px !important;
+ }
++#editor_list li > a {
++  color: #555555;
++}
++#editor_list li > a:hover {
++  color: #ffffff;
++}
+ .page-header {
+   margin: 0 0 5px 0;
+   padding: 0 0 5px 0;
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2014-07-25 11:39:09 +0000
+++ debian/patches/series	2014-09-24 03:33:38 +0000
@@ -6,3 +6,4 @@
 
 #fix-ubuntu-tests.patch
 ubuntu_settings.patch
+fix-ubuntu-theme.patch