Merge lp:~otto/valo-cd/devel into lp:~tuukkah/valo-cd/devel
- devel
- Merge into devel
Proposed by
Otto Kekäläinen
Status: | Needs review |
---|---|
Proposed branch: | lp:~otto/valo-cd/devel |
Merge into: | lp:~tuukkah/valo-cd/devel |
Diff against target: |
1223 lines (+448/-374) 10 files modified
.bzrignore (+0/-20) README.txt (+1/-1) VALO-CD/VALO-CD.ini (+5/-5) VALO-CD/defaults/preferences/prefs.js (+2/-1) build-cd.sh (+30/-21) html-ui/README.txt (+5/-0) html-ui/build-ui.sh (+12/-2) html-ui/css/valo-cd.scss (+1/-1) html-ui/valo-cd.css.sample (+387/-318) html-ui/valo-cd.html (+5/-5) |
To merge this branch: | bzr merge lp:~otto/valo-cd/devel |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Otto Kekäläinen (community) | Approve | ||
Review via email: mp+73778@code.launchpad.net |
Commit message
Description of the change
Better internationaliz
To post a comment you must log in.
lp:~otto/valo-cd/devel
updated
Unmerged revisions
- 71. By Otto Kekäläinen <email address hidden>
-
correct folder structure for merge and join
- 70. By Otto Kekäläinen <email address hidden>
-
fix xulrunner package location
- 69. By Otto Kekäläinen <email address hidden>
-
Preparation for merge with production branch.
- 68. By Otto Kekäläinen <email address hidden>
-
lang-file in html-ui directory always contains language code
- 67. By Otto Kekäläinen <email address hidden>
-
Logo and start up screen changed automatically if wiki is from .fi domain
- 66. By Otto Kekäläinen <email address hidden>
-
Fixed default english start logo.
- 65. By Otto Kekäläinen <email address hidden>
-
Refined the build process, filenames, documentation and paths.
- 64. By Otto Kekäläinen <email address hidden>
-
Replaced all valo-cd.fi with valo-cd.org, made build base internationalized.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === added file '.bzrignore' |
2 | --- .bzrignore 1970-01-01 00:00:00 +0000 |
3 | +++ .bzrignore 2011-09-05 09:08:37 +0000 |
4 | @@ -0,0 +1,7 @@ |
5 | +.sass-cache |
6 | +resources.txt |
7 | +valo-cd.css |
8 | +css/categories.scss |
9 | +css/logo.scss |
10 | +categories.scss |
11 | +logo.scss |
12 | |
13 | === removed file '.bzrignore' |
14 | --- .bzrignore 2010-12-09 01:54:41 +0000 |
15 | +++ .bzrignore 1970-01-01 00:00:00 +0000 |
16 | @@ -1,20 +0,0 @@ |
17 | -.DS_Store |
18 | -.sass-cache |
19 | -korpela.css |
20 | -mixins.css |
21 | -reset.css |
22 | -html-ui/build-en |
23 | -html-ui/build-en.log |
24 | -html-ui/resources.txt |
25 | -html-ui/build-fi |
26 | -html-ui/build-fi.log |
27 | -html-ui/css/categories.scss |
28 | -html-ui/css/logo.scss |
29 | -html-ui/valo-cd.css |
30 | -./build-en |
31 | -./build-en.log |
32 | -./build-en.zip |
33 | -./build-fi |
34 | -./build-fi.log |
35 | -./build-fi.zip |
36 | -./xulrunner-1.9.2.12.en-US.win32.zip |
37 | |
38 | === modified file 'README.txt' |
39 | --- README.txt 2010-12-09 00:21:28 +0000 |
40 | +++ README.txt 2011-09-05 09:08:37 +0000 |
41 | @@ -13,7 +13,7 @@ |
42 | start.bmp -- Splash screen image |
43 | start.exe -- Legacy splash screen starter app from Open-CD-project |
44 | start.ini -- Configuration for the legacy splash screen starter app |
45 | -build.sh -- Script to build the disc |
46 | +build-cd.sh -- Script to build the disc |
47 | |
48 | /VALO-CD |
49 | |
50 | |
51 | === modified file 'VALO-CD/VALO-CD.ini' |
52 | --- VALO-CD/VALO-CD.ini 2009-12-21 08:39:40 +0000 |
53 | +++ VALO-CD/VALO-CD.ini 2011-09-05 09:08:37 +0000 |
54 | @@ -8,20 +8,20 @@ |
55 | Name=VALO-CD |
56 | ; |
57 | ; This field specifies your application's version. This field is optional. |
58 | -Version=1.0 |
59 | +Version=1.1 |
60 | ; |
61 | ; This field specifies your application's build ID (timestamp). This field is |
62 | ; required. |
63 | -BuildID=20091118 |
64 | +BuildID=20110831 |
65 | ; |
66 | ; This field specifies a compact copyright notice for your application. This |
67 | ; field is optional. |
68 | -Copyright=Copyright (c) 2009 VALO-CD <info@valo-cd.fi> |
69 | +Copyright=Copyright (c) 2009-2011 VALO-CD <info@valo-cd.org> |
70 | ; |
71 | ; This ID is just an example. Every XUL app ought to have it's own unique ID. |
72 | ; You can use the microsoft "guidgen" or "uuidgen" tools, or go on |
73 | ; irc.mozilla.org and /msg botbot uuid. This field is optional. |
74 | -ID=info@valo-cd.fi |
75 | +ID=info@valo-cd.org |
76 | |
77 | [Gecko] |
78 | ; |
79 | @@ -46,4 +46,4 @@ |
80 | ; Specifies whether, when the application is launched for the first time and |
81 | ; there are no profiles, to enable profile migration code through |
82 | ; the nsIProfileMigrator interface. Legal values are 1 and 0 |
83 | -EnableProfileMigrator=0 |
84 | \ No newline at end of file |
85 | +EnableProfileMigrator=0 |
86 | |
87 | === modified file 'VALO-CD/defaults/preferences/prefs.js' |
88 | --- VALO-CD/defaults/preferences/prefs.js 2009-12-21 08:39:40 +0000 |
89 | +++ VALO-CD/defaults/preferences/prefs.js 2011-09-05 09:08:37 +0000 |
90 | @@ -1,7 +1,8 @@ |
91 | /*globals pref*/ |
92 | |
93 | // sets application locale |
94 | -pref("general.useragent.locale", "fi-FI") ; |
95 | +// (disabled fi-FI to make VALO-CD base international) |
96 | +// pref("general.useragent.locale", "fi-FI") ; |
97 | |
98 | // opens VALO-CD browser home page |
99 | pref("toolkit.defaultChromeFeatures", "chrome,resizable=no,dialog=no,centerscreen") ; |
100 | |
101 | === renamed file 'build.sh' => 'build-cd.sh' |
102 | --- build.sh 2011-08-03 14:00:43 +0000 |
103 | +++ build-cd.sh 2011-09-05 09:08:37 +0000 |
104 | @@ -1,7 +1,7 @@ |
105 | #!/bin/sh |
106 | # Examples: |
107 | -# ./build.sh build-en html-ui/build-en |
108 | -# ./build.sh build-fi html-ui/build-fi |
109 | +# ./build-cd.sh valo-cd-v7-en-beta2 html-ui/valo-cd-v7-en-beta2 |
110 | +# ./build-cd.sh <target dir> <ui source dir> |
111 | |
112 | # abort on errors |
113 | set -e |
114 | @@ -9,37 +9,46 @@ |
115 | # print commands before execution |
116 | set -x |
117 | |
118 | -root=$1 |
119 | -html_ui_build=$2 |
120 | +cd_target_dir=$1 |
121 | +html_ui_build_dir=$2 |
122 | |
123 | # check that the arguments are in correct order |
124 | -if [ -e "$html_ui_build/start.exe" -o ! -e "$html_ui_build/VALO-CD/content/index.html" ]; then |
125 | - echo >&2 "\"$html_ui_build\": doesn't look like a html-ui build result" |
126 | +if [ -e "$html_ui_build_dir/start.exe" -o ! -e "$html_ui_build_dir/VALO-CD/index.html" ]; then |
127 | + echo >&2 "\"$html_ui_build_dir\": doesn't look like a html-ui build result" |
128 | exit 10 |
129 | fi |
130 | |
131 | - |
132 | #start build from a clean state |
133 | -mkdir "$root" |
134 | - |
135 | -cp -a autorun* start* VALO-CD "$root/" |
136 | - |
137 | -cp -a cd-template/* "$root/" |
138 | - |
139 | -cp -a "$html_ui_build"/* "$root/" |
140 | +mkdir -p "$cd_target_dir" |
141 | + |
142 | +cp -a autorun* start* VALO-CD "$cd_target_dir/" |
143 | + |
144 | +# other files could be included too? |
145 | +# cp -a cd-template/* "$cd_target_dir/" |
146 | + |
147 | +cp -a "$html_ui_build_dir"/* "$cd_target_dir/" |
148 | + |
149 | +# get startup image with correct language (.org and english by default) |
150 | +if [ `cat $html_ui_build_dir/lang` == "fi" ]; then |
151 | + wget -nc -nv http://www.valo-cd.fi/wiki/images/f/f4/start.png |
152 | + mv start.png $cd_target_dir/ |
153 | + mogrify -format bmp $cd_target_dir/start.png |
154 | + rm $cd_target_dir/start.png |
155 | +fi |
156 | |
157 | # XXX this link breaks when new versions are released: |
158 | -wget -nv -nc http://releases.mozilla.org/pub/mozilla.org/xulrunner/releases/1.9.2.19/runtimes/xulrunner-1.9.2.19.en-US.win32.zip |
159 | +#wget -nv -nc http://releases.mozilla.org/pub/mozilla.org/xulrunner/releases/1.9.2.19/runtimes/xulrunner-1.9.2.19.en-US.win32.zip |
160 | +wget -nv -nc https://ftp.mozilla.org/pub/mozilla.org/xulrunner/releases/1.9.2.19/runtimes/xulrunner-1.9.2.19.en-US.win32.zip |
161 | |
162 | -unzip -q xulrunner-1.9.2.19.en-US.win32.zip -d "$root/VALO-CD/" |
163 | +unzip -q xulrunner-1.9.2.19.en-US.win32.zip -d "$cd_target_dir/VALO-CD/" |
164 | |
165 | # checksums |
166 | -(cd "$root" && find . -type f -print0 | xargs -0 md5sum) >md5sums |
167 | -(cd "$root" && find . -type f -print0 | xargs -0 sha1sum) >sha1sums |
168 | +(cd "$cd_target_dir" && find . -type f -print0 | xargs -0 md5sum) >md5sums |
169 | +(cd "$cd_target_dir" && find . -type f -print0 | xargs -0 sha1sum) >sha1sums |
170 | |
171 | -mv md5sums sha1sums "$root/" |
172 | +mv md5sums sha1sums "$cd_target_dir/" |
173 | |
174 | # package the results |
175 | -(cd "$root" && zip -q -r ../`basename "$root"`.zip .) |
176 | +(cd "$cd_target_dir" && zip -q -r ../`basename "$cd_target_dir"`.zip .) |
177 | |
178 | -genisoimage -J -R -l -o `basename "$root"`.iso -V "VALO-CD" -v -iso-level 4 "$root" |
179 | +genisoimage -J -R -l -o `basename "$cd_target_dir"`.iso -V "VALO-CD" -v -iso-level 4 "$cd_target_dir" |
180 | |
181 | === added file 'html-ui/README.txt' |
182 | --- html-ui/README.txt 1970-01-01 00:00:00 +0000 |
183 | +++ html-ui/README.txt 2011-09-05 09:08:37 +0000 |
184 | @@ -0,0 +1,5 @@ |
185 | +VALO-CD UI BUILDER |
186 | + |
187 | +This folder combined with data from the wiki makes the VALO-CD html user interface and contents (e.g. .exe's). The result of build-ui.sh can be browsed with any browser. |
188 | + |
189 | +To build the CD bundled with its own browser, run build-cd.sh. |
190 | |
191 | === renamed file 'html-ui/build.sh' => 'html-ui/build-ui.sh' |
192 | --- html-ui/build.sh 2011-04-04 00:26:45 +0000 |
193 | +++ html-ui/build-ui.sh 2011-09-05 09:08:37 +0000 |
194 | @@ -1,7 +1,8 @@ |
195 | #!/bin/sh |
196 | # Examples: |
197 | -# ./build.sh http://www.valo-cd.org/wiki/Version_7 build-en/VALO-CD/content ../../programs ../../guides |
198 | -# ./build.sh http://www.valo-cd.fi/wiki/Versio_7 build-fi/VALO-CD/content ../../ohjelmat ../../oppaat |
199 | +# ./build-ui.sh http://www.valo-cd.org/wiki/Version_7 valo-cd-v7-en-beta/VALO-CD ../programs ../guides |
200 | +# ./build-ui.sh http://www.valo-cd.fi/wiki/Versio_7 valo-cd-v7-fi-beta/VALO-CD ../ohjelmat ../oppaat |
201 | +# ./build-ui.sh <index url> <target directory> <relative paths to programs and guides from target dir> |
202 | |
203 | # abort on errors |
204 | set -e |
205 | @@ -32,6 +33,15 @@ |
206 | |
207 | cp -a fonts images js "$root/" |
208 | |
209 | +# get logo with correct language (.org and english by default) |
210 | +if [[ $url =~ valo-cd.fi ]]; then |
211 | + wget -nc -nv http://www.valo-cd.fi/wiki/images/1/1b/logo.png |
212 | + mv logo.png "$root/images/" |
213 | + echo "fi" > "$root/lang" |
214 | +else |
215 | + echo "en" > "$root/lang" |
216 | +fi |
217 | + |
218 | # valo-cd.xml builds index.html, resources.txt, css/categories.scss, |
219 | # and css/logo.scss |
220 | xsltproc --load-trace --novalid --stringparam url "$url" --stringparam programs "$programs" --stringparam guides "$guides" valo-cd.xsl valo-cd.html > "$root/index.html" |
221 | |
222 | === modified file 'html-ui/css/valo-cd.scss' |
223 | --- html-ui/css/valo-cd.scss 2011-04-05 17:32:42 +0000 |
224 | +++ html-ui/css/valo-cd.scss 2011-09-05 09:08:37 +0000 |
225 | @@ -47,7 +47,7 @@ |
226 | @import "programs"; |
227 | $logo-color: transparent; |
228 | $slogan-color: transparent; |
229 | -$logo-url: url("images/logo-fi.png"); |
230 | +$logo-url: url("images/logo.png"); |
231 | $background-color: transparent; |
232 | /* @end */ |
233 | |
234 | |
235 | === renamed file 'html-ui/images/logo-fi.png' => 'html-ui/images/logo.png' |
236 | Binary files html-ui/images/logo-fi.png 2011-04-05 15:01:49 +0000 and html-ui/images/logo.png 2011-09-05 09:08:37 +0000 differ |
237 | === modified file 'html-ui/valo-cd.css.sample' |
238 | --- html-ui/valo-cd.css.sample 2010-12-01 22:39:26 +0000 |
239 | +++ html-ui/valo-cd.css.sample 2011-09-05 09:08:37 +0000 |
240 | @@ -1,7 +1,7 @@ |
241 | /* |
242 | - valo-cd.css |
243 | + valo-cd.scss |
244 | |
245 | - Copyright (C) 2010 Asko Soukka <asko.soukka@iki.fi> |
246 | + Copyright (C) 2011 Asko Soukka <asko.soukka@iki.fi> |
247 | |
248 | This program is free software: you can redistribute it and/or modify |
249 | it under the terms of the GNU General Public License as published by |
250 | @@ -54,156 +54,74 @@ |
251 | border-collapse: collapse; |
252 | border-spacing: 0; } |
253 | |
254 | -/* @group DejaVu Sans */ |
255 | -@font-face { |
256 | - font-family: "DejaVu Sans"; |
257 | - src: url("fonts/dejavu-sans/DejaVuSans-Bold.woff"); |
258 | - font-weight: bold; |
259 | - font-style: normal; } |
260 | - |
261 | -@font-face { |
262 | - font-family: "DejaVu Sans"; |
263 | - src: url("fonts/dejavu-sans/DejaVuSans-BoldOblique.woff"); |
264 | - font-weight: bold; |
265 | - font-style: oblique; } |
266 | - |
267 | -@font-face { |
268 | - font-family: "DejaVu Sans"; |
269 | - src: url("fonts/dejavu-sans/DejaVuSans-BoldOblique.woff"); |
270 | - font-weight: bold; |
271 | - font-style: italic; } |
272 | - |
273 | -@font-face { |
274 | - font-family: "DejaVu Sans"; |
275 | - src: url("fonts/dejavu-sans/DejaVuSans-ExtraLight.woff"); |
276 | - font-weight: 100; |
277 | - font-style: normal; } |
278 | - |
279 | -@font-face { |
280 | - font-family: "DejaVu Sans"; |
281 | - src: url("fonts/dejavu-sans/DejaVuSans-Oblique.woff"); |
282 | - font-weight: normal; |
283 | - font-style: oblique; } |
284 | - |
285 | -@font-face { |
286 | - font-family: "DejaVu Sans"; |
287 | - src: url("fonts/dejavu-sans/DejaVuSans-Oblique.woff"); |
288 | - font-weight: normal; |
289 | - font-style: italic; } |
290 | - |
291 | -@font-face { |
292 | - font-family: "DejaVu Sans"; |
293 | - src: url("fonts/dejavu-sans/DejaVuSans.woff"); |
294 | - font-weight: normal; |
295 | - font-style: normal; } |
296 | - |
297 | -/* @end */ |
298 | -/* @group Gentium Basic */ |
299 | -@font-face { |
300 | - font-family: "Gentium Basic"; |
301 | - src: url("fonts/gentium-basic/GenBasB.woff"); |
302 | - font-weight: bold; |
303 | - font-style: normal; } |
304 | - |
305 | -@font-face { |
306 | - font-family: "Gentium Basic"; |
307 | - src: url("fonts/gentium-basic/GenBasBI.woff"); |
308 | - font-weight: bold; |
309 | - font-style: oblique; } |
310 | - |
311 | -@font-face { |
312 | - font-family: "Gentium Basic"; |
313 | - src: url("fonts/gentium-basic/GenBasBI.woff"); |
314 | - font-weight: bold; |
315 | - font-style: italic; } |
316 | - |
317 | -@font-face { |
318 | - font-family: "Gentium Basic"; |
319 | - src: url("fonts/gentium-basic/GenBasI.woff"); |
320 | - font-weight: normal; |
321 | - font-style: oblique; } |
322 | - |
323 | -@font-face { |
324 | - font-family: "Gentium Basic"; |
325 | - src: url("fonts/gentium-basic/GenBasI.woff"); |
326 | - font-weight: normal; |
327 | - font-style: italic; } |
328 | - |
329 | -@font-face { |
330 | - font-family: "Gentium Basic"; |
331 | - src: url("fonts/gentium-basic/GenBasR.woff"); |
332 | - font-weight: normal; |
333 | - font-style: normal; } |
334 | - |
335 | -/* @end */ |
336 | -/* @group Gentium Book Basic */ |
337 | -@font-face { |
338 | - font-family: "Gentium Book Basic"; |
339 | - src: url("fonts/gentium-basic/GenBkBasB.woff"); |
340 | - font-weight: bold; |
341 | - font-style: normal; } |
342 | - |
343 | -@font-face { |
344 | - font-family: "Gentium Book Basic"; |
345 | - src: url("fonts/gentium-basic/GenBkBasBI.woff"); |
346 | - font-weight: bold; |
347 | - font-style: italic; } |
348 | - |
349 | -@font-face { |
350 | - font-family: "Gentium Book Basic"; |
351 | - src: url("fonts/gentium-basic/GenBkBasI.woff"); |
352 | - font-weight: normal; |
353 | - font-style: oblique; } |
354 | - |
355 | -@font-face { |
356 | - font-family: "Gentium Book Basic"; |
357 | - src: url("fonts/gentium-basic/GenBkBasI.woff"); |
358 | - font-weight: normal; |
359 | - font-style: italic; } |
360 | - |
361 | -@font-face { |
362 | - font-family: "Gentium Book Basic"; |
363 | - src: url("fonts/gentium-basic/GenBkBasR.woff"); |
364 | - font-weight: normal; |
365 | - font-style: normal; } |
366 | - |
367 | -/* @end */ |
368 | +/* @group Droid Sans */ |
369 | +@font-face { |
370 | + font-family: "Droid Sans"; |
371 | + src: url("fonts/dejavu-sans/DroidSans-Bold.woff"); |
372 | + font-weight: bold; |
373 | + font-style: normal; } |
374 | + |
375 | +@font-face { |
376 | + font-family: "Droid Sans"; |
377 | + src: url("fonts/dejavu-sans/DroidSans.woff"); |
378 | + font-weight: normal; |
379 | + font-style: normal; } |
380 | + |
381 | +/* @end Droid Sans */ |
382 | /* @group VALO-CD */ |
383 | -#Teksti-ja-grafiikka h2 { |
384 | +#Writing-and-Drawing h2 { |
385 | top: 14em; } |
386 | |
387 | -#Teksti-ja-grafiikka, |
388 | -#Teksti-ja-grafiikka h2 { |
389 | - background-color: #36bdea; |
390 | - color: black; } |
391 | - |
392 | -#Teksti-ja-grafiikka .radio, |
393 | -#Teksti-ja-grafiikka blockquote, |
394 | -.breadcrumbs li.Teksti-ja-grafiikka { |
395 | - background-color: #36bdea; |
396 | - color: white; } |
397 | - |
398 | -#Teksti-ja-grafiikka:hover, |
399 | -#Teksti-ja-grafiikka:hover h2, |
400 | -#Teksti-ja-grafiikka h2:hover { |
401 | - color: white; } |
402 | - |
403 | -#Teksti-ja-grafiikka div.icon:hover, |
404 | -#Teksti-ja-grafiikka .radio:hover, |
405 | -#Teksti-ja-grafiikka .radio.selected, |
406 | -.breadcrumbs li.Teksti-ja-grafiikka:hover { |
407 | - background-color: #1495bf; |
408 | +#Writing-and-Drawing { |
409 | + border-left-color: #36bdea; |
410 | + border-top-color: #36bdea; } |
411 | + |
412 | +#Writing-and-Drawing h2 { |
413 | + background-color: #36bdea; |
414 | + color: white; } |
415 | + |
416 | +#Writing-and-Drawing div.label { |
417 | + background: #36bdea; |
418 | + color: white; } |
419 | + |
420 | +#Writing-and-Drawing .radio { |
421 | + background-color: #7bd4f1; } |
422 | + |
423 | +#Writing-and-Drawing blockquote, |
424 | +.breadcrumbs li.Writing-and-Drawing { |
425 | + background-color: #36bdea; |
426 | + color: white; } |
427 | + |
428 | +#Writing-and-Drawing:hover, |
429 | +#Writing-and-Drawing:hover h2, |
430 | +#Writing-and-Drawing h2:hover { |
431 | + color: white; } |
432 | + |
433 | +#Writing-and-Drawing div.icon:hover, |
434 | +#Writing-and-Drawing .radio:hover, |
435 | +#Writing-and-Drawing .radio.selected, |
436 | +.breadcrumbs li.Writing-and-Drawing:hover { |
437 | + background-color: #7bd4f1; |
438 | color: white; } |
439 | |
440 | #Internet h2 { |
441 | - top: 19em; } |
442 | - |
443 | -#Internet, |
444 | + top: 19.5em; } |
445 | + |
446 | +#Internet { |
447 | + border-left-color: #a9c043; |
448 | + border-top-color: #a9c043; } |
449 | + |
450 | #Internet h2 { |
451 | background-color: #a9c043; |
452 | - color: black; } |
453 | - |
454 | -#Internet .radio, |
455 | + color: white; } |
456 | + |
457 | +#Internet div.label { |
458 | + background: #a9c043; |
459 | + color: white; } |
460 | + |
461 | +#Internet .radio { |
462 | + background-color: #c3d37c; } |
463 | + |
464 | #Internet blockquote, |
465 | .breadcrumbs li.Internet { |
466 | background-color: #a9c043; |
467 | @@ -218,44 +136,62 @@ |
468 | #Internet .radio:hover, |
469 | #Internet .radio.selected, |
470 | .breadcrumbs li.Internet:hover { |
471 | - background-color: #78892e; |
472 | - color: white; } |
473 | - |
474 | -#Ajanviete h2 { |
475 | - top: 24em; } |
476 | - |
477 | -#Ajanviete, |
478 | -#Ajanviete h2 { |
479 | - background-color: #cb3889; |
480 | - color: black; } |
481 | - |
482 | -#Ajanviete .radio, |
483 | -#Ajanviete blockquote, |
484 | -.breadcrumbs li.Ajanviete { |
485 | - background-color: #cb3889; |
486 | - color: white; } |
487 | - |
488 | -#Ajanviete:hover, |
489 | -#Ajanviete:hover h2, |
490 | -#Ajanviete h2:hover { |
491 | - color: white; } |
492 | - |
493 | -#Ajanviete div.icon:hover, |
494 | -#Ajanviete .radio:hover, |
495 | -#Ajanviete .radio.selected, |
496 | -.breadcrumbs li.Ajanviete:hover { |
497 | - background-color: #912661; |
498 | + background-color: #c3d37c; |
499 | + color: white; } |
500 | + |
501 | +#Recreation h2 { |
502 | + top: 25em; } |
503 | + |
504 | +#Recreation { |
505 | + border-left-color: #cb3889; |
506 | + border-top-color: #cb3889; } |
507 | + |
508 | +#Recreation h2 { |
509 | + background-color: #cb3889; |
510 | + color: white; } |
511 | + |
512 | +#Recreation div.label { |
513 | + background: #cb3889; |
514 | + color: white; } |
515 | + |
516 | +#Recreation .radio { |
517 | + background-color: #db75ad; } |
518 | + |
519 | +#Recreation blockquote, |
520 | +.breadcrumbs li.Recreation { |
521 | + background-color: #cb3889; |
522 | + color: white; } |
523 | + |
524 | +#Recreation:hover, |
525 | +#Recreation:hover h2, |
526 | +#Recreation h2:hover { |
527 | + color: white; } |
528 | + |
529 | +#Recreation div.icon:hover, |
530 | +#Recreation .radio:hover, |
531 | +#Recreation .radio.selected, |
532 | +.breadcrumbs li.Recreation:hover { |
533 | + background-color: #db75ad; |
534 | color: white; } |
535 | |
536 | #Multimedia h2 { |
537 | - top: 29em; } |
538 | - |
539 | -#Multimedia, |
540 | + top: 30.5em; } |
541 | + |
542 | +#Multimedia { |
543 | + border-left-color: #f2a622; |
544 | + border-top-color: #f2a622; } |
545 | + |
546 | #Multimedia h2 { |
547 | background-color: #f2a622; |
548 | - color: black; } |
549 | - |
550 | -#Multimedia .radio, |
551 | + color: white; } |
552 | + |
553 | +#Multimedia div.label { |
554 | + background: #f2a622; |
555 | + color: white; } |
556 | + |
557 | +#Multimedia .radio { |
558 | + background-color: #f6c36a; } |
559 | + |
560 | #Multimedia blockquote, |
561 | .breadcrumbs li.Multimedia { |
562 | background-color: #f2a622; |
563 | @@ -270,59 +206,112 @@ |
564 | #Multimedia .radio:hover, |
565 | #Multimedia .radio.selected, |
566 | .breadcrumbs li.Multimedia:hover { |
567 | - background-color: #bc7c0b; |
568 | - color: white; } |
569 | - |
570 | -#Työkalut h2 { |
571 | - top: 34em; } |
572 | - |
573 | -#Työkalut, |
574 | -#Työkalut h2 { |
575 | - background-color: #e96028; |
576 | - color: black; } |
577 | - |
578 | -#Työkalut .radio, |
579 | -#Työkalut blockquote, |
580 | -.breadcrumbs li.Työkalut { |
581 | - background-color: #e96028; |
582 | - color: white; } |
583 | - |
584 | -#Työkalut:hover, |
585 | -#Työkalut:hover h2, |
586 | -#Työkalut h2:hover { |
587 | - color: white; } |
588 | - |
589 | -#Työkalut div.icon:hover, |
590 | -#Työkalut .radio:hover, |
591 | -#Työkalut .radio.selected, |
592 | -.breadcrumbs li.Työkalut:hover { |
593 | - background-color: #b24112; |
594 | - color: white; } |
595 | - |
596 | -#Oppaat h2 { |
597 | - top: 39em; } |
598 | - |
599 | -#Oppaat, |
600 | -#Oppaat h2 { |
601 | - background-color: #999999; |
602 | - color: black; } |
603 | - |
604 | -#Oppaat .radio, |
605 | -#Oppaat blockquote, |
606 | -.breadcrumbs li.Oppaat { |
607 | - background-color: #999999; |
608 | - color: white; } |
609 | - |
610 | -#Oppaat:hover, |
611 | -#Oppaat:hover h2, |
612 | -#Oppaat h2:hover { |
613 | - color: white; } |
614 | - |
615 | -#Oppaat div.icon:hover, |
616 | -#Oppaat .radio:hover, |
617 | -#Oppaat .radio.selected, |
618 | -.breadcrumbs li.Oppaat:hover { |
619 | - background-color: #737373; |
620 | + background-color: #f6c36a; |
621 | + color: white; } |
622 | + |
623 | +#Tools h2 { |
624 | + top: 36em; } |
625 | + |
626 | +#Tools { |
627 | + border-left-color: #e96028; |
628 | + border-top-color: #e96028; } |
629 | + |
630 | +#Tools h2 { |
631 | + background-color: #e96028; |
632 | + color: white; } |
633 | + |
634 | +#Tools div.label { |
635 | + background: #e96028; |
636 | + color: white; } |
637 | + |
638 | +#Tools .radio { |
639 | + background-color: #f0936d; } |
640 | + |
641 | +#Tools blockquote, |
642 | +.breadcrumbs li.Tools { |
643 | + background-color: #e96028; |
644 | + color: white; } |
645 | + |
646 | +#Tools:hover, |
647 | +#Tools:hover h2, |
648 | +#Tools h2:hover { |
649 | + color: white; } |
650 | + |
651 | +#Tools div.icon:hover, |
652 | +#Tools .radio:hover, |
653 | +#Tools .radio.selected, |
654 | +.breadcrumbs li.Tools:hover { |
655 | + background-color: #f0936d; |
656 | + color: white; } |
657 | + |
658 | +#Guides h2 { |
659 | + top: 41.5em; } |
660 | + |
661 | +#Guides { |
662 | + border-left-color: #5c76b8; |
663 | + border-top-color: #5c76b8; } |
664 | + |
665 | +#Guides h2 { |
666 | + background-color: #5c76b8; |
667 | + color: white; } |
668 | + |
669 | +#Guides div.label { |
670 | + background: #5c76b8; |
671 | + color: white; } |
672 | + |
673 | +#Guides .radio { |
674 | + background-color: #91a3cf; } |
675 | + |
676 | +#Guides blockquote, |
677 | +.breadcrumbs li.Guides { |
678 | + background-color: #5c76b8; |
679 | + color: white; } |
680 | + |
681 | +#Guides:hover, |
682 | +#Guides:hover h2, |
683 | +#Guides h2:hover { |
684 | + color: white; } |
685 | + |
686 | +#Guides div.icon:hover, |
687 | +#Guides .radio:hover, |
688 | +#Guides .radio.selected, |
689 | +.breadcrumbs li.Guides:hover { |
690 | + background-color: #91a3cf; |
691 | + color: white; } |
692 | + |
693 | +#Additional-information h2 { |
694 | + top: 47em; } |
695 | + |
696 | +#Additional-information { |
697 | + border-left-color: #999999; |
698 | + border-top-color: #999999; } |
699 | + |
700 | +#Additional-information h2 { |
701 | + background-color: #999999; |
702 | + color: white; } |
703 | + |
704 | +#Additional-information div.label { |
705 | + background: #999999; |
706 | + color: white; } |
707 | + |
708 | +#Additional-information .radio { |
709 | + background-color: #bfbfbf; } |
710 | + |
711 | +#Additional-information blockquote, |
712 | +.breadcrumbs li.Additional-information { |
713 | + background-color: #999999; |
714 | + color: white; } |
715 | + |
716 | +#Additional-information:hover, |
717 | +#Additional-information:hover h2, |
718 | +#Additional-information h2:hover { |
719 | + color: white; } |
720 | + |
721 | +#Additional-information div.icon:hover, |
722 | +#Additional-information .radio:hover, |
723 | +#Additional-information .radio.selected, |
724 | +.breadcrumbs li.Additional-information:hover { |
725 | + background-color: #bfbfbf; |
726 | color: white; } |
727 | |
728 | /* @group Icons */ |
729 | @@ -344,30 +333,36 @@ |
730 | font-size: 62.5%; |
731 | margin-left: 20em; |
732 | width: 58.4em; |
733 | - background-color: #c3e8f2; } |
734 | + background-color: transparent; |
735 | + background: -webkit-gradient(linear, left top, left bottom, from(transparent), to(white)); |
736 | + background: -moz-linear-gradient(center top, transparent, white); |
737 | + background-image: url("images/valo-background.jpg"); |
738 | + background-attachment: fixed; } |
739 | |
740 | /* @end */ |
741 | /* @group Logo */ |
742 | h1 { |
743 | - font-family: "DejaVu Sans", sans-serif; |
744 | + font-family: "Droid Sans", sans-serif; |
745 | font-weight: normal; |
746 | text-align: center; |
747 | + font-size: 2.8em; |
748 | + background-size: 100% auto; |
749 | position: fixed; |
750 | top: 0; |
751 | left: 0; |
752 | - padding-top: 8em; |
753 | - width: 20em; |
754 | - height: 100%; |
755 | - color: #0DC4EF; |
756 | - background-color: #c3e8f2; |
757 | - background-size: 100% 7.4em; |
758 | - -moz-background-size: 100% 7.4em; |
759 | - background-image: url("images/disc.png"); |
760 | - background-position: 0 0.5em; |
761 | - background-repeat: no-repeat; } |
762 | + padding-top: 3.071em; |
763 | + height: 2.143em; |
764 | + width: 7.143em; |
765 | + color: transparent; |
766 | + background-color: transparent; |
767 | + background-image: url("images/logo.png"); |
768 | + background-position: center 0.286em; |
769 | + background-repeat: no-repeat; |
770 | + cursor: pointer; |
771 | + -webkit-user-select: none; |
772 | + -moz-user-select: none; } |
773 | h1 + p { |
774 | - text-shadow: white 0px 1px 1px; |
775 | - font-family: "DejaVu Sans", sans-serif; |
776 | + font-family: "Droid Sans", sans-serif; |
777 | font-size: 0.9em; |
778 | font-weight: bold; |
779 | text-align: center; |
780 | @@ -375,40 +370,44 @@ |
781 | top: 13.333em; |
782 | left: 0; |
783 | width: 22.222em; |
784 | - color: #58585A; |
785 | - background: transparent; } |
786 | - h1 a:link, h1 a:visited, h1 a:active, h1 a:link:hover { |
787 | - font-weight: normal; |
788 | - text-decoration: none; |
789 | - color: inherit; |
790 | - font-size: 3.4em; } |
791 | - h1 a:link strong, h1 a:visited strong, h1 a:active strong, h1 a:link:hover strong { |
792 | - color: #58585A; } |
793 | - h1 strong { |
794 | - font-weight: normal; |
795 | - color: #58585A; |
796 | - background: inherit; |
797 | + color: transparent; |
798 | + background: transparent; |
799 | + cursor: pointer; |
800 | + -webkit-user-select: none; |
801 | + -moz-user-select: none; } |
802 | + h1 em { |
803 | + font-style: normal; |
804 | + color: transparent; |
805 | padding-right: 0.088em; } |
806 | |
807 | /* @end */ |
808 | /* @group Category */ |
809 | +.category + .category { |
810 | + margin-top: -1.5em; } |
811 | + |
812 | +.category:last-child { |
813 | + padding-bottom: 1.5em; } |
814 | + |
815 | .category { |
816 | border-top-left-radius: 1.5em; |
817 | -moz-border-radius-topleft: 1.5em; |
818 | -webkit-border-top-left-radius: 1.5em; |
819 | + padding-bottom: 3em; |
820 | display: block; |
821 | - padding-top: 1.5em; |
822 | - width: 58.4em; |
823 | + border-top-width: 1.5em; |
824 | + border-top-style: solid; |
825 | + border-left-width: 1.5em; |
826 | + border-left-style: solid; |
827 | + width: 56.9em; |
828 | counter-reset: guide; } |
829 | - .category:hover h2, .category:hover > .icon h3 { |
830 | - text-shadow: black 0px 1px 1px; } |
831 | .category:hover > .icon.guide h3 + p, .category:hover > .icon.guide h3 + a + p { |
832 | color: black; } |
833 | .category h2 { |
834 | border-top-left-radius: 1.5em; |
835 | -moz-border-radius-topleft: 1.5em; |
836 | -webkit-border-top-left-radius: 1.5em; |
837 | - font-family: "DejaVu Sans", sans-serif; |
838 | + text-shadow: black 0px 1px 1px; |
839 | + font-family: "Droid Sans", sans-serif; |
840 | font-weight: normal; |
841 | position: fixed; |
842 | left: 0; |
843 | @@ -421,18 +420,17 @@ |
844 | cursor: pointer; } |
845 | .category h2:first-line { |
846 | font-size: 1.9em; } |
847 | + .category:hover h2 { |
848 | + padding-left: 3em; |
849 | + width: 17em; } |
850 | .category:after { |
851 | clear: both; |
852 | display: block; |
853 | content: ""; } |
854 | - .category + .category { |
855 | + .category + .category h2 { |
856 | border-top-left-radius: 0; |
857 | -moz-border-radius-topleft: 0; |
858 | -webkit-border-top-left-radius: 0; } |
859 | - .category + .category h2 { |
860 | - border-top-left-radius: 0; |
861 | - -moz-border-radius-topleft: 0; |
862 | - -webkit-border-top-left-radius: 0; } |
863 | .category:last-child { |
864 | border-bottom-left-radius: 1.5em; |
865 | -moz-border-radius-bottomleft: 1.5em; |
866 | @@ -441,35 +439,64 @@ |
867 | border-bottom-left-radius: 1.5em; |
868 | -moz-border-radius-bottomleft: 1.5em; |
869 | -webkit-border-bottom-left-radius: 1.5em; } |
870 | + .category .label { |
871 | + text-shadow: black 0px 1px 1px; |
872 | + font-family: "Droid Sans", sans-serif; |
873 | + font-weight: normal; |
874 | + margin: 0; |
875 | + margin-bottom: 0.789em; |
876 | + padding: 0; |
877 | + padding-bottom: 1em; |
878 | + padding-right: 1em; |
879 | + text-align: right; |
880 | + font-size: 1.9em; |
881 | + color: white; } |
882 | |
883 | /* @end */ |
884 | /* @group Title Icon */ |
885 | .category > .icon { |
886 | + width: 55.4em; |
887 | + height: auto; |
888 | + min-height: 20em; |
889 | + margin-bottom: 0; |
890 | position: relative; |
891 | float: left; |
892 | margin-left: 1.5em; |
893 | - margin-bottom: 1.5em; |
894 | - width: 17.467em; |
895 | - height: 18em; |
896 | overflow: hidden; |
897 | border-radius: 1.5em; |
898 | -moz-border-radius: 1.5em; |
899 | -webkit-border-radius: 1.5em; } |
900 | .category > .icon:hover { |
901 | cursor: pointer; } |
902 | + .category > .icon:hover h3 { |
903 | + text-shadow: black 0px 1px 1px; |
904 | + color: white; } |
905 | .category > .icon > * { |
906 | display: none; } |
907 | .category > .icon h3 { |
908 | - font-family: "DejaVu Sans", sans-serif; |
909 | + text-shadow: black 0px 1px 1px; |
910 | + font-family: "Droid Sans", sans-serif; |
911 | font-weight: normal; |
912 | - text-align: center; |
913 | display: block; |
914 | - position: absolute; |
915 | - right: 0; |
916 | - bottom: 1.2em; |
917 | - left: 0; } |
918 | + position: relative; |
919 | + color: black; |
920 | + margin: 1.6em; |
921 | + margin-left: 18.4em; } |
922 | .category > .icon h3:first-line { |
923 | font-size: 1.6em; } |
924 | + .category > .icon h3 + img + a + p { |
925 | + font-family: Arial, sans-serif; |
926 | + font-size: 1.6em; |
927 | + line-height: 1.3; |
928 | + text-align: justify; |
929 | + font-style: normal; |
930 | + display: block; |
931 | + position: relative; |
932 | + margin: 1em; |
933 | + margin-left: 11.5em; |
934 | + background: inherit; |
935 | + background: transparent; |
936 | + color: black; } |
937 | .category > .icon img.icon { |
938 | display: block; |
939 | position: absolute; |
940 | @@ -481,26 +508,23 @@ |
941 | /* @end */ |
942 | /* @group Guide Icons */ |
943 | .category > .icon.guide { |
944 | - width: 55.4em; |
945 | - height: auto; |
946 | - margin-bottom: 0; } |
947 | + min-height: 0; } |
948 | .category > .icon.guide h3 { |
949 | - font-family: "DejaVu Sans", sans-serif; |
950 | + font-family: "Droid Sans", sans-serif; |
951 | text-align: left; |
952 | position: static; |
953 | - margin: 1.6em; } |
954 | + margin: 1.6em; |
955 | + padding-left: 0; } |
956 | .category > .icon.guide h3 + p, .category > .icon.guide h3 + a + p { |
957 | font-family: Arial, sans-serif; |
958 | font-size: 1.6em; |
959 | line-height: 1.3; |
960 | text-align: justify; |
961 | - font-style: italic; |
962 | + font-style: normal; |
963 | display: block; |
964 | margin: 1em; |
965 | background: inherit; |
966 | color: black; } |
967 | - .category > .icon.guide:last-child { |
968 | - margin-bottom: 1.6em; } |
969 | |
970 | /* @end */ |
971 | /* @group Title */ |
972 | @@ -508,12 +532,12 @@ |
973 | /* Parts of this style's typography in inspired by |
974 | * Jukka Korpela's http://www.cs.tut.fi/~jkorpela/yleinen.css */ |
975 | /* @group Typography */ |
976 | - /* @group Headers */ |
977 | + /* @group Headings */ |
978 | /* @end */ |
979 | /* @group Lists */ |
980 | /* @end */ |
981 | /* @end */ |
982 | - font-family: "Gentium Basic", sans-serif; |
983 | + font-family: "Droid Sans", sans-serif; |
984 | font-size: 1.6em; |
985 | line-height: 1.3; |
986 | text-align: justify; |
987 | @@ -530,8 +554,8 @@ |
988 | background: white; |
989 | color: black; } |
990 | .title h1, .title h2, .title h3, .title h4, .title h5, .title h6 { |
991 | - font-family: "DejaVu Sans", sans-serif; |
992 | - font-weight: normal; |
993 | + font-family: "Droid Sans", sans-serif; |
994 | + font-weight: bold; |
995 | page-break-after: avoid; } |
996 | .title h1 { |
997 | font-size: 2.4em; } |
998 | @@ -570,13 +594,13 @@ |
999 | font-weight: normal; } |
1000 | .title dl dd { |
1001 | margin-bottom: 0.7em; } |
1002 | - .title ul li:before { |
1003 | + .title ul > li:before { |
1004 | float: left; |
1005 | content: "–"; |
1006 | margin-left: -1em; } |
1007 | .title ol { |
1008 | counter-reset: list; } |
1009 | - .title ol li:before { |
1010 | + .title ol > li:before { |
1011 | float: left; |
1012 | content: counter(list) "."; |
1013 | counter-increment: list; |
1014 | @@ -600,46 +624,75 @@ |
1015 | height: 8em; } |
1016 | .title h3 { |
1017 | float: left; |
1018 | - text-align: left; } |
1019 | + text-align: left; |
1020 | + margin-top: 0; } |
1021 | + .title.info h3 { |
1022 | + float: none; } |
1023 | .title p { |
1024 | clear: left; } |
1025 | .title p + ul, .title p + ol { |
1026 | margin-top: -0.9em; } |
1027 | + .title img.logo { |
1028 | + clear: left; |
1029 | + float: left; |
1030 | + margin: 0 0.938em 0.938em 0; |
1031 | + max-width: 16em; } |
1032 | + .title img.inline { |
1033 | + box-shadow: 0 0.2em 0.7em black; |
1034 | + -moz-box-shadow: 0 0.2em 0.7em black; |
1035 | + -webkit-box-shadow: 0 0.2em 0.7em black; |
1036 | + float: left; |
1037 | + margin: 0 0.938em 0.938em 0; |
1038 | + max-width: 16em; } |
1039 | + .title img + p { |
1040 | + clear: none; } |
1041 | + .title img + img + ul, |
1042 | + .title img + img + p { |
1043 | + clear: left; } |
1044 | .title a { |
1045 | - display: inline-block; |
1046 | - text-decoration: none; |
1047 | - height: 1.1em; |
1048 | - border-bottom: 0.063em dashed; } |
1049 | + /* display: inline-block; */ |
1050 | + text-decoration: underline; |
1051 | + /* text-decoration: none; |
1052 | + height: 1.1em; |
1053 | + border-bottom: 0.1em * 1/1.6 dashed; */ } |
1054 | .title a[href^="http"] { |
1055 | display: inline; |
1056 | text-decoration: underline; |
1057 | height: auto; |
1058 | - border-bottom: 0; } |
1059 | + border-bottom: 0; |
1060 | + background: transparent url(images/external-link-ltr-icon.png) no-repeat scroll right center; |
1061 | + padding-right: 13px; } |
1062 | .title a.visited:link { |
1063 | color: #551A8B; } |
1064 | - .title ul li:before { |
1065 | - float: left; |
1066 | - content: "–"; |
1067 | - margin-left: -1em; } |
1068 | + .title ul { |
1069 | + text-align: left; } |
1070 | + .title ul > li:before { |
1071 | + float: left; |
1072 | + content: "–"; |
1073 | + margin-left: -1em; } |
1074 | .title ol { |
1075 | + text-align: left; |
1076 | counter-reset: list; } |
1077 | - .title ol li:before { |
1078 | + .title ol > li:before { |
1079 | float: left; |
1080 | content: counter(list) "."; |
1081 | counter-increment: list; |
1082 | margin-left: -1em; } |
1083 | - .title dl.metadata dt { |
1084 | - clear: both; |
1085 | - float: left; |
1086 | + .title dl.metadata { |
1087 | margin-left: 0; |
1088 | - width: 7em; |
1089 | - font-weight: normal; |
1090 | - white-space: nowrap; } |
1091 | - .title dl.metadata dd { |
1092 | - margin-bottom: 0; } |
1093 | + margin-top: 1.5em; } |
1094 | + .title dl.metadata dt { |
1095 | + clear: both; |
1096 | + float: left; |
1097 | + margin-left: 0; |
1098 | + margin-right: 0.5em; |
1099 | + font-weight: normal; |
1100 | + white-space: nowrap; } |
1101 | + .title dl.metadata dd { |
1102 | + margin-bottom: 0; } |
1103 | .title blockquote { |
1104 | text-shadow: black 0px 1px 1px; |
1105 | - font-family: "DejaVu Sans", sans-serif; |
1106 | + font-family: "Droid Sans", sans-serif; |
1107 | margin-left: 0; |
1108 | margin-right: 0; |
1109 | padding: 0.938em; |
1110 | @@ -649,7 +702,7 @@ |
1111 | -webkit-border-radius: 0.938em; } |
1112 | .title blockquote:before { |
1113 | content: "”"; |
1114 | - font-family: "Gentium Basic", sans-serif; |
1115 | + font-family: "Droid Sans", sans-serif; |
1116 | font-size: 6.25em; |
1117 | position: absolute; |
1118 | margin-top: -0.219em; |
1119 | @@ -658,11 +711,13 @@ |
1120 | /* @end */ |
1121 | /* @group Breadcrumbs */ |
1122 | .title ul.breadcrumbs { |
1123 | - font-family: "DejaVu Sans", sans-serif; |
1124 | + font-family: "Droid Sans", sans-serif; |
1125 | line-height: 1/1.3; |
1126 | text-align: left; |
1127 | margin: 0 0 0 -0.938em; |
1128 | - padding: 0.313em 0 0 0; } |
1129 | + padding: 0.313em 0 0.938em 0; |
1130 | + width: 36.625em; |
1131 | + overflow: hidden; } |
1132 | .title ul.breadcrumbs li { |
1133 | text-shadow: black 0px 1px 1px; |
1134 | white-space: nowrap; |
1135 | @@ -684,8 +739,8 @@ |
1136 | |
1137 | /* @end */ |
1138 | /* @group Download */ |
1139 | -.title a.download:link, .title a.download:visited, .title a.download:hover { |
1140 | - font-family: "DejaVu Sans", sans-serif; |
1141 | +a.download:link, a.download:visited, a.download:hover { |
1142 | + font-family: "Droid Sans", sans-serif; |
1143 | text-align: center; |
1144 | font-weight: normal; |
1145 | text-decoration: none; |
1146 | @@ -694,6 +749,7 @@ |
1147 | clear: both; |
1148 | width: 7.875em; |
1149 | height: 1.375em; |
1150 | + background: #ffffff; |
1151 | background: -webkit-gradient(linear, left top, left bottom, from(white), to(#dddddd)); |
1152 | background: -moz-linear-gradient(center top, white, #dddddd); |
1153 | border-radius: 0.938em; |
1154 | @@ -703,11 +759,25 @@ |
1155 | color: #444444; |
1156 | margin: 0.313em 0 1.25em 0.938em; |
1157 | padding: 0.187em 0 0.125em 0; } |
1158 | -.title a.download:active { |
1159 | +a.download:active { |
1160 | + background: #cdcdcd; |
1161 | background: -webkit-gradient(linear, left top, left bottom, from(#cdcdcd), to(#ececec)); |
1162 | background: -moz-linear-gradient(center top, #cdcdcd, #ececec); |
1163 | padding: 0.25em 0 0.063em 0; } |
1164 | |
1165 | +.icon a.download:link, .icon a.download:visited, .icon a.download:hover { |
1166 | + font-size: 1.6em; |
1167 | + line-height: 1.3; |
1168 | + float: none; |
1169 | + display: block; |
1170 | + position: absolute; |
1171 | + top: 9.875em; |
1172 | + left: 1.469em; |
1173 | + margin: 0; } |
1174 | + |
1175 | +.icon.guide a.download { |
1176 | + display: none; } |
1177 | + |
1178 | /* @end */ |
1179 | /* @group Screenshots */ |
1180 | .title ul.screenshots { |
1181 | @@ -747,8 +817,7 @@ |
1182 | width: 1em; |
1183 | border-right: 0.25ex white solid; |
1184 | background: #eeeeee; |
1185 | - font-size: 150%; |
1186 | - opacity: 0.4; } |
1187 | + font-size: 150%; } |
1188 | .title .selector .radio:hover, .title .selector .radio.selected { |
1189 | background: #aaaaaa; |
1190 | opacity: 1.0; } |
1191 | |
1192 | === modified file 'html-ui/valo-cd.html' |
1193 | --- html-ui/valo-cd.html 2010-12-08 17:46:34 +0000 |
1194 | +++ html-ui/valo-cd.html 2011-09-05 09:08:37 +0000 |
1195 | @@ -1,6 +1,6 @@ |
1196 | <?xml version="1.0" encoding="UTF-8"?> |
1197 | <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> |
1198 | -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fi"> |
1199 | +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> |
1200 | <head> |
1201 | <meta http-equiv="content-type" content="charset=UTF-8"/> |
1202 | <link rel="stylesheet" type="text/css" href="valo-cd.css" media="screen"/> |
1203 | @@ -10,10 +10,10 @@ |
1204 | </script> |
1205 | <script type="text/javascript" src="js/jquery.js">//</script> |
1206 | <script type="text/javascript" src="js/valo-cd.js">//</script> |
1207 | - <title>VALO-CD: Parhaat suomenkieliset vapaat ja avoimen lähdekoodin ohjelmat Windowsille</title> |
1208 | + <title>VALO-CD: The best of Free and Open Source Software for Windows</title> |
1209 | </head> |
1210 | <body> |
1211 | - <h1><em>VALO-</em>CD.fi</h1> |
1212 | - <p>Parhaat vapaat ohjelmat Windowsille</p> |
1213 | + <h1><em>VALO-</em>CD.org</h1> |
1214 | + <p>The best of Free and Open Source Software for Windows</p> |
1215 | </body> |
1216 | -</html> |
1217 | \ No newline at end of file |
1218 | +</html> |
1219 | |
1220 | === modified file 'start.bmp' |
1221 | Binary files start.bmp 2009-12-21 08:39:40 +0000 and start.bmp 2011-09-05 09:08:37 +0000 differ |
1222 | === added file 'xulrunner-1.9.2.19.en-US.win32.zip' |
1223 | Binary files xulrunner-1.9.2.19.en-US.win32.zip 1970-01-01 00:00:00 +0000 and xulrunner-1.9.2.19.en-US.win32.zip 2011-09-05 09:08:37 +0000 differ |