From f19c803ac65bcf10041bdd9f5a9de893e0351262 Mon Sep 17 00:00:00 2001 From: Serrano Pereira Date: Thu, 23 May 2013 00:36:19 +0200 Subject: [PATCH 1/5] Added links for ordering CDs/DVDs via OSDisc.com to the "Try or install" page. The "Get the CD you need" section has been revamped in the process. --- images/cd.png | Bin 0 -> 673 bytes .../try_or_install/logo-fedora.png | Bin 0 -> 7500 bytes .../try_or_install/logo-trisquel.svg | 1 + .../try_or_install/logo-ubuntu.svg | 57 +++++++++++ .../switch_to_linux.try_or_install.fedora.png | Bin 0 -> 3427 bytes ...witch_to_linux.try_or_install.trisquel.png | Bin 0 -> 5827 bytes .../switch_to_linux.try_or_install.ubuntu.png | Bin 0 -> 2951 bytes pages/switch_to_linux.try_or_install.php | 53 +++++++---- style/main-ltr.css | 89 +++++++++++++++--- 9 files changed, 166 insertions(+), 34 deletions(-) create mode 100644 images/cd.png create mode 100644 images/sources/switch_to_linux/try_or_install/logo-fedora.png create mode 120000 images/sources/switch_to_linux/try_or_install/logo-trisquel.svg create mode 100644 images/sources/switch_to_linux/try_or_install/logo-ubuntu.svg create mode 100644 images/switch_to_linux/switch_to_linux.try_or_install.fedora.png create mode 100644 images/switch_to_linux/switch_to_linux.try_or_install.trisquel.png create mode 100644 images/switch_to_linux/switch_to_linux.try_or_install.ubuntu.png diff --git a/images/cd.png b/images/cd.png new file mode 100644 index 0000000000000000000000000000000000000000..ef4322357cbc34e0b5eeed34f9fdf553a1de2ee7 GIT binary patch literal 673 zcmV;S0$%-zP)fk+XBT$+GFLor|=G~7Z=&Bd_^zJLLP z{dbOmhNM(Q`mp7h`OloWYysF>=iU40Tf#?V356IC6~fPKul?5pw+W80zw#nVEgemD zincj})E^?AZGqXAKHDz@mch}3iwfqB3rPo#(gwa141DiTF(xO6U^eE%d{-hX0gf3o z8{W?(@4ZV6pRS)EXbxQZMi1!D!oC#YJOO&yAsn%9V=twmsxF*P_%ZxvD(XXc8T9DS zr0103x=g@fvEJ!1y5C7b$Hz+ryB7+I5>V>_sj5lWnV>%bWD?LRmBAb^h}fbg923Y3 zqK41OM-q_X|0W}n)p3}pGlwoCoNU0Ppf+VweFB8`9D=Abd!7lXx6+7Cma$90A4ue; zVKQTfc(bHa=}i!!qJ}b>M^UnvkNQWze=dVN?ZJ22Mf(14f#NRkt=PP(cyuKepkb#y3Gz>xmDvuMC zIuoRtGlX&@?9*%nGA0rvwq8W9jW)GLrXJl50KN-ci9ozQ$MNkH;k<IV|^+8goU4jB6C^%Mg5h>3Q7RCr>7r_DEKw7k44$|vUmJAm;${=2wBT`(Pek9N? z+*$Z3+nYyu(=ufrbdbTWW%|!LE6aD^rgi=em@XcV9q^{200000NkvXX Hu0mjf|3D;c literal 0 HcmV?d00001 diff --git a/images/sources/switch_to_linux/try_or_install/logo-fedora.png b/images/sources/switch_to_linux/try_or_install/logo-fedora.png new file mode 100644 index 0000000000000000000000000000000000000000..d5df6a94113b2dfd4dd80ed1902600e6384a8284 GIT binary patch literal 7500 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 + + + + + + + + + + + + diff --git a/images/switch_to_linux/switch_to_linux.try_or_install.fedora.png b/images/switch_to_linux/switch_to_linux.try_or_install.fedora.png new file mode 100644 index 0000000000000000000000000000000000000000..82c04fc8f728fb8a85470b4bf26c20fe274b3f32 GIT binary patch literal 3427 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 FV1g1}l_dZG literal 0 HcmV?d00001 diff --git a/images/switch_to_linux/switch_to_linux.try_or_install.trisquel.png b/images/switch_to_linux/switch_to_linux.try_or_install.trisquel.png new file mode 100644 index 0000000000000000000000000000000000000000..0c17f535c349f6b6c2f0a72b8b827e600215fbfe GIT binary patch literal 5827 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 N002ovPDHLkV1k!k7lZ%+ literal 0 HcmV?d00001 diff --git a/images/switch_to_linux/switch_to_linux.try_or_install.ubuntu.png b/images/switch_to_linux/switch_to_linux.try_or_install.ubuntu.png new file mode 100644 index 0000000000000000000000000000000000000000..47c0e256e85e6dba41717c47468a0663fd41cae7 GIT binary patch literal 2951 zcmV;23wZR2P)D28>!k zcX(Bor)8(VF?PwWo_(#O>}v;YKW(&AY~JfcnXOPZgs$BnmEe1*sNmFnD_L+lf zXBKC4yWQ6cdLxjP2rq$3Fm5VcQU8fW>P42dFC0`=?mPzcd7#)rwmx8fSys~xEK#q8 zeET8k4yrD9UaIJ0KuU5X$QyV(KQ4Q-r9CO!lj)%9@`48yZb+1mk\`8S}hKDyVf zq<8b$fh1czc0GCGt4+HTl{FAabI|q*=hdS6Xrg>1ErYQO-o{Zp9spl=C%fmKh`a8~ z0feki$xJ)e>Xpv0l35T{<@qy2^$)}9Ed5n-j42B_2mGTc^OSQ3_fw|1I(wfUmdq%y zTg~u`ilPDoSrRXA$Cy$wPdbN;X(wVY7>g~>iMO*2Pi-~bAFgE22bG|{evb3h?~26k z-0IWw-!H9fT9CLUepvn!t1i!+d!JLh@; z_N-Y!<3n@tb$5p6i!`gpGv2C6+foPZC@(7U;rTByR;-kgNfh4p7iw-elZ?Y=P;l)Z zBhtEeZ>R3|bMfuzz+O;HU)3gvsk7W)wxZ$YVVE$Ola&sts>pvDl}n=0q)wQ^=zCwl zmYqlETZ?IY_!`D8c$<{cNw{`yrEl9tY&lL+CrrVXlke}OK6=-wZ;zyQaj2P*!P^IR&GjP}MMEiR1?dj-8 zpHec3{Hq@#?V!W^)i*qFIbEw>imH#o72{VlE*hRSdtuosW@!5iVr(ID=UlhfIe@$F zOWZY8cw6cRIS0VC<8x}RKa=J^-QKT0|Ek|(caDv!kHE|!s2>rQIY?D!MQgVgjwAE9 zvqEKWM+UB_X(wXK&ZBqJT7U32M09UhMc$?JLgn-+N8_s66p>z( z@B!8kV2Oje#8)Jya@HwxLe2rdA&xPn^nLyj8AqH(@1`}wlH;o0Ox+z9fY*ciywM_R z0DQ(bWCZ!_hR^2Ro03tFYY>gP-FxRC+i=ASM&?MrgS;LjH7zQ&p$vVP4&;$21Az1l zN3FTsxpFby)`n2Id+qCZTk1)hB901Y|KHNW=d_zkFrXPAj zzjE&T$E@y;nlXEsrUGW29%2G5zErF_)AyvSyqUDtkLxaDBNY zY9B)-;RKq64w6;TTHBW{LOt$K*?HsRq?AmGn|uD;2XTy>7%KOye>>KuwcC-Mx-M=3 z5nx@Q=<~iDt=-dHOV>O9*ef_Ai_!Nij+p8Q@wM5>z3?WoPCYMF=j~{r`N?@vdV#>3 zR%90~b5Kij%PN$%Xf$nqe;99DQ>bjuE5w$Qk7M-ygB@kqNSk~l#gDEG<${7}eB@XC z7J+b3k!3?PAuKG*C{A0a?y8D{=TWYRMB}dALCuXb8S}fBu#Fl`$MWZJRe#3V$KS&- z?f^W^we)S>h&{J}l+uHd)N}yU?V{)7)u_7<_pWVpe^41qoi3NF_Z2JbvNRvG^#}RI zc8_cW(xcHiib`-G%W2s1mY9klbzoLrC3@i|I(s|UcA>m>8|vq_(J5_V@X_EDqp zcC_NDsiu3~Tl9YRA;t6G=+~!l{;%n*{A+lIDnBc$Y_ksH=~j|GeAJVF7IL ziT(5m%WE4GkrP&S(l0MmIA^Qsvp`02B}K%zeb1)lfXYzLMtZ@ep+&VjGt3f>nL zqp}T^xgfKFLx<3{3DsrTgMeJ%F<>t2Jq{l(zKagB6c%28kx?R&(5^iW z86qM%B4Ue8Z4C?&*%){Z38PSnsXg57vG0kI>d-3Sp`C?X$-NCV&oT7fPR*&rf!iHIYLeM?RHhh&RLmZ`2Jj4p=++rhv2Q{YHd z#ryyVn%Z+r^_8Z21-wABsq6#h4dC_DK--Riasuu52ihx5b)yH!X#>6jJf^x2fz&8{ z%+HPhO^&JVz%aTT8EjAVC$s*VLRfh+Nk zsOi9Y5&9gCf6@*7%<`Wz~7Q&2}qWMg10U0K=k{%i6NMLv+_f| zelQ}uCkpc!y)%l;L=pU8Bic$93sLnkfZo7+{C81eV}H|o@UCw#sa`B12}ih55Kn@u z*YqCMZiBrSpN<@^Mqv -" width="170" height="201" alt="|| computer screen ||"/>

@@ -64,31 +63,45 @@

-

Ubuntu

- -

- - iso image (rather large file) and then burn it to a CD."); ?> -

+
+ +
+

iso image (rather large file) and then burn it to a CD."); ?>

+
+
+
+ + +
+
-
-

Fedora

- -

- - -

+
+ +
+

+
+
+
+ + +
+
-
-

Trisquel

- -

- -

+
+ +
+

+
+
+
+ + +
+
diff --git a/style/main-ltr.css b/style/main-ltr.css index af6518d7..7cbbc353 100644 --- a/style/main-ltr.css +++ b/style/main-ltr.css @@ -901,7 +901,7 @@ div .note { * Styles for the "Try or install" page. *----------------------------------------------------*/ -#mainbody a.get_it_button { +#mainbody a.green_button { background-color: #DFF0B6; background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#EFF7DB), to(#D1EFAD)); background-image: -moz-linear-gradient(#EFF7DB, #D1EFAD); @@ -914,8 +914,6 @@ div .note { clear: both; color: black; display: block; - float: right; - margin-top: -1.8em; margin-left: 1em; margin-bottom: 0.5em; padding: 0.4em; @@ -923,8 +921,7 @@ div .note { white-space: nowrap; width: auto; } - -#mainbody a.get_it_button:hover { +#mainbody a.green_button:hover { background-color: #CDE496; background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#CDE496), to(#A2DC5D)); background-image: -moz-linear-gradient(#CDE496, #A2DC5D); @@ -937,8 +934,7 @@ div .note { color: black; text-decoration: none; } - -#mainbody a.get_it_button:active { +#mainbody a.green_button:active { background-color: #A2DC5D; background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#A2DC5D), to(#CDE496)); background-image: -moz-linear-gradient(#A2DC5D, #CDE496); @@ -946,17 +942,63 @@ div .note { background-image: linear-gradient(#A2DC5D, #CDE496); } -.go_download { +#mainbody a.blue_button { + background-color: #B6D7F0; + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#DBEAF7), to(#ADCEEF)); + background-image: -moz-linear-gradient(#DBEAF7, #ADCEEF); + background-image: -o-linear-gradient(#DBEAF7, #ADCEEF); + background-image: linear-gradient(#DBEAF7, #ADCEEF); + border: 1px #95B1D4 solid; + border-radius: 4px; + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + clear: both; + color: black; + display: block; + margin-left: 1em; + margin-bottom: 0.5em; + padding: 0.4em; + text-shadow: 0 1px 0 #EFEFEF; + white-space: nowrap; + width: auto; +} +#mainbody a.blue_button:hover { + background-color: #96C2E4; + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#CBE2F6), to(#9AC0E7)); + background-image: -moz-linear-gradient(#CBE2F6, #9AC0E7); + background-image: -o-linear-gradient(#CBE2F6, #9AC0E7); + background-image: linear-gradient(#CBE2F6, #9AC0E7); + border: 1px #7697BF solid; + box-shadow: 0 1px 1px rgba(0,0,0,0.1); + -moz-box-shadow: 0 1px 1px rgba(0,0,0,0.1); + -webkit-box-shadow: 0 1px 1px rgba(0,0,0,0.1); + color: black; + text-decoration: none; +} +#mainbody a.blue_button:active { + background-color: #96C2E4; + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#9AC0E7), to(#CBE2F6)); + background-image: -moz-linear-gradient(#9AC0E7, #CBE2F6); + background-image: -o-linear-gradient(#9AC0E7, #CBE2F6); + background-image: linear-gradient(#9AC0E7, #CBE2F6); +} + +.link_download { background: url(/images/go_down.png) center left no-repeat; padding-left: 22px; } -#mainbody .go_download a { +.link_disc { + background: url(/images/cd.png) center left no-repeat; + padding-left: 22px; +} + +#mainbody .link_download a, #mainbody .link_disc a { background: none; } .ubuntu_light, .fedora_light, .gnewsense_light, .trisquel_light { - margin: 0 0 0.5em 0; + margin: 1em 0; padding: 0.5em; background: white; border-radius: 2px; @@ -965,19 +1007,38 @@ div .note { } .ubuntu_light { - border: 1px #DD4814 solid; + border: 2px #DD4814 solid; } .fedora_light { - border: 1px #6c94c9 solid; + border: 2px #6c94c9 solid; } .gnewsense_light { - border: 1px #c59292 solid; + border: 2px #c59292 solid; } .trisquel_light { - border: 1px #004DB1 solid; + border: 2px #004DB1 solid; +} + +.getit_box_left { + float: left; +} + +.getit_box_right { + float: right; +} + +.getit_box_logo { + float: left; + width: 70px; + padding: 10px; +} + +.getit_box_text { + float: left; + width: 450px; } /*---------------------------------------------------- From 7ca8448f5be6cd14128023cc172aa22451e25fd4 Mon Sep 17 00:00:00 2001 From: Serrano Pereira Date: Thu, 23 May 2013 00:46:30 +0200 Subject: [PATCH 2/5] Changed the text color for code to dark gray --- style/main-ltr.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/style/main-ltr.css b/style/main-ltr.css index 7cbbc353..10627e79 100644 --- a/style/main-ltr.css +++ b/style/main-ltr.css @@ -181,7 +181,7 @@ em, strong { code { font-family: "Andale Mono", "Courier New", Courier, monospace; - color: #8B6914; + color: #4D4D4D; } .keypart { /* Blue-highlighted key ideas, used in Windows sub-sections */ From cb1cb20d78e8eb398cb86be71aae33e57cf5cb42 Mon Sep 17 00:00:00 2001 From: Serrano Pereira Date: Thu, 23 May 2013 00:50:59 +0200 Subject: [PATCH 3/5] Change the URL for the "Burn it to a CD" link to http://www.ubuntu.com/download/desktop/burn-a-dvd-on-windows This page is more user friendly and pleasant to look at, and is part of the main Ubuntu website. --- pages/switch_to_linux.try_or_install.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/switch_to_linux.try_or_install.php b/pages/switch_to_linux.try_or_install.php index f6af12b2..45952ba5 100644 --- a/pages/switch_to_linux.try_or_install.php +++ b/pages/switch_to_linux.try_or_install.php @@ -66,7 +66,7 @@
-

iso image (rather large file) and then burn it to a CD."); ?>

+

iso image (rather large file) and then burn it to a CD or DVD."); ?>

From 9d78f893673466e8bd3e9e64036c92eb610aca9e Mon Sep 17 00:00:00 2001 From: Serrano Pereira Date: Thu, 23 May 2013 01:55:10 +0200 Subject: [PATCH 4/5] Improved the instructions on the "Try or install" page. There is now a link to the installation guide for each distribution. --- pages/switch_to_linux.try_or_install.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pages/switch_to_linux.try_or_install.php b/pages/switch_to_linux.try_or_install.php index 45952ba5..bad68ee3 100644 --- a/pages/switch_to_linux.try_or_install.php +++ b/pages/switch_to_linux.try_or_install.php @@ -45,7 +45,7 @@

-

not difficult to set-up, though erasing Windows altogether is even easier."); ?>

+

not difficult to set-up, though erasing Windows altogether is even easier."); ?>

@@ -58,15 +58,15 @@
-

+

-

+

-

iso image (rather large file) and then burn it to a CD or DVD."); ?>

+

iso image (rather large file) and then burn it to a CD or DVD. Once the CD/DVD is burned, you can use it to install Ubuntu onto your computer."); ?>

@@ -80,7 +80,7 @@
-

+

installation quick start guide to get started with Fedora."); ?>

@@ -94,7 +94,7 @@
-

+

Trisquel installation is very similar to that of Ubuntu."); ?>

From 4a6bfdff74bccb2c877fca71be74e3d2d5504801 Mon Sep 17 00:00:00 2001 From: Serrano Pereira Date: Fri, 24 May 2013 01:16:35 +0200 Subject: [PATCH 5/5] Improved and simplified the styles for buttons --- pages/credits.php | 2 +- pages/legal.php | 2 +- pages/linux.linux_faq.php | 2 +- .../linux.misunderstanding_free_software.php | 2 +- pages/linux.php | 2 +- pages/linux.screenshots.php | 4 +- pages/not_found.php | 2 +- pages/switch_to_linux.try_or_install.php | 12 +- pages/windows.php | 4 +- .../windows.restrictions.further_details.php | 4 +- style/main-ltr.css | 141 +++++++----------- style/main-rtl.css | 28 +++- 12 files changed, 99 insertions(+), 106 deletions(-) diff --git a/pages/credits.php b/pages/credits.php index 0baaa000..c81225b4 100644 --- a/pages/credits.php +++ b/pages/credits.php @@ -296,7 +296,7 @@
- +
diff --git a/pages/legal.php b/pages/legal.php index 72e87a83..ddaaf84d 100644 --- a/pages/legal.php +++ b/pages/legal.php @@ -129,7 +129,7 @@
- +
diff --git a/pages/linux.linux_faq.php b/pages/linux.linux_faq.php index 69900f27..88cb6a66 100644 --- a/pages/linux.linux_faq.php +++ b/pages/linux.linux_faq.php @@ -369,7 +369,7 @@
- +
diff --git a/pages/linux.misunderstanding_free_software.php b/pages/linux.misunderstanding_free_software.php index fc91e2be..5d149844 100644 --- a/pages/linux.misunderstanding_free_software.php +++ b/pages/linux.misunderstanding_free_software.php @@ -194,7 +194,7 @@ printf($p, $this->base_url('linux/linux_faq',1)); ?>
- +
load_footer(); ?> diff --git a/pages/linux.php b/pages/linux.php index 7b975bee..ca21b8e6 100644 --- a/pages/linux.php +++ b/pages/linux.php @@ -67,7 +67,7 @@

- +
diff --git a/pages/linux.screenshots.php b/pages/linux.screenshots.php index fceee106..2c017f40 100644 --- a/pages/linux.screenshots.php +++ b/pages/linux.screenshots.php @@ -34,7 +34,7 @@ ?>
- +
@@ -115,7 +115,7 @@
- +
load_footer(); ?> diff --git a/pages/not_found.php b/pages/not_found.php index cdcdfd73..f3ed8637 100644 --- a/pages/not_found.php +++ b/pages/not_found.php @@ -29,7 +29,7 @@ $p = _("If you found a broken link, please report it so we can repair it. Thank you!"); printf($p, $ggl->get('tracker_url')); ?>

- +
diff --git a/pages/switch_to_linux.try_or_install.php b/pages/switch_to_linux.try_or_install.php index bad68ee3..28fbb016 100644 --- a/pages/switch_to_linux.try_or_install.php +++ b/pages/switch_to_linux.try_or_install.php @@ -70,8 +70,8 @@
- - + +
@@ -84,8 +84,8 @@
- - + +
@@ -98,8 +98,8 @@
- - + +
diff --git a/pages/windows.php b/pages/windows.php index 9be048c9..3b074dfa 100644 --- a/pages/windows.php +++ b/pages/windows.php @@ -89,9 +89,9 @@
- + - +
diff --git a/pages/windows.restrictions.further_details.php b/pages/windows.restrictions.further_details.php index 40791696..f4ab6640 100644 --- a/pages/windows.restrictions.further_details.php +++ b/pages/windows.restrictions.further_details.php @@ -11,7 +11,7 @@ ?>
- +
@@ -90,7 +90,7 @@
- +
load_footer(); ?> diff --git a/style/main-ltr.css b/style/main-ltr.css index 10627e79..edc1664a 100644 --- a/style/main-ltr.css +++ b/style/main-ltr.css @@ -901,88 +901,6 @@ div .note { * Styles for the "Try or install" page. *----------------------------------------------------*/ -#mainbody a.green_button { - background-color: #DFF0B6; - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#EFF7DB), to(#D1EFAD)); - background-image: -moz-linear-gradient(#EFF7DB, #D1EFAD); - background-image: -o-linear-gradient(#EFF7DB, #D1EFAD); - background-image: linear-gradient(#EFF7DB, #D1EFAD); - border: 1px #B1D18A solid; - border-radius: 4px; - -moz-border-radius: 4px; - -webkit-border-radius: 4px; - clear: both; - color: black; - display: block; - margin-left: 1em; - margin-bottom: 0.5em; - padding: 0.4em; - text-shadow: 0 1px 0 #EFEFEF; - white-space: nowrap; - width: auto; -} -#mainbody a.green_button:hover { - background-color: #CDE496; - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#CDE496), to(#A2DC5D)); - background-image: -moz-linear-gradient(#CDE496, #A2DC5D); - background-image: -o-linear-gradient(#CDE496, #A2DC5D); - background-image: linear-gradient(#CDE496, #A2DC5D); - border: 1px #96C85A solid; - box-shadow: 0 1px 1px rgba(0,0,0,0.1); - -moz-box-shadow: 0 1px 1px rgba(0,0,0,0.1); - -webkit-box-shadow: 0 1px 1px rgba(0,0,0,0.1); - color: black; - text-decoration: none; -} -#mainbody a.green_button:active { - background-color: #A2DC5D; - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#A2DC5D), to(#CDE496)); - background-image: -moz-linear-gradient(#A2DC5D, #CDE496); - background-image: -o-linear-gradient(#A2DC5D, #CDE496); - background-image: linear-gradient(#A2DC5D, #CDE496); -} - -#mainbody a.blue_button { - background-color: #B6D7F0; - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#DBEAF7), to(#ADCEEF)); - background-image: -moz-linear-gradient(#DBEAF7, #ADCEEF); - background-image: -o-linear-gradient(#DBEAF7, #ADCEEF); - background-image: linear-gradient(#DBEAF7, #ADCEEF); - border: 1px #95B1D4 solid; - border-radius: 4px; - -moz-border-radius: 4px; - -webkit-border-radius: 4px; - clear: both; - color: black; - display: block; - margin-left: 1em; - margin-bottom: 0.5em; - padding: 0.4em; - text-shadow: 0 1px 0 #EFEFEF; - white-space: nowrap; - width: auto; -} -#mainbody a.blue_button:hover { - background-color: #96C2E4; - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#CBE2F6), to(#9AC0E7)); - background-image: -moz-linear-gradient(#CBE2F6, #9AC0E7); - background-image: -o-linear-gradient(#CBE2F6, #9AC0E7); - background-image: linear-gradient(#CBE2F6, #9AC0E7); - border: 1px #7697BF solid; - box-shadow: 0 1px 1px rgba(0,0,0,0.1); - -moz-box-shadow: 0 1px 1px rgba(0,0,0,0.1); - -webkit-box-shadow: 0 1px 1px rgba(0,0,0,0.1); - color: black; - text-decoration: none; -} -#mainbody a.blue_button:active { - background-color: #96C2E4; - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#9AC0E7), to(#CBE2F6)); - background-image: -moz-linear-gradient(#9AC0E7, #CBE2F6); - background-image: -o-linear-gradient(#9AC0E7, #CBE2F6); - background-image: linear-gradient(#9AC0E7, #CBE2F6); -} - .link_download { background: url(/images/go_down.png) center left no-repeat; padding-left: 22px; @@ -1567,13 +1485,12 @@ div .note { -webkit-border-radius: 4px; color: black; display: block; - min-width: 13.5em; + margin: 0.5em; padding: 0.3em 0.5em; text-shadow: 0 1px 0 #EFEFEF; white-space: nowrap; width: auto; } - #mainbody a.button:hover { background-color: #B7CFDC; background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#D9E5EB), to(#B7CFDC)); @@ -1587,7 +1504,6 @@ div .note { color: black; text-decoration: none; } - #mainbody a.button:active { background-color: #D9E5EB; background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#B7CFDC), to(#D9E5EB)); @@ -1596,6 +1512,58 @@ div .note { background-image: linear-gradient(#B7CFDC, #D9E5EB); } +#mainbody a.button.green { + background-color: #DFF0B6; + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#EFF7DB), to(#D1EFAD)); + background-image: -moz-linear-gradient(#EFF7DB, #D1EFAD); + background-image: -o-linear-gradient(#EFF7DB, #D1EFAD); + background-image: linear-gradient(#EFF7DB, #D1EFAD); + border: 1px #B1D18A solid; +} +#mainbody a.button.green:hover { + background-color: #CDE496; + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#CDE496), to(#A2DC5D)); + background-image: -moz-linear-gradient(#CDE496, #A2DC5D); + background-image: -o-linear-gradient(#CDE496, #A2DC5D); + background-image: linear-gradient(#CDE496, #A2DC5D); + border: 1px #96C85A solid; +} +#mainbody a.button.green:active { + background-color: #A2DC5D; + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#A2DC5D), to(#CDE496)); + background-image: -moz-linear-gradient(#A2DC5D, #CDE496); + background-image: -o-linear-gradient(#A2DC5D, #CDE496); + background-image: linear-gradient(#A2DC5D, #CDE496); +} + +#mainbody a.button.blue { + background-color: #B6D7F0; + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#DBEAF7), to(#ADCEEF)); + background-image: -moz-linear-gradient(#DBEAF7, #ADCEEF); + background-image: -o-linear-gradient(#DBEAF7, #ADCEEF); + background-image: linear-gradient(#DBEAF7, #ADCEEF); + border: 1px #95B1D4 solid; +} +#mainbody a.button.blue:hover { + background-color: #96C2E4; + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#CBE2F6), to(#9AC0E7)); + background-image: -moz-linear-gradient(#CBE2F6, #9AC0E7); + background-image: -o-linear-gradient(#CBE2F6, #9AC0E7); + background-image: linear-gradient(#CBE2F6, #9AC0E7); + border: 1px #7697BF solid; +} +#mainbody a.button.blue:active { + background-color: #96C2E4; + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#9AC0E7), to(#CBE2F6)); + background-image: -moz-linear-gradient(#9AC0E7, #CBE2F6); + background-image: -o-linear-gradient(#9AC0E7, #CBE2F6); + background-image: linear-gradient(#9AC0E7, #CBE2F6); +} + +#mainbody a.button.wide { + min-width: 13.5em; +} + .button_title { font-size: 1.11em; } @@ -1634,9 +1602,8 @@ div .note { } #mainbody a.upbutton { - width: 17em; float: right; - padding-left: 20px; + text-align: center; } .up { diff --git a/style/main-rtl.css b/style/main-rtl.css index 1510774d..283cb0bc 100644 --- a/style/main-rtl.css +++ b/style/main-rtl.css @@ -131,11 +131,37 @@ h1, h2, h3, h4 { margin-left: 0; } -.go_download { +.link_download { background: url(/images/go_down.png) center right no-repeat; + padding-left: 0; + padding-right: 22px; +} + +.link_disc { + background: url(/images/cd.png) center right no-repeat; + padding-left: 0; padding-right: 22px; } +.getit_box_left { + float: right; +} + +.getit_box_right { + float: left; +} + +.getit_box_logo { + float: right; + width: 70px; + padding: 10px; +} + +.getit_box_text { + float: right; + width: 450px; +} + /*---------------------------------------------------- * "Screenshots" page. *----------------------------------------------------*/