diff --git a/_layouts/base.html b/_layouts/base.html index 31ae999d..d44414d8 100644 --- a/_layouts/base.html +++ b/_layouts/base.html @@ -12,124 +12,6 @@ menu: - id: development - id: about --- -{% case page.lang %} -{% when 'ar' or 'es' or 'fa' or 'pl' or 'ru' or 'zh_TW' %} - - - - - - - - -{% capture title %}{% translate title %}{% endcapture %}{% if title != '' %}{{ title }}{% else %}{{ page.title }}{% endif %} -{% lesscss main.less %} - -{% if page.lang == 'ar' or page.lang == 'fa' or page.lang == 'pl' or page.lang == 'ru' or page.lang == 'zh_CN' or page.lang == 'zh_TW' %}{% endif %} - - - - - -{% if site.ALERT %} -
-
{{ site.ALERT }}
-
-{% endif %} - -
-
- {{ content }} -
-
- - - -
- -
- - - - - -{% else %} - @@ -139,7 +21,8 @@ menu: {% capture title %}{% translate title %}{% endcapture %}{% if title != '' %}{{ title }}{% else %}{{ page.title }}{% endif %} {% lesscss main.less %} -{% if page.lang == 'ar' or page.lang == 'fa' or page.lang == 'pl' or page.lang == 'ru' %}{% endif %} +{% if page.lang == 'ar' or page.lang == 'fa' %}{% endif %} +{% if page.lang == 'pl' or page.lang == 'ru' or page.lang == 'zh_CN' or page.lang == 'zh_TW' %}{% endif %} @@ -173,7 +56,15 @@ menu: {% translate menu-bitcoin-for-individuals layout %} {% translate menu-bitcoin-for-businesses layout %} {% translate menu-bitcoin-for-developers layout %} + {% case page.lang %} + {% when 'ar' or 'es' or 'fa' or 'ru' %} + {% translate menu-bitcoin-for-enthusiasts layout %} + {% translate menu-choose-your-wallet layout %} + {% when 'pl' or 'zh_TW' %} + {% translate menu-choose-your-wallet layout %} + {% else %} {% translate menu-getting-started layout %} + {% endcase %} {% translate menu-how-it-works layout %} {% translate menu-you-need-to-know layout %} @@ -184,11 +75,19 @@ menu: {% translate menu-community layout %} {% translate menu-development layout %} {% translate menu-vocabulary layout %} + {% case page.lang %} + {% when 'ar' or 'es' or 'fa' or 'ru' or 'pl' or 'zh_TW' %} + {% else %} {% translate menu-events layout %} + {% endcase %} {% if page.lang == 'en' %}Press{% endif %} + {% case page.lang %} + {% when 'ar' or 'es' or 'fa' or 'ru' %} + {% else %} {% translate menu-innovation layout %} + {% endcase %} {% translate menu-support-bitcoin layout %} {% case page.lang %} {% when 'ar' or 'de' or 'es' or 'fa' or 'it' or 'nl' or 'pl' or 'ru' or 'tr' or 'zh_CN' or 'zh_TW' %} @@ -212,7 +111,12 @@ menu: {% else %} {% translate menu-legal layout %} {% endcase %} + {% case page.lang %} + {% when 'ar' or 'es' or 'fa' or 'ru' %} + About bitcoin.org + {% else %} {% translate menu-about-us layout %} + {% endcase %} {% translate footer layout %} @@ -220,5 +124,3 @@ menu: - -{% endcase %} diff --git a/_less/screen.less b/_less/screen.less index 0e6c0760..2feccace 100644 --- a/_less/screen.less +++ b/_less/screen.less @@ -278,6 +278,7 @@ li p{ min-width:120%; padding:5px 0px; margin:0px; + left:0px; } #menusimple li:hover ul{ display:block; @@ -297,7 +298,6 @@ li p{ display:block; color:#2c6fad; font-size:100%; - width:100%; margin:1px 0px; padding:6px 10px 3px 10px; } @@ -593,7 +593,7 @@ li p{ } .contributors{ - width:900px; + width:890px; text-align:left; } .contributors span a{ @@ -1321,274 +1321,23 @@ h2 .rssicon{ /* Deprecated styles (should be removed when translations are updated) */ -body.old #menufor{ - margin:0px; - position:absolute; - top:8px; - left:250px; - padding:0px; - height:35px; -} -body.old h1{ - text-align:left; -} -body.old .summary{ - text-align:left; -} -body.old .alert-message div div{ - width:960px; -} -body.old #menufor li{ - list-style:none; - float:left; - padding:0px; - margin:0px 8px; - border-radius:5px; - -webkit-left-radius:5px; -} -body.old #menufor li a, -body.old #menufor li a:active, -body.old #menufor li a:visited, -body.old #menufor li a:link{ - font-family:'Ubuntu', sans-serif; - font-weight:700; - font-size:105%; - display:block; - text-decoration:none; - padding:6px 8px 3px 8px; - color:#2c6fad; - white-space:nowrap; -} -body.old #menufor li:hover, -body.old #menufor li.active{ - background-color:#2c6fad; -} -body.old #menufor li:hover a, -body.old #menufor li.active a{ - border-radius:5px; - -webkit-left-radius:5px; - color:#fff; -} -body.old #menu{ - padding:0px; - margin:12px auto -12px 32px; -} -body.old #menu li{ - list-style:none; - display:inline-block; - margin:0px; -} -#menu li a, -#menu li a:active, -#menu li a:visited, -#menu li a:link{ - font-family:'Ubuntu', sans-serif; - font-weight:300; - display:block; - color:#6a6a6a; - text-decoration:none; - padding: 8px 10px; - border: 2px solid transparent; - white-space:nowrap; -} -body.old #menu li:hover a, -body.old #menu li.active a{ - color:#000; - background-color:#fff; - border:2px solid #ebebeb; - border-radius:3px; - -webkit-border-radius:3px; -} -body.old #head>div{ - max-width:1050px; -} - -body.old #body{ - max-width:1050px; -} - -body.old #content{ - padding:20px 265px 30px 30px; -} -body.old #content.wide{ - padding:20px 40px 30px 30px; - max-width:990px; -} - -body.old #rightbox{ - width:210px; - position:absolute; - right:30px; - top:20px; - border-radius:5px; - -webkit-border-radius:5px; - padding:5px; -} -body.old #rightbox.wide{ - display:none; -} - -body.old #choose a, -body.old #before a, -body.old #support a{ - font-family:'Ubuntu', sans-serif; - font-weight:300; - padding:10px 8px 10px 48px; - color:#fff; - display:block; - text-align:left; - margin-bottom:10px; - text-decoration:none; - border-radius:5px; - -webkit-border-radius:5px; -} -body.old #choose img, -body.old #before img, -body.old #support img{ - vertical-align:middle; - margin-right:8px; - margin-left:-40px; - width:32px; - height:32px; -} -body.old #before a, -body.old #support a{ - background-color:#2c6fad; - border:1px solid #20598f; - background-image:linear-gradient(bottom, #20598f 14%, #2c6fad 70%); - background-image:-o-linear-gradient(bottom, #20598f 14%, #2c6fad 70%); - background-image:-moz-linear-gradient(bottom, #20598f 14%, #2c6fad 70%); - background-image:-webkit-linear-gradient(bottom, #20598f 14%, #2c6fad 70%); - background-image:-ms-linear-gradient(bottom, #20598f 14%, #2c6fad 70%); -} -body.old #choose a{ - padding:12px 8px 12px 48px; - background-color:#e78406; - border:1px solid #d57700; - background-image:linear-gradient(bottom, #d57700 14%, #e78406 70%); - background-image:-o-linear-gradient(bottom, #d57700 14%, #e78406 70%); - background-image:-moz-linear-gradient(bottom, #d57700 14%, #e78406 70%); - background-image:-webkit-linear-gradient(bottom, #d57700 14%, #e78406 70%); - background-image:-ms-linear-gradient(bottom, #d57700 14%, #e78406 70%); -} -body.old #choose a:hover, -body.old #before a:hover, -body.old #support a:hover{ - background-image:none; -} - -body.old .downloadold a{ - font-size:125%; - display:inline-block; - margin:5px 0px; -} -body.old .downloadold span{ - width:16px; - height:16px; - display:inline-block; -} - -body.old .preview{ - margin-top:40px; -} - -body.old #footer{ - max-width:1050px; -} -body.old .foundation{ - max-width:500px; - margin:40px auto; - border:2px dashed #dfdfdf; - padding:40px; - border-radius:9px; - -webkit-border-radius:9px; -} -body.old .preview{ - width:880px; - padding-left:40px; - padding-top:15px; - border:2px solid #eee; - border-radius:8px; - -webkit-border-radius:8px; -} -body.old .resourcesold{ +.resourcesold{ font-size:115%; font-weight:bold; } -body.old .resourcesold ul{ +.resourcesold ul{ padding-top:5px; } -body.old .resourcesold li{ +.resourcesold li{ padding-top:6px; text-align:left; } -body.old .resourcesold a, -body.old .resourcesold a:link, -body.old .resourcesold a:active, -body.old .resourcesold a:visited{ +.resourcesold a, +.resourcesold a:link, +.resourcesold a:active, +.resourcesold a:visited{ text-decoration:none; } -body.old .resourcesold li ul li{ +.resourcesold li ul li{ font-weight:normal; } - -/* Deprecated styles specific to mobiles (should be removed when translations are updated) */ - -@media handheld, only screen and (max-device-height: 37em), only screen and (max-device-width: 50em){ - body.old #menufor, - body.old #menu{ - display:none; - } - body.old #menufor{ - position:static; - bottom:0px; - margin:10px 0px 0px 0px; - height:auto; - } - body.old #menufor li{ - float:none; - display:inline-block; - } - body.old #menufor li a, - body.old #menufor li a:active, - body.old #menufor li a:visited, - body.old #menufor li a:link{ - padding:6px 6px 3px 6px; - } - body.old #menufor li{ - margin:6px; - } - body.old #menu{ - position:static; - height:auto; - margin:10px 0px 10px 0px; - } - body.old #menu li{ - float:none; - display:inline-block; - padding: 5px; - } - body.old #menu li a, - body.old #menu li a:active, - body.old #menu li a:visited, - body.old #menu li a:link{ - padding:5px; - } - body.old #rightbox, - body.old #rightbox.wide{ - display:block; - position:static; - margin:30px auto 20px auto; - } - body.old #content{ - padding:15px 10px 20px 10px; - } - body.old #content.wide{ - position:static; - margin:0px 5px; - padding:15px 10px 20px 10px; - } - body.old .foundation{ - padding:20px; - } -} diff --git a/_templates/bitcoin-for-enthusiasts.html b/_templates/bitcoin-for-enthusiasts.html index 4c325732..758aeb87 100755 --- a/_templates/bitcoin-for-enthusiasts.html +++ b/_templates/bitcoin-for-enthusiasts.html @@ -5,23 +5,23 @@ id: bitcoin-for-enthusiasts

{% translate pagetitle %}

{% translate summary %}

-

Icon{% translate consensus %}

+

Icon{% translate consensus %}

{% translate consensustext %}

-

Icon{% translate network %}

+

Icon{% translate network %}

{% translate networktext %}

-

Icon{% translate freedom %}

+

Icon{% translate freedom %}

{% translate freedomtext %}

-

Icon{% translate global %}

+

Icon{% translate global %}

{% translate globaltext %}

-

Icon{% translate transparency %}

+

Icon{% translate transparency %}

{% translate transparencytext %}

-

Icon{% translate secure %}

+

Icon{% translate secure %}

{% translate securetext %}

-

Icon{% translate trust %}

+

Icon{% translate trust %}

{% translate trusttext %}

diff --git a/_templates/download.html b/_templates/download.html index b68cb80e..bd468287 100755 --- a/_templates/download.html +++ b/_templates/download.html @@ -2,33 +2,6 @@ layout: base id: download --- -{% case page.lang %} -{% when 'ar' or 'es' or 'fa' or 'pl' or 'ru' or 'zh_TW' %} - - -

{% translate pagetitle %}

-

{% translate latestversion %}{{site.DOWNLOAD_VERSION}}rss

-

-windows {% translate downloadwinzip %} ~13MB
-windows {% translate downloadwinexe %} ~9MB
-ubuntu {% translate downloadubu %}
-linux {% translate downloadlin %} ~12MB
-osx {% translate downloadmac %} ~13MB
-{% case page.lang %} -{% when 'ar' or 'de' or 'es' or 'fa' or 'id' or 'it' or 'nl' or 'pl' or 'ru' or 'tr' or 'zh_CN' or 'zh_TW' %} -signature {% translate downloadsig download en %}
-{% else %} -signature {% translate downloadsig %}
-{% endcase %} - {% translate downloadsource %} (GitHub)

- {% translate versionhistory %} -

-
-

{% translate notelicense %}

-

{% translate notesync %}

- -{% else %} -

{% translate pagetitle %}

@@ -65,5 +38,3 @@ case 'ubuntu':but.href='https://launchpad.net/~bitcoin/+archive/bitcoin';break; case 'mac':but.href='http://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-{{site.DOWNLOAD_VERSION}}/bitcoin-{{site.DOWNLOAD_VERSION}}-macosx.dmg/download';break; } - -{% endcase %} diff --git a/_translations/ar.yml b/_translations/ar.yml index 6a0b8923..ed7c0c5f 100644 --- a/_translations/ar.yml +++ b/_translations/ar.yml @@ -259,6 +259,7 @@ ar: title: "تحميل - بت كوين" pagetitle: "تحميل Bitcoin-Qt" latestversion: "أخر إصدار : " + download: "تحميل Bitcoin-Qt" downloadwinzip: "تحميل للوندوز (zip)" downloadwinexe: "تحميل للوندوز (exe)" downloadubu: "تحميل للأوبونتو (PPA)" @@ -430,6 +431,7 @@ ar: blockchain: "سلسلة ألمجاميع" blockchaintxt: "سجل معاملات عمومي مشترك" layout: + menu-intro: "مقدمة" menu-bitcoin-for-individuals: "أفراد" menu-bitcoin-for-businesses: "أعمال" menu-bitcoin-for-developers: "مطورين" @@ -440,11 +442,11 @@ ar: menu-resources: "مصادر" menu-community: "مجتمع" menu-development: "تطوير" + menu-support-bitcoin: "شارك" menu-foundation: "مؤسسة" menu-about: "عن" - button-wallet: "إختر محفظتك" - button-know: "تحتاج أن تعلم" - button-support: "إدعم ألبت كوين" + menu-choose-your-wallet: "إختر محفظتك" + menu-you-need-to-know: "تحتاج أن تعلم" footer: "© Bitcoin Project 2009-2013 Released under the MIT license" url: about: "عن" diff --git a/_translations/es.yml b/_translations/es.yml index 4f45ce01..58313b07 100644 --- a/_translations/es.yml +++ b/_translations/es.yml @@ -259,6 +259,7 @@ es: title: "Descargar - Bitcoin" pagetitle: "Descargar Bitcoin-Qt" latestversion: "Última versión : " + download: "Descargar Bitcoin-Qt" downloadwinzip: "Descargar para Windows (zip)" downloadwinexe: "Descargar para Windows (exe)" downloadubu: "Descargar para Ubuntu (PPA)" @@ -430,6 +431,7 @@ es: blockchain: la Cadena de Bloques blockchaintxt: (un registro de transacciónes pública compartida) layout: + menu-intro: Introducción menu-bitcoin-for-individuals: Personas menu-bitcoin-for-businesses: Empresas menu-bitcoin-for-developers: Desarrolladores @@ -440,11 +442,11 @@ es: menu-resources: Recursos menu-community: Comunidad menu-development: Desarrollo + menu-support-bitcoin: Participar menu-foundation: Fundación menu-about: "Acerca de" - button-wallet: "Elige tu monedero" - button-know: "Debes saber" - button-support: "Apoya Bitcoin" + menu-choose-your-wallet: "Elige tu monedero" + menu-you-need-to-know: "Debes saber" footer: "© Bitcoin Project 2009–2013 Publicado bajo la licencia MIT" url: about: acerca-de diff --git a/_translations/fa.yml b/_translations/fa.yml index 8032e12e..a7a057eb 100644 --- a/_translations/fa.yml +++ b/_translations/fa.yml @@ -164,6 +164,7 @@ fa: title: "دانلود - بیت کوین" pagetitle: "دانلود Bitcoin-Qt" latestversion: "آخرین نسخه :" + download: "دانلود Bitcoin-Qt" downloadwinzip: "دانلود برای ویندوز (zip)" downloadwinexe: "دانلود برای ویندوز (exe)" downloadubu: "دانلود برای اوبونتو (PPA)" @@ -335,6 +336,7 @@ fa: blockchain: زنجیره ی بلاک blockchaintxt: (یک log تراکنش عمومی به اشتراک گذاشته شده) layout: + menu-intro: معرفی menu-bitcoin-for-individuals: افراد menu-bitcoin-for-businesses: کسب و کارها menu-bitcoin-for-developers: توسعه دهندگان @@ -345,11 +347,11 @@ fa: menu-resources: منابع menu-community: انجمن menu-development: توسعه + menu-support-bitcoin: شرکت کردن menu-foundation: بنیاد menu-about: درباره - button-wallet: "انتخاب کیف پول" - button-know: "آن چه باید بدانید" - button-support: "حمایت از بیت کوین" + menu-choose-your-wallet: "انتخاب کیف پول" + menu-you-need-to-know: "آن چه باید بدانید" footer: "© پروژه بیت کوین 2013-2009 منتشر شده تحت MIT گواهینامه" url: about: درباره diff --git a/_translations/pl.yml b/_translations/pl.yml index 91bcb993..b0818681 100644 --- a/_translations/pl.yml +++ b/_translations/pl.yml @@ -166,6 +166,7 @@ pl: title: "Ściągnij - Bitcoin" pagetitle: "Ściągnij - Bitcoin-QT" latestversion: "Najnowsza wersja:" + download: "Ściągnij - Bitcoin-QT" downloadwinzip: "Pobierz dla Windows (zip)" downloadwinexe: "Pobierz dla Windows (exe)" downloadubu: "Pobierz dla Ubuntu (PPA)" @@ -381,12 +382,12 @@ pl: menu-events: Wydarzenia menu-press: Prasa menu-innovation: Innowacje + menu-support-bitcoin: Uczestniczyć menu-foundation: Fundacja menu-about: O bitcoinie menu-about-us: "O bitcoin.org" - button-wallet: "Wybierz swój portfel" - button-know: "Powinieneś wiedzieć" - button-support: "Wesprzyj Bitcoin" + menu-choose-your-wallet: "Wybierz swój portfel" + menu-you-need-to-know: "Powinieneś wiedzieć" footer: "© Projekt Bitcoin 2009–2013 Dostępny w ramach licencji MIT" url: about: o diff --git a/_translations/ru.yml b/_translations/ru.yml index 5a9916e1..60094468 100644 --- a/_translations/ru.yml +++ b/_translations/ru.yml @@ -259,6 +259,7 @@ ru: title: "Загрузки - Bitcoin" pagetitle: "Загрузить Bitcoin-Qt" latestversion: "Последняя версия : " + download: "Загрузить Bitcoin-Qt" downloadwinzip: "Версия для Windows (zip)" downloadwinexe: "Версия для Windows (exe)" downloadubu: "Версия для Ubuntu (PPA)" @@ -430,6 +431,7 @@ ru: blockchain: "Цепочка блоков" blockchaintxt: "общедоступный лог транзакций" layout: + menu-intro: "презентация" menu-bitcoin-for-individuals: "Частным лицам" menu-bitcoin-for-businesses: "Бизнесу" menu-bitcoin-for-developers: "Разработчикам" @@ -440,11 +442,11 @@ ru: menu-resources: "Ресурсы" menu-community: "Сообщество" menu-development: "Разработка" + menu-support-bitcoin: "участвовать" menu-foundation: "Фонд" menu-about: "О Биткоине" - button-wallet: "Выберите свой кошелек" - button-know: "Вам нужно знать" - button-support: "Поддержать Биткоин" + menu-choose-your-wallet: "Выберите свой кошелек" + menu-you-need-to-know: "Вам нужно знать" footer: "© Bitcoin Project 2009–2013 Программное обеспечение распространяется под лицензией MIT" url: about: "описание" diff --git a/_translations/zh_TW.yml b/_translations/zh_TW.yml index a35a6f61..5d384ae0 100644 --- a/_translations/zh_TW.yml +++ b/_translations/zh_TW.yml @@ -166,6 +166,7 @@ zh_TW: title: "下載 - Bitcoin" pagetitle: "下載 Bitcoin-Qt" latestversion: "最新版本 : " + download: "下載 Bitcoin-Qt" downloadwinzip: "下載適用於 Windows 的版本 (zip)" downloadwinexe: "下載適用於 Windows 的版本 (exe)" downloadubu: "下載適用於 Ubuntu 的版本 (PPA)" @@ -382,11 +383,11 @@ zh_TW: menu-press: 出版物 menu-innovation: 創新 menu-foundation: 基金會 + menu-support-bitcoin: 參與 menu-about: 關於 menu-about-us: "關於 bitcoin.org" - button-wallet: "選擇你的錢包" - button-know: "Bitcoin 使用須知" - button-support: "支持 Bitcoin" + menu-choose-your-wallet: "選擇你的錢包" + menu-you-need-to-know: "Bitcoin 使用須知" footer: "© Bitcoin Project 2009–2013 以 MIT 授權發佈" url: about: about diff --git a/css/ie.css b/css/ie.css index b29349f0..93c30f67 100644 --- a/css/ie.css +++ b/css/ie.css @@ -37,7 +37,7 @@ body{ color:#fff; } #menusimple li ul{ - width:180px; + width:190px; min-width:auto; } #menusimple li ul li a:hover, @@ -46,6 +46,7 @@ body{ #menusimple li ul li.active a:visited, #menusimple li ul li.active a:active{ color:#fff; + width:100%; } .titleicon{ diff --git a/ar/css/main.css b/css/rtl.css similarity index 57% rename from ar/css/main.css rename to css/rtl.css index c195093b..e5f0be7d 100644 --- a/ar/css/main.css +++ b/css/rtl.css @@ -1,6 +1,7 @@ /*Language specific styles that override default*/ /*Styles for HTML tags*/ + body{ font-family:'DroidNaskh', sans-serif; direction:rtl; @@ -8,15 +9,13 @@ body{ h1,h2{ font-family:'DroidNaskh', sans-serif; } -h1,h2,h3{ +h2,h3{ text-align:right; } ul{ padding-right:20px; padding-left:auto; -} -li{ - text-align:right; + margin-right:0px; } p{ line-height:2em; @@ -27,8 +26,8 @@ p{ #head{ direction:ltr; } -#lang{ - font-family:"Helvetica Neue", "Liberation Sans", Arial, sans-serif; +#lang li ul li{ + font-family:Arial, sans-serif; } #menusimple li a, #menusimple li a:active, @@ -36,6 +35,16 @@ p{ #menusimple li a:link{ font-family:'DroidNaskh', sans-serif; } +#menusimple li ul{ + right:0px; + left:auto; +} +#menusimple li ul li a, +#menusimple li ul li a:active, +#menusimple li ul li a:visited, +#menusimple li ul li a:link{ + text-align:right; +} #footer{ text-align:right; padding:20px 40px 20px 0px; @@ -51,19 +60,43 @@ p{ h1 .rssicon{ margin-left:0px; margin-right:10px; + margin-bottom:12px; } h2 .rssicon{ margin-left:0px; margin-right:10px; + margin-bottom:18px; +} +.mainbutton a, +.mainbutton a:link, +.mainbutton a:visited, +.mainbutton a:active{ + font-family:'DroidNaskh', sans-serif; + text-align:right; + padding:15px 68px 15px 20px; +} +.mainbutton img{ + margin-left:10px; + margin-right:-52px; +} +.contributors{ + text-align:right; +} +.contributors span{ + direction:ltr; +} +.downloadbox div{ + text-align:right; } .previewrow>div{ margin-right:auto; - margin-left:17px; + margin-left:15px; } .previewrow>div>a{ line-height:1.2em; } -.previewrow>div.last{ +.previewrow>div:first-child+div+div, +.previewrow>div:first-child+div+div+div+div+div{ margin-left:0px; } .previewrow>div>div>div>span { @@ -76,7 +109,10 @@ h2 .rssicon{ .previewrow>div>div>div>h2:first-child+span+p{ line-height:1.5em; } -.index a,.index a:link,.index a:active,.index a:visited{ +.index a, +.index a:link, +.index a:active, +.index a:visited{ line-height:2em; } .floatimg{ @@ -84,13 +120,6 @@ h2 .rssicon{ margin-right:auto; margin-left:10px; } -.press-faq li{ - line-height:2em; -} -.conferencebanner{ - right:auto; - left:5px; -} /*Override UbuntuBold by Droid Naskh*/ @@ -100,6 +129,12 @@ h2 .rssicon{ /*Styles specific to mobiles*/ @media handheld, only screen and (max-device-height: 37em), only screen and (max-device-width: 50em){ + h1{ + text-align:right; + } + .summary{ + text-align:right; + } #content{ position:static; padding:15px 10px 20px 10px; @@ -109,57 +144,6 @@ h2 .rssicon{ /* Deprecated styles (should be removed when translations are updated) */ -body.old #menufor li a, -body.old #menufor li a:active, -body.old #menufor li a:visited, -body.old #menufor li a:link{ - font-family:'DroidNaskh', sans-serif; -} -body.old #menu li a, -body.old #menu li a:active, -body.old #menu li a:visited, -body.old #menu li a:link{ - font-family:'DroidNaskh', sans-serif; -} -body.old h1,body.old h2{ - font-family:'DroidNaskh', sans-serif; -} -body.old h1,body.old h2,body.old h3{ +.resourcesold li{ text-align:right; } -body.old .summary{ - text-align:right; -} -body.old #content{ - padding:20px 30px 30px 265px; -} -body.old #rightbox{ - left:30px; - right:auto; -} -body.old #choose img, -body.old #before img, -body.old #support img, -body.old #choose .ieimg, -body.old #before .ieimg, -body.old #support .ieimg{ - margin-right:-40px; - margin-left:8px; -} -body.old #choose>a:first-child, -body.old #before>a:first-child, -body.old #support>a:first-child{ - text-align:right; - padding:10px 48px 10px 8px; -} - -/* Deprecated styles specific to mobiles (should be removed when translations are updated) */ - -@media handheld, only screen and (max-device-height: 37em), only screen and (max-device-width: 50em){ - body.old #menufor{ - bottom:0px; - } - body.old #content{ - padding:15px 10px 20px 10px; - } -} diff --git a/css/sans.css b/css/sans.css new file mode 100644 index 00000000..e36a4011 --- /dev/null +++ b/css/sans.css @@ -0,0 +1,16 @@ +h1,h2{ + font-family:Arial, sans-serif; + font-weight:bold; +} +#menusimple li a, +#menusimple li a:active, +#menusimple li a:visited, +#menusimple li a:link{ + font-family:Arial, sans-serif; +} +.mainbutton a, +.mainbutton a:link, +.mainbutton a:visited, +.mainbutton a:active{ + font-family:Arial, sans-serif; +} diff --git a/fa/css/main.css b/fa/css/main.css deleted file mode 100644 index c195093b..00000000 --- a/fa/css/main.css +++ /dev/null @@ -1,165 +0,0 @@ -/*Language specific styles that override default*/ - -/*Styles for HTML tags*/ -body{ - font-family:'DroidNaskh', sans-serif; - direction:rtl; -} -h1,h2{ - font-family:'DroidNaskh', sans-serif; -} -h1,h2,h3{ - text-align:right; -} -ul{ - padding-right:20px; - padding-left:auto; -} -li{ - text-align:right; -} -p{ - line-height:2em; -} - -/*Styles for whole website*/ - -#head{ - direction:ltr; -} -#lang{ - font-family:"Helvetica Neue", "Liberation Sans", Arial, sans-serif; -} -#menusimple li a, -#menusimple li a:active, -#menusimple li a:visited, -#menusimple li a:link{ - font-family:'DroidNaskh', sans-serif; -} -#footer{ - text-align:right; - padding:20px 40px 20px 0px; -} -#footer>div>a{ - margin-right:0px; - margin-left:15px; -} -.titleicon{ - margin-right:auto; - margin-left:5px; -} -h1 .rssicon{ - margin-left:0px; - margin-right:10px; -} -h2 .rssicon{ - margin-left:0px; - margin-right:10px; -} -.previewrow>div{ - margin-right:auto; - margin-left:17px; -} -.previewrow>div>a{ - line-height:1.2em; -} -.previewrow>div.last{ - margin-left:0px; -} -.previewrow>div>div>div>span { - right:auto; - left:30px; -} -.previewrow>div>div>div>h2{ - text-align:right; -} -.previewrow>div>div>div>h2:first-child+span+p{ - line-height:1.5em; -} -.index a,.index a:link,.index a:active,.index a:visited{ - line-height:2em; -} -.floatimg{ - float:right; - margin-right:auto; - margin-left:10px; -} -.press-faq li{ - line-height:2em; -} -.conferencebanner{ - right:auto; - left:5px; -} - -/*Override UbuntuBold by Droid Naskh*/ - -@font-face{font-family:'DroidNaskh';src:url('/font/droidnaskh-regular.eot');font-weight:normal;font-style:normal;} -@font-face{font-family:'DroidNaskh';src:url('/font/droidnaskh-regular.ttf') format('truetype');font-weight:normal;font-style:normal;} - -/*Styles specific to mobiles*/ - -@media handheld, only screen and (max-device-height: 37em), only screen and (max-device-width: 50em){ - #content{ - position:static; - padding:15px 10px 20px 10px; - text-align:right; - } -} - -/* Deprecated styles (should be removed when translations are updated) */ - -body.old #menufor li a, -body.old #menufor li a:active, -body.old #menufor li a:visited, -body.old #menufor li a:link{ - font-family:'DroidNaskh', sans-serif; -} -body.old #menu li a, -body.old #menu li a:active, -body.old #menu li a:visited, -body.old #menu li a:link{ - font-family:'DroidNaskh', sans-serif; -} -body.old h1,body.old h2{ - font-family:'DroidNaskh', sans-serif; -} -body.old h1,body.old h2,body.old h3{ - text-align:right; -} -body.old .summary{ - text-align:right; -} -body.old #content{ - padding:20px 30px 30px 265px; -} -body.old #rightbox{ - left:30px; - right:auto; -} -body.old #choose img, -body.old #before img, -body.old #support img, -body.old #choose .ieimg, -body.old #before .ieimg, -body.old #support .ieimg{ - margin-right:-40px; - margin-left:8px; -} -body.old #choose>a:first-child, -body.old #before>a:first-child, -body.old #support>a:first-child{ - text-align:right; - padding:10px 48px 10px 8px; -} - -/* Deprecated styles specific to mobiles (should be removed when translations are updated) */ - -@media handheld, only screen and (max-device-height: 37em), only screen and (max-device-width: 50em){ - body.old #menufor{ - bottom:0px; - } - body.old #content{ - padding:15px 10px 20px 10px; - } -} diff --git a/img/but_involve.png b/img/but_involve.png deleted file mode 100644 index c5708175..00000000 Binary files a/img/but_involve.png and /dev/null differ diff --git a/img/but_involve.svg b/img/but_involve.svg deleted file mode 100644 index e8c02f6a..00000000 --- a/img/but_involve.svg +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - diff --git a/img/but_start.png b/img/but_start.png deleted file mode 100644 index 4f35f2d5..00000000 Binary files a/img/but_start.png and /dev/null differ diff --git a/img/but_start.svg b/img/but_start.svg deleted file mode 100644 index f8fd8b8a..00000000 --- a/img/but_start.svg +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - diff --git a/img/but_start_rev.png b/img/but_start_rev.png deleted file mode 100644 index 65d040c3..00000000 Binary files a/img/but_start_rev.png and /dev/null differ diff --git a/img/but_start_rev.svg b/img/but_start_rev.svg deleted file mode 100644 index 6849cbc8..00000000 --- a/img/but_start_rev.svg +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - diff --git a/img/but_warn.png b/img/but_warn.png deleted file mode 100644 index b7a2abc5..00000000 Binary files a/img/but_warn.png and /dev/null differ diff --git a/img/but_warn.svg b/img/but_warn.svg deleted file mode 100644 index 39d8c19f..00000000 --- a/img/but_warn.svg +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - - - image/svg+xml - - - - - - - - - - - diff --git a/pl/css/main.css b/pl/css/main.css deleted file mode 100644 index e6e995f7..00000000 --- a/pl/css/main.css +++ /dev/null @@ -1,11 +0,0 @@ -h1,h2{ - font-family:"Helvetica Neue", "Liberation Sans", Arial, sans-serif; - font-weight: bold; -} -#menufor li a,#menufor li a:active,#menufor li a:visited,#menufor li a:link{ - font-family: "Helvetica Neue", "Liberation Sans", Arial, sans-serif; - font-weight: bold; -} -#menu li a,#menu li a:active,#menu li a:visited,#menu li a:link{ - font-family: "Helvetica Neue", "Liberation Sans", Arial, sans-serif; -} diff --git a/ru/css/main.css b/ru/css/main.css deleted file mode 100644 index e6e995f7..00000000 --- a/ru/css/main.css +++ /dev/null @@ -1,11 +0,0 @@ -h1,h2{ - font-family:"Helvetica Neue", "Liberation Sans", Arial, sans-serif; - font-weight: bold; -} -#menufor li a,#menufor li a:active,#menufor li a:visited,#menufor li a:link{ - font-family: "Helvetica Neue", "Liberation Sans", Arial, sans-serif; - font-weight: bold; -} -#menu li a,#menu li a:active,#menu li a:visited,#menu li a:link{ - font-family: "Helvetica Neue", "Liberation Sans", Arial, sans-serif; -} diff --git a/zh_CN/css/main.css b/zh_CN/css/main.css deleted file mode 100644 index 4bdaff0c..00000000 --- a/zh_CN/css/main.css +++ /dev/null @@ -1,7 +0,0 @@ -h1,h2{ - font-family:"Helvetica Neue", "Liberation Sans", Arial, sans-serif; - font-weight:bold; -} -#menusimple li a,#menusimple li a:active,#menusimple li a:visited,#menusimple li a:link{ - font-family:"Helvetica Neue", "Liberation Sans", Arial, sans-serif; -} diff --git a/zh_TW/css/main.css b/zh_TW/css/main.css deleted file mode 100644 index e6e995f7..00000000 --- a/zh_TW/css/main.css +++ /dev/null @@ -1,11 +0,0 @@ -h1,h2{ - font-family:"Helvetica Neue", "Liberation Sans", Arial, sans-serif; - font-weight: bold; -} -#menufor li a,#menufor li a:active,#menufor li a:visited,#menufor li a:link{ - font-family: "Helvetica Neue", "Liberation Sans", Arial, sans-serif; - font-weight: bold; -} -#menu li a,#menu li a:active,#menu li a:visited,#menu li a:link{ - font-family: "Helvetica Neue", "Liberation Sans", Arial, sans-serif; -}