Merge lp:~tblue/quam-plures/bug12-fix_toolbar_colors into lp:quam-plures

Proposed by Tilman Blumenbach
Status: Merged
Merged at revision: 7626
Proposed branch: lp:~tblue/quam-plures/bug12-fix_toolbar_colors
Merge into: lp:quam-plures
Diff against target: 188 lines (+64/-30)
1 file modified
qp_rsc/css/basic.css (+64/-30)
To merge this branch: bzr merge lp:~tblue/quam-plures/bug12-fix_toolbar_colors
Reviewer Review Type Date Requested Status
EdB Approve
Review via email: mp+73814@code.launchpad.net

Description of the change

See http://bugs.quamplures.net/cgi-bin/show_bug.cgi?id=12

Fixes issues with toolbar colors in Opera by "hardcoding" them instead of using the (deprecated) CSS2 system color names.

To post a comment you must log in.
Revision history for this message
EdB (edb) wrote :

downloading now, sorry for the delay, will test and review and report back.

Revision history for this message
EdB (edb) wrote :

Approving even though the comment in the css file is pure bloat. I mean, it is cool info, but there is no reason at all to send that info to every visitor.

Anyway looks good works pretty much as expected so yay :)

Slight color diffs for me (FF 3.foo.bar), which is a good thing. It if really does blend in with the browser frame stuff then it kinda isn't obviously part of the pages.

I'll do a handful of merges this weekend.

review: Approve
Revision history for this message
Tilman Blumenbach (tblue) wrote :

> Approving even though the comment in the css file is pure bloat. I mean, it is cool info, but there is no reason at all to send that info to every visitor.

