Merge lp:~jakedahn/horizon/ie-fixes into lp:~devcamcar/horizon/trunk

Proposed by Jake Dahn
Status: Merged
Approved by: Devin Carlen
Approved revision: 9
Merged at revision: 12
Proposed branch: lp:~jakedahn/horizon/ie-fixes
Merge into: lp:~devcamcar/horizon/trunk
Diff against target: 158 lines (+25/-95)
2 files modified
media/dashboard/css/ie7.css (+12/-82)
media/dashboard/css/openstack.css (+13/-13)
To merge this branch: bzr merge lp:~jakedahn/horizon/ie-fixes
Reviewer Review Type Date Requested Status
Devin Carlen Approve
Review via email: mp+48100@code.launchpad.net

This proposal supersedes a proposal from 2011-02-01.

Description of the change

Re-factored some of the main css, and fixed a bunch of Internet Explorer display issues. It should now be compatible with IE7+.

To post a comment you must log in.
Revision history for this message
Devin Carlen (devcamcar) wrote : Posted in a previous version of this proposal

Please add description and commit message for this proposal

review: Needs Fixing
Revision history for this message
Devin Carlen (devcamcar) wrote :

approve

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'media/dashboard/css/ie7.css'
2--- media/dashboard/css/ie7.css 2011-01-12 21:43:31 +0000
3+++ media/dashboard/css/ie7.css 2011-02-01 01:31:34 +0000
4@@ -1,85 +1,15 @@
5-#home_login input[type="submit"] { border: none !important; }
6-#resources.block h3 {
7- width: 329px !important;
8-}
9-
10-#frm_launch input[type="submit"]{
11- margin-right: -2px !important;
12-}
13-
14-input.create, input.attach {
15- margin-right: -11px !important;
16-}
17-.dash_block .errorlist {
18- width: 282px !important;
19- padding-left: 20px !important;
20-}
21-
22-#lnk_board, #lnk_wiki {
23- padding-top: 20px !important;
24-}
25-
26-h1 a{position:relative !important;}
27-
28-#preview {
29- margin-top: -13px !important;
30-}
31-
32-/*#projects .project.active {
33- height: 180px;
34- display: block;
35- filter: alpha(opacity=100);
36-}
37-
38-#projects .project.inactive {
39- height: 0;
40- filter: alpha(opacity=0);
41-}*/
42-
43-.ft_info {
44- margin-top: 0;
45- float: right;
46-}
47-
48-#home_login .error, #home_login .errorlist {
49- background: #ef767d !important;
50- border-top: 1px solid #f63e42 !important;
51- border-bottom: 1px solid #f63e42 !important;
52-
53-}
54-
55-#radar_service {margin-bottom: 50px !important; float: left;}
56-
57-#header h1 a sup {
58- margin-right: 0px;
59-}
60-
61-#user_info ul li {
62- list-style: disc inside;
63- margin-bottom: 2px;
64-}
65-
66+h1, h1 a, h1 span { position: relative !important; }
67+#content_wrap {margin-top: 15px;}
68 .image_detail, .instance_detail { position: relative; }
69-
70-a.launch {
71- margin-left: 10px !important;
72- margin-top: 0px;
73-}
74-
75-.image_detail a.launch {
76- margin-left: 31px !important;
77-}
78-
79-a#edit_image_link, a#edit_instance_link {
80- margin-left: -40px;
81-}
82-
83-.image_detail .image_privacy input, .image_detail .delete input {
84- margin-left: -15px;
85- margin-top: -10px;
86-}
87-
88-.post_status {
89- width: 20px !important;
90+td#actions { padding-bottom: 10px !important; }
91+td#actions input { width: 80px; }
92+#edit_image_link:hover { color: #1d77ff; }
93+input.private { margin-right: -30px !important; margin-left: -17px !important;}
94+#user_info li { list-style: disc !important; }
95+input.create, input.attach, input#launch_image { margin-right: 4px !important; }
96+
97+#edit_image_link {
98+ margin-left: -180px !important;
99+ margin-top: 20px !important;
100 }
101
102
103=== modified file 'media/dashboard/css/openstack.css'
104--- media/dashboard/css/openstack.css 2011-01-17 09:59:30 +0000
105+++ media/dashboard/css/openstack.css 2011-02-01 01:31:34 +0000
106@@ -375,16 +375,6 @@
107 margin-bottom: 11px;
108 }
109
110-.dash_block form select, .dash_block form textarea, .dash_block form input[type="text"] {
111- width: 265px;
112-}
113-
114-.dash_block form input[type="submit"] {
115- float: right;
116- margin-right: 16px;
117-}
118-
119-
120 /* Tables */
121
122 #content table {
123@@ -537,7 +527,7 @@
124 font-size: 10px;
125 margin-left: -45px;
126 color: #579aff;
127- margin-top: -30px;
128+ margin-top: -25px;
129 }
130
131 #edit_image_link:hover {
132@@ -722,9 +712,15 @@
133 }
134
135 /* forms */
136-.dash_block input[type="text"] {
137+.dash_block form textarea, .dash_block form input[type="text"] {
138 padding: 5px;
139- width: 264px;
140+ width: 250px;
141+}
142+.dash_block form select { width: 264px;}
143+.dash_block form input[type="submit"] {
144+ float: right;
145+ margin-right: 23px;
146+ margin-top: 15px;
147 }
148
149 .dash_block input.create, .dash_block input.attach {
150@@ -748,3 +744,7 @@
151 padding: 5px;
152 margin-bottom: 5px;
153 }
154+
155+form.edit_instance input[type="submit"], form.edit_image input[type="submit"] {
156+ margin-right: 4px;
157+}
158\ No newline at end of file

Subscribers

People subscribed via source and target branches

to all changes:
to status/vote changes: