From 5cae90753c2db3da334fc91084f8b9876a7c3cd8 Mon Sep 17 00:00:00 2001 From: Christian Hoffmann Date: Wed, 17 Mar 2021 22:34:24 +0100 Subject: [PATCH 1/2] Start page: Add download links for 3.7.0 This replaces the SourceForge link to platform-specific direct links on Github for better usability. This requires text changes. To avoid delaying the release further, it was decided to not run those texts through translators again. This could still be updated post-release, of course. This required CSS changes because the styling was previously specified for a single link identified by an id=. This obviously breaks with multiple links. Fixes #359. --- 1-de-index.html | 2 +- 1-es-index.html | 3 +-- 1-fr-index.html | 2 +- 1-index.html | 2 +- 1-it-index.html | 2 +- _config.yml | 1 + assets/css/home.css | 8 ++++---- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/1-de-index.html b/1-de-index.html index 9695e0b1c..6ea62ee34 100644 --- a/1-de-index.html +++ b/1-de-index.html @@ -10,7 +10,7 @@ mAltProgIcon: "Jamulus Icon" mTSlogan: "Musiziere online. Mit deinen Freunden. Kostenlos." mTGetStartedNow: "Jetzt Starten!" -mHTMLDownloadNow: 'Erweitert: sofort herunterladen' +mHTMLDownloadNow: 'Sofort herunterladen für Windows, Mac, Debian/Ubuntu oder andere Plattformen.' ---
diff --git a/1-es-index.html b/1-es-index.html index 820dc7177..9da77ddf9 100644 --- a/1-es-index.html +++ b/1-es-index.html @@ -10,8 +10,7 @@ mAltProgIcon: "Jamulus icon" mTSlogan: "Toca música online. Con amig@s. Gratis." mTGetStartedNow: "¡Empieza ya!" -mHTMLDownloadNow: 'Avanzado: descarga ahora' +mHTMLDownloadNow: 'Download now for Windows, Mac, Debian/Ubuntu or other platforms.' ---
diff --git a/1-fr-index.html b/1-fr-index.html index 9979529ec..00cb2903c 100644 --- a/1-fr-index.html +++ b/1-fr-index.html @@ -10,7 +10,7 @@ mAltProgIcon: "Icône de Jamulus" mTSlogan: "Jouez de la musique en ligne. Avec vos amis. Librement et gratuitement." mTGetStartedNow: "Commencer maintenant !" -mHTMLDownloadNow: 'Avancé : télécharger directement' +mHTMLDownloadNow: 'Download now for Windows, Mac, Debian/Ubuntu or other platforms.' ---
diff --git a/1-index.html b/1-index.html index dff6994ae..a192b9698 100644 --- a/1-index.html +++ b/1-index.html @@ -10,7 +10,7 @@ mAltProgIcon: "Jamulus icon" mTSlogan: "Play music online. With friends. For free." mTGetStartedNow: "Get started now!" -mHTMLDownloadNow: 'Advanced: download now' +mHTMLDownloadNow: 'Download now for Windows, Mac, Debian/Ubuntu or other platforms.' ---
diff --git a/1-it-index.html b/1-it-index.html index ddf3f2ab9..a77282554 100644 --- a/1-it-index.html +++ b/1-it-index.html @@ -10,7 +10,7 @@ mAltProgIcon: "Jamulus icon" mTSlogan: "Suonare Online. Tra Amici. In libertà." mTGetStartedNow: "Comincia a Suonare!" -mHTMLDownloadNow: 'Cominciamo: Scarica Ora' +mHTMLDownloadNow: 'Download now for Windows, Mac, Debian/Ubuntu or other platforms.' ---
diff --git a/_config.yml b/_config.yml index 27b85a269..bd29e4722 100644 --- a/_config.yml +++ b/_config.yml @@ -16,6 +16,7 @@ download_file_names: windows: "jamulus_3.7.0_win.exe" mac: "jamulus_3.7.0_mac.dmg" android: "jamulus_3.7.0_android.apk" +download_overview_link: "https://github.com/jamulussoftware/jamulus/releases/latest" githubrepoeditbase: "https://github.com/jamulussoftware/jamuluswebsite/edit/changes" kbnewpage: 'https://github.com/jamulussoftware/jamuluswebsite/new/changes/_posts/?value=---%0Alayout%3A%20post%0Atitle%3A%20%22Your%20Title%22%0Alang%3A%20%22en%22%0Aauthor%3A%20%22YourName%22%0Aheading%3A%20%22Heading%22%0A---%0AName%20this%20file%20and%20edit%20the%20parameters%20above%21&message=New%20post' diff --git a/assets/css/home.css b/assets/css/home.css index b25ace456..cf191e700 100644 --- a/assets/css/home.css +++ b/assets/css/home.css @@ -47,12 +47,12 @@ header { margin: .5em 0 0 0; } -#dld_frm_sf { +#dl_frm_sf_container a { color: #ffffff; text-decoration: none; } -#dld_frm_sf:hover { +#dl_frm_sf_container a:hover { text-decoration: underline; } @@ -75,12 +75,12 @@ header { margin: .5em 0 0 0; } -#dld_frm_sf { +#dl_frm_sf_container a { color: #ffffff; text-decoration: none; } -#dld_frm_sf:hover { +#dl_frm_sf_container a:hover { text-decoration: underline; } From 1a920fe3d8ebb79e32b6cc37a1de15d3bf6bcb7d Mon Sep 17 00:00:00 2001 From: Christian Hoffmann Date: Wed, 17 Mar 2021 22:38:15 +0100 Subject: [PATCH 2/2] CSS: Remove duplicated definitions --- assets/css/home.css | 28 ---------------------------- 1 file changed, 28 deletions(-) diff --git a/assets/css/home.css b/assets/css/home.css index cf191e700..c2809b27f 100644 --- a/assets/css/home.css +++ b/assets/css/home.css @@ -70,31 +70,3 @@ header { transition: 0.4s; opacity: 0.9; } - -#dl_frm_sf_container { - margin: .5em 0 0 0; -} - -#dl_frm_sf_container a { - color: #ffffff; - text-decoration: none; -} - -#dl_frm_sf_container a:hover { - text-decoration: underline; -} - -#bannercontainer { - margin-top: 10px; -} - -#jamulusbanner { - width: 100%; - transition: 0.4s; - opacity: 1; -} - -#jamulusbanner:hover { - transition: 0.4s; - opacity: 0.9; -}