From 11a53f288146f0f850e4083ee3f2994229e0ed87 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Thu, 11 Oct 2018 18:31:26 +0200 Subject: [PATCH 1/4] Ajout de la sortie de la version 1 de PeerTube et lien vers Frama Signed-off-by: Thomas Citharel --- app/assets/scss/main.scss | 4 ++++ app/components/pages/Home.vue | 10 ++++++---- app/locales/en.yml | 3 +++ app/locales/fr.yml | 3 +++ 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/app/assets/scss/main.scss b/app/assets/scss/main.scss index 15484aa..8f83e6d 100644 --- a/app/assets/scss/main.scss +++ b/app/assets/scss/main.scss @@ -163,6 +163,7 @@ body { .install a[href="https://github.com/Chocobozzz/PeerTube/#production"], .how-it-works a[href^="#"], .how-it-works a[href*="/faq"], +.intro a.frama_campaign, .faq .col-sm-12 > p a[href="https://framacolibri.org/c/qualite/peertube"], .getting-started .col-sm-12 > p a[href*="framatube.org"], .button { @@ -181,11 +182,13 @@ body { .intro a[href^="#"]:hover, .install a:hover, .how-it-works a[href^="#"]:hover, +.intro a.frama_campaign:hover, .button { opacity: 1; } .intro a[href="#getting-started"], +.intro a.frama_campaign, .how-it-works a[href="#getting-started"] { margin-right: 4px; color: #fff; @@ -193,6 +196,7 @@ body { } .intro a[href="#how-it-works"], +.intro a.frama_campaign, .install a[href="https://github.com/Chocobozzz/PeerTube/#production"], .how-it-works a[href*="/faq"], .faq .col-sm-12 > p a[href="https://framacolibri.org/c/qualite/peertube"], diff --git a/app/components/pages/Home.vue b/app/components/pages/Home.vue index 749e627..202df38 100644 --- a/app/components/pages/Home.vue +++ b/app/components/pages/Home.vue @@ -16,14 +16,16 @@ src="https://framatube.org/videos/embed/217eefeb-883d-45be-b7fc-a788ad8507d3" > +

+
+

+ + +

-

- - -

diff --git a/app/locales/en.yml b/app/locales/en.yml index 7da89b8..2d00503 100644 --- a/app/locales/en.yml +++ b/app/locales/en.yml @@ -20,6 +20,9 @@ home: title: A decentralized video hosting network, based on free/libre software getting-started: Get started how-it-works: How it works + release: + title: The first version of PeerTube is out! Help us to pursue its development. + button: Support why: power: title: Take back the power… and the responsibilities! diff --git a/app/locales/fr.yml b/app/locales/fr.yml index 1d4cef4..249513e 100644 --- a/app/locales/fr.yml +++ b/app/locales/fr.yml @@ -20,6 +20,9 @@ home: title: L’hébergement de vidéos décentralisé, en réseau, basé sur du logiciel libre getting-started: Pour commencer how-it-works: Comment ça fonctionne + release: + title: La première version de PeerTube est sortie ! Aidez-nous à poursuivre son développement. + button: Soutenir why: power: title: Reprenez le pouvoir… et les responsabilités ! From 994160e2b8c6dba2d83bd91437c0ff3940dd8e11 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Mon, 15 Oct 2018 09:44:05 +0200 Subject: [PATCH 2/4] Remove video on top right Signed-off-by: Thomas Citharel --- app/assets/scss/main.scss | 10 ++++++++-- app/components/pages/Home.vue | 11 +++++++---- app/locales/en.yml | 1 + app/locales/fr.yml | 1 + 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/app/assets/scss/main.scss b/app/assets/scss/main.scss index 8f83e6d..753378d 100644 --- a/app/assets/scss/main.scss +++ b/app/assets/scss/main.scss @@ -323,8 +323,14 @@ a.button { margin-top: 20px; } -.intro .col-md-push-6 .button { - margin-bottom:10px; +.intro .col-md-push-6 { + .button { + margin-bottom:10px; + } + + img { + display: inline-block; + } } @media (min-width: 1200px) { diff --git a/app/components/pages/Home.vue b/app/components/pages/Home.vue index 202df38..0fa1855 100644 --- a/app/components/pages/Home.vue +++ b/app/components/pages/Home.vue @@ -6,7 +6,7 @@

-
+ +

+ PeerTube +

-

+

+

-
diff --git a/app/locales/en.yml b/app/locales/en.yml index 2d00503..62a4523 100644 --- a/app/locales/en.yml +++ b/app/locales/en.yml @@ -21,6 +21,7 @@ home: getting-started: Get started how-it-works: How it works release: + announce: PeerTube v1.0 🎉 title: The first version of PeerTube is out! Help us to pursue its development. button: Support why: diff --git a/app/locales/fr.yml b/app/locales/fr.yml index 249513e..ba2f331 100644 --- a/app/locales/fr.yml +++ b/app/locales/fr.yml @@ -21,6 +21,7 @@ home: getting-started: Pour commencer how-it-works: Comment ça fonctionne release: + announce: PeerTube v1.0 🎉 title: La première version de PeerTube est sortie ! Aidez-nous à poursuivre son développement. button: Soutenir why: From b7a2e7a8fec66da5a0a412361ad0bb818d69e223 Mon Sep 17 00:00:00 2001 From: Rigel Kent Date: Sun, 14 Oct 2018 21:19:11 +0200 Subject: [PATCH 3/4] embed only videos presenting PeerTube --- app/components/pages/Home.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/components/pages/Home.vue b/app/components/pages/Home.vue index 0fa1855..d2a699a 100644 --- a/app/components/pages/Home.vue +++ b/app/components/pages/Home.vue @@ -75,12 +75,12 @@
From 4cf1ddbc572a8667fbcf4b8c00adf2acb4810efe Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Mon, 15 Oct 2018 18:23:06 +0200 Subject: [PATCH 4/4] Add blog link to release Signed-off-by: Thomas Citharel --- app/locales/fr.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/locales/fr.yml b/app/locales/fr.yml index ba2f331..0b521fc 100644 --- a/app/locales/fr.yml +++ b/app/locales/fr.yml @@ -22,8 +22,10 @@ home: how-it-works: Comment ça fonctionne release: announce: PeerTube v1.0 🎉 - title: La première version de PeerTube est sortie ! Aidez-nous à poursuivre son développement. + title: + La première version de PeerTube est sortie ! Aidez-nous à poursuivre son développement. button: Soutenir + blog: Lire l'annonce sur le Framablog why: power: title: Reprenez le pouvoir… et les responsabilités !