I knew you would say that, but I think it's useful info for us developers. It will get stripped out by minify anyway (I'll work on including that soon).

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'qp_rsc/css/basic.css'
2--- qp_rsc/css/basic.css 2011-08-04 18:00:51 +0000
3+++ qp_rsc/css/basic.css 2011-09-02 13:51:18 +0000
4@@ -1,4 +1,39 @@
5-/* Obviously, this file no longer contains only basic styles */
6+/* Obviously, this file no longer contains only basic styles.
7+ *
8+ * For the toolbar, we do not use the system colors defined by CSS2 as they are
9+ * deprecated in CSS3 and don't seem to work correctly in Opera. Instead, we use
10+ * the following values (taken from Firefox 6.0.1 which probably uses the standard
11+ * GTK+ theme colors or something):
12+ *
13+ * ActiveBorder: #FFFFFF
14+ * ActiveCaption: #DCDAD5
15+ * AppWorkspace: #DCDAD5
16+ * Background: #DCDAD5
17+ * ButtonFace: #DCDAD5
18+ * ButtonHighlight: #FFFFFF
19+ * ButtonShadow: #9E9A91
20+ * ButtonText: #000000
21+ * CaptionText: #000000
22+ * GrayText: #757575
23+ * Highlight: #4B6983
24+ * HighlightText: #FFFFFF
25+ * InactiveBorder: #DCDAD5
26+ * InactiveCaption: #DCDAD5
27+ * InactiveCaptionText: #757575
28+ * InfoBackground: #EEE1B3
29+ * InfoText: #000000
30+ * Menu: #DCDAD5
31+ * MenuText: #000000
32+ * Scrollbar: #C4C2BD
33+ * ThreeDDarkShadow: #000000
34+ * ThreeDFace: #DCDAD5
35+ * ThreeDHighlight: #FFFFFF
36+ * ThreeDLightShadow: #DCDAD5
37+ * ThreeDShadow: #9E9A91
38+ * Window: #DCDAD5
39+ * WindowFrame: #DCDAD5
40+ * WindowText: #000000
41+ */
42
43 @import url("basic_styles.css"); /* Import the REAL basic styles */
44
45@@ -105,13 +140,12 @@
46 * any too general styles a template may want to bring in for its own body/general display.
47 */
48 div#toolbar {
49- background-color: ThreeDFace;
50- color: ButtonText;
51- border-top: 1px solid ThreeDHighlight;
52- border-bottom: 1px solid ThreeDShadow;
53+ background-color: #DCDAD5;
54+ color: #000000;
55+ border-top: 1px solid #FFFFFF;
56+ border-bottom: 1px solid #9E9A91;
57 text-align: left;
58 margin: 0;
59- /* font: menu; /* -- poorly supported */
60 font-size: 11px;
61 font-family: "Microsoft sans serif", sans-serif, Arial, Helvetica;
62 position: fixed;
63@@ -201,11 +235,11 @@
64 margin-bottom: 1em;
65 }
66 .sf-menu a {
67- border: 1px solid ThreeDFace;
68- background-color: ThreeDFace;
69+ border: 1px solid #DCDAD5;
70+ background-color: #DCDAD5;
71 padding: 3px 1ex; /* .5em need to macth global height above */
72 text-decoration:none;
73- color: ButtonText;
74+ color: #000000;
75 }
76 .sf-menu-right a {
77 padding: 3px 1ex 3px; /* .5em need to macth global height above */
78@@ -217,7 +251,7 @@
79 /* visited pseudo selector so IE6 applies text colour*/
80 .sf-menu a,
81 .sf-menu a:visited {
82- color: ButtonText;
83+ color: #000000;
84 }
85 .sf-menu li {
86 /* background: #0ff; */
87@@ -225,19 +259,19 @@
88 .sf-menu li ul {
89 }
90 .sf-menu li li {
91- background: ThreeDFace; /* IE6 */
92+ background: #DCDAD5; /* IE6 */
93 }
94 .sf-menu li li a {
95 padding: 6px 2ex;
96 border: none;
97- border-left: 1px solid ThreeDHighlight;
98- border-right: 1px solid ThreeDShadow;
99+ border-left: 1px solid #FFFFFF;
100+ border-right: 1px solid #9E9A91;
101 }
102 .sf-menu li li:first-child > a {
103- border-top: 1px solid ThreeDHighlight;
104+ border-top: 1px solid #FFFFFF;
105 }
106 .sf-menu li li:last-child > a {
107- border-bottom: 1px solid ThreeDShadow;
108+ border-bottom: 1px solid #9E9A91;
109 }
110 .sf-menu li.separator {
111 padding: 0;
112@@ -250,7 +284,7 @@
113 margin: 0;
114 }
115 .sf-menu li.separator a:hover {
116- background-color: ThreeDFace;
117+ background-color: #DCDAD5;
118 }
119 .sf-menu .separator span {
120 height: 0px;
121@@ -258,8 +292,8 @@
122 padding: 0;
123 margin: 0;
124 border: none;
125- border-top: 1px solid ThreeDShadow;
126- border-bottom: 1px solid ThreeDHighlight;
127+ border-top: 1px solid #9E9A91;
128+ border-bottom: 1px solid #FFFFFF;
129 width: 100%;
130 }
131
132@@ -272,7 +306,7 @@
133
134 .sf-menu a.disabled,
135 .sf-menu a.disabled:hover {
136- color: GrayText;
137+ color: #757575;
138 }
139 .sf-menu a.noborder {
140 border: none;
141@@ -284,11 +318,11 @@
142 .sf-menu a:active {
143 text-decoration: none;
144 outline: 0;
145- border-top-color: ThreeDHighlight;
146- border-left-color: ThreeDHighlight;
147- border-bottom-color: ThreeDShadow;
148- border-right-color: ThreeDShadow;
149- color: ButtonText;
150+ border-top-color: #FFFFFF;
151+ border-left-color: #FFFFFF;
152+ border-bottom-color: #9E9A91;
153+ border-right-color: #9E9A91;
154+ color: #000000;
155 }
156 .sf-menu li li:hover,
157 .sf-menu li li.sfHover,
158@@ -296,24 +330,24 @@
159 .sf-menu li li a:hover,
160 .sf-menu li li a:active {
161 border: none;
162- background-color: Highlight;
163- color: HighlightText;
164+ background-color: #4B6983;
165+ color: #FFFFFF;
166 }
167 .sf-menu li li a:focus,
168 .sf-menu li li a:hover,
169 .sf-menu li li a:active {
170- border-left: 1px solid ThreeDHighlight;
171- border-right: 1px solid ThreeDShadow;
172+ border-left: 1px solid #FFFFFF;
173+ border-right: 1px solid #9E9A91;
174 }
175 .sf-menu li li:first-child > a:focus,
176 .sf-menu li li:first-child > a:hover,
177 .sf-menu li li:first-child > a:active {
178- border-top: 1px solid ThreeDHighlight;
179+ border-top: 1px solid #FFFFFF;
180 }
181 .sf-menu li li:last-child > a:focus,
182 .sf-menu li li:last-child > a:hover,
183 .sf-menu li li:last-child > a:active {
184- border-bottom: 1px solid ThreeDShadow;
185+ border-bottom: 1px solid #9E9A91;
186 }
187 /* point right for anchors in subs */
188 .sf-menu ul .sf-sub-indicator {

Subscribers

People subscribed via source and target branches