OpenStack Dashboard (Horizon)

Merge lp:~cjohnston/horizon/icehouse-1308651 into lp:~ubuntu-server-dev/horizon/icehouse

  1. icehouse-1308651
  2. Merge into icehouse
Proposed by Chris Johnston
Status: Merged
Merged at revision: 198
Proposed branch: lp:~cjohnston/horizon/icehouse-1308651
Merge into: lp:~ubuntu-server-dev/horizon/icehouse
Diff against target: 48 lines (+14/-2)
2 files modified
debian/changelog (+6/-0)
debian/theme/css/ubuntu.css (+8/-2)
To merge this branch: bzr merge lp:~cjohnston/horizon/icehouse-1308651
Reviewer Review Type Date Requested Status
Corey Bryant Approve
Ubuntu Server Developers Pending
Review via email: mp+235978@code.launchpad.net

Commit message

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.
lp:~cjohnston/horizon/icehouse-1308651 updated
199. By Chris Johnston

Fix issue where danger text isn't important

Revision history for this message
Corey Bryant (corey.bryant) wrote :

Thanks Chris. Looks good to me and I've tested with the patch successfully.

review: Approve

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-08-11 13:29:46 +0000
3+++ debian/changelog 2014-09-25 21:21:42 +0000
4@@ -1,3 +1,9 @@
5+horizon (1:2014.1.2-0ubuntu2) trusty; urgency=medium
6+
7+ * Fix Ubuntu theme dropdown and confirmation button. (LP: #1308651)
8+
9+ -- Chris Johnston <chrisjohnston@ubuntu.com> Thu, 25 Sep 2014 11:14:48 -0400
10+
11 horizon (1:2014.1.2-0ubuntu1) trusty; urgency=medium
12
13 [ Corey Bryant ]
14
15=== modified file 'debian/theme/css/ubuntu.css'
16--- debian/theme/css/ubuntu.css 2014-03-28 14:24:09 +0000
17+++ debian/theme/css/ubuntu.css 2014-09-25 21:21:42 +0000
18@@ -1805,7 +1805,7 @@
19 .btn-inverse,
20 .btn-inverse:hover {
21 text-shadow: 0 -1px 0 rgba(0,0,0,.25);
22- color: #ffffff;
23+ color: #ffffff !important;
24 }
25 .btn-primary.active,
26 .btn-warning.active,
27@@ -3868,6 +3868,12 @@
28 line-height: 20px;
29 font-size: 13px !important;
30 }
31+#editor_list li > a {
32+ color: #555555;
33+}
34+#editor_list li > a:hover {
35+ color: #ffffff;
36+}
37 .page-header {
38 margin: 0 0 5px 0;
39 padding: 0 0 5px 0;
40@@ -4907,7 +4913,7 @@
41 background-color: #cdcdcd;
42 }
43 .dropdown-menu .btn.btn-danger {
44- color: #c43c35;
45+ color: #c43c35 !important;
46 }
47 .dropdown-menu .btn.btn-danger:hover {
48 background-color: #f6e0df;

Subscribers

People subscribed via source and target branches