Niquarl/joinpeertube
1
0
Fork 0
forked from nutomic/joinpeertube
Code Issues Pull requests Releases Wiki Activity

Merge branch 'peertube-release' into 'master'

Browse source 
Ajout de la sortie de la version 1 de PeerTube et lien vers Frama

See merge request framasoft/peertube/joinpeertube!35
This commit is contained in:
Thomas Citharel 2018-10-15 18:24:18 +02:00
commit 7a671cef88
4 changed files with 34 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/assets/scss/main.scss
View file

@ -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"],
@ -319,10 +323,16 @@ a.button {
margin-top: 20px;
}
.intro .col-md-push-6 .button {
.intro .col-md-push-6 {
.button {
margin-bottom:10px;
}
img {
display: inline-block;
}
}
@media (min-width: 1200px) {
[lang="fr"] .intro .col-md-pull-6 a {
margin-top: 36px;

13
app/components/pages/Home.vue
View file

@ -6,7 +6,7 @@
<h1 v-html="$t('home.title')"></h1>
<h2 v-html="$t('home.intro.title')"></h2>
<div class="col-md-6 well col-md-push-6">
<div class="embed-responsive embed-responsive-16by9">
<!-- <div class="embed-responsive embed-responsive-16by9">
<iframe v-if="$t('lang') === 'fr'"
class="embed-responsive-item" allowfullscreen
src="https://framatube.org/videos/embed/9db9f3f1-9b54-44ed-9e91-461d262d2205"
@ -15,7 +15,12 @@
class="embed-responsive-item" allowfullscreen
src="https://framatube.org/videos/embed/217eefeb-883d-45be-b7fc-a788ad8507d3"
></iframe>
</div>
</div> -->
<p>
<img alt="PeerTube" :src="`${$root['/']}icons/favicon.png`"> <span v-html="$t('home.release.announce')"></span>
</p>
<p class="text-left" v-html="$t('home.release.title')"></p>
<a class="frama_campaign" href="https://framasoft.org" v-html="$t('home.release.button')"></a>
</div>
<div class="col-md-6 col-md-pull-6">
<img :src="`${$root['/']}img/notebook.jpg`" class="img-responsive" alt="">
@ -70,12 +75,12 @@
<div class="embed-responsive embed-responsive-16by9">
<iframe v-if="$t('lang') === 'fr'"
class="embed-responsive-item"
src="https://framatube.org/videos/embed/a8ea95b8-0396-49a6-8f30-e25e25fb2828"
src="https://framatube.org/videos/embed/0900bd2e-7306-4c39-b48b-2d0cd611742e"
allowfullscreen
></iframe>
<iframe v-else
class="embed-responsive-item"
src="https://framatube.org/videos/embed/0900bd2e-7306-4c39-b48b-2d0cd611742e"
src="https://framatube.org/videos/embed/217eefeb-883d-45be-b7fc-a788ad8507d3"
allowfullscreen
></iframe>
</div>

4
app/locales/en.yml
View file

@ -20,6 +20,10 @@ home:
title: A decentralized video hosting network, based on free/libre software
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:
power:
title: Take back the power… and the responsibilities!

6
app/locales/fr.yml
View file

@ -20,6 +20,12 @@ 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:
announce: PeerTube v1.0 🎉
title: <a href="https://framablog.org/2018/10/15/peertube-1-0-la-plateforme-de-videos-libre-et-federee/">
La première version de PeerTube est sortie !</a> 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 !