diff --git a/_less/ie.css b/_less/ie.css index 74782253..f4c4d705 100644 --- a/_less/ie.css +++ b/_less/ie.css @@ -191,9 +191,16 @@ body{ zoom:1; display:inline; } -.downloadbox span{ +.downloadbox div{ zoom:1; - display:inline; + display:inline; +} +.downloadbox div div{ + display:block; +} +.download span{ + zoom:1; + display:inline; } .alert-message a:hover, @@ -203,11 +210,6 @@ body{ color:#fff; } -.download span{ - zoom:1; - display:inline; -} - .index{ zoom:1; display:inline; diff --git a/_less/rtl.less b/_less/rtl.less index 88641a6e..620b8503 100644 --- a/_less/rtl.less +++ b/_less/rtl.less @@ -117,6 +117,20 @@ h2 .rssicon{ margin-right:auto; margin-left:10px; } +.downloadbox a{ + direction:ltr; +} +.downloadbox small{ + direction:ltr; +} +.downloadbox div div{ + text-align:right; + font-family:Arial, sans-serif; +} +.downloadbox small{ + right:40px; + left:0; +} /*Override UbuntuBold by Droid Naskh*/ @@ -137,6 +151,22 @@ h2 .rssicon{ padding:15px 10px 20px 10px; text-align:right; } + .download{ + text-align:right; + } + .download p{ + text-align:right; + } + .downloadbox{ + text-align:right; + } + .download h1, + .download h2{ + text-align:right; + } + .download div p{ + text-align:right; + } } /* Deprecated styles (should be removed when translations are updated) */ diff --git a/_less/screen.less b/_less/screen.less index 965dc72f..64655a4c 100644 --- a/_less/screen.less +++ b/_less/screen.less @@ -1009,7 +1009,6 @@ h2 .rssicon{ } .downloadbox{ display:inline-block; - text-align:center; border:2px solid #fad296; padding:20px; font-size:125%; @@ -1019,30 +1018,39 @@ h2 .rssicon{ margin:0 auto 20px auto; } .downloadbox p{ - margin:0; - margin-top:20px; - margin-bottom:0; + margin:20px 0 0 0; } .downloadbox p:first-child{ - margin-top:0; - margin-bottom:20px; + margin:0 0 10px 0; +} +.downloadbox p a{ + font-size:90%; } .downloadbox a{ display:inline-block; } .downloadbox div{ + display:inline-block; + margin:0 10px; + vertical-align:top; +} +.downloadbox div div{ + display:block; + width:180px; margin:10px 0; text-align:left; } -.downloadbox span{ - width:16px; - height:16px; - display:inline-block; +.downloadbox img{ + width:32px; + height:32px; + position:relative; + bottom:-22px; } -.download span{ - width:16px; - height:16px; - display:inline-block; +.downloadbox small{ + display:block; + position:relative; + left:40px; + margin-top:4px; } .summary{ @@ -1555,9 +1563,34 @@ h2 .rssicon{ .resourcesorg div{ border-top:0; } + .download{ + text-align:left; + } .download p{ text-align:left; } + .download div p{ + text-align:left; + } + .download h1, + .download h2{ + text-align:left; + } + .download .mainbutton{ + display:none; + } + .downloadbox{ + border:0; + padding:0; + text-align:left; + } + .downloadbox div div{ + margin:0; + width:auto; + } + .downloadbox>p:first-child{ + display:none; + } } /* Deprecated styles (should be removed when translations are updated) */ diff --git a/_templates/download.html b/_templates/download.html index a381fe62..9fd56f0f 100755 --- a/_templates/download.html +++ b/_templates/download.html @@ -9,24 +9,25 @@ id: download
icon{% translate download %}

{% translate downloados %}

-
windows {% translate downloadwinzip %} ~16MB
-
windows {% translate downloadwinexe %} ~12MB
-
ubuntu {% translate downloadubu %} ~4MB
-
linux {% translate downloadlin %} ~16MB
-
osx {% translate downloadmac %} ~14MB
- {% 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 %}

+
+ +
windows Windows (zip) ~16MB
+
ubuntu Ubuntu (PPA) ~4MB
+
+
+
osx Mac OS X ~14MB
+
linux Linux (tgz) ~16MB
+
opensource Source code (GitHub)
+
+

+ {% 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' %}{% translate downloadsig download en %}{% else %}{% translate downloadsig %}{% endcase %}
+ {% translate versionhistory %} +

{% 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' %} {% else %} -

{% translate patient %}

+

warning{% translate patient %}

{% endcase %}

{% translate notesync %}

{% translate notelicense %}

diff --git a/_translations/en.yml b/_translations/en.yml index 8fe22fe6..71f458d9 100644 --- a/_translations/en.yml +++ b/_translations/en.yml @@ -151,13 +151,7 @@ en: latestversion: "Latest version : " download: "Download Bitcoin-Qt" downloados: "Or choose your operating system" - downloadwinzip: "Download for Windows (zip)" - downloadwinexe: "Download for Windows (exe)" - downloadubu: "Download for Ubuntu (PPA)" - downloadlin: "Download for Linux (tgz, 32/64-bit)" - downloadmac: "Download for Mac OS X" downloadsig: "Verify release signatures" - downloadsource: "Source code" versionhistory: "Show version history" notelicense: "Bitcoin-Qt is a community-driven free software project, released under the MIT license." notesync: "Bitcoin-Qt initial sync can take a very long time to complete. You should make sure that you have enough bandwidth and storage for the full block chain size. If you know how to download a torrent file, you can speed up this process by putting bootstrap.dat (a previous copy of the block chain) in the Bitcoin-Qt data directory before starting the software." diff --git a/img/os/med_linux.png b/img/os/med_linux.png new file mode 100644 index 00000000..2510508c Binary files /dev/null and b/img/os/med_linux.png differ diff --git a/img/os/med_opensource.png b/img/os/med_opensource.png new file mode 100644 index 00000000..9992ed68 Binary files /dev/null and b/img/os/med_opensource.png differ diff --git a/img/os/med_opensource.svg b/img/os/med_opensource.svg new file mode 100644 index 00000000..5139399e --- /dev/null +++ b/img/os/med_opensource.svg @@ -0,0 +1,61 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/img/os/med_osx.png b/img/os/med_osx.png new file mode 100644 index 00000000..d7a89016 Binary files /dev/null and b/img/os/med_osx.png differ diff --git a/img/os/med_ubuntu.png b/img/os/med_ubuntu.png new file mode 100644 index 00000000..54134c0a Binary files /dev/null and b/img/os/med_ubuntu.png differ diff --git a/img/os/med_ubuntu.svg b/img/os/med_ubuntu.svg new file mode 100644 index 00000000..c824071e --- /dev/null +++ b/img/os/med_ubuntu.svg @@ -0,0 +1,98 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff --git a/img/os/med_win.png b/img/os/med_win.png new file mode 100644 index 00000000..35cfa274 Binary files /dev/null and b/img/os/med_win.png differ diff --git a/img/os/sig.png b/img/os/sig.png deleted file mode 100644 index dcf52f99..00000000 Binary files a/img/os/sig.png and /dev/null differ diff --git a/img/os/sig.svg b/img/os/sig.svg deleted file mode 100644 index 8cfec436..00000000 --- a/img/os/sig.svg +++ /dev/null @@ -1,85 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - - - diff --git a/img/warning.png b/img/warning.png index 61251338..9070cc08 100644 Binary files a/img/warning.png and b/img/warning.png differ