Merge branch 'master' into 'master'

Bouton sur les liens forum et faq

See merge request framasoft/joinpeertube!12
This commit is contained in:
JosephK 2018-03-21 20:59:00 +01:00
commit d0931a5d2d
5 changed files with 39 additions and 35 deletions

View file

@ -5,10 +5,9 @@ title = "FAQ"
author = "Framasoft" author = "Framasoft"
draft = false draft = false
type = "page" type = "page"
id = "-faq"
+++ +++
{{% grid class="row" %}} {{% grid class="row faq" %}}
{{% grid class="container" %}} {{% grid class="container" %}}
{{% grid class="col-sm-12" %}} {{% grid class="col-sm-12" %}}
<h2 class="text-center">10 questions to discover Framatube...</h2> <h2 class="text-center">10 questions to discover Framatube...</h2>

View file

@ -5,10 +5,9 @@ title = "FAQ"
author = "Framasoft" author = "Framasoft"
draft = false draft = false
type = "page" type = "page"
id = "-faq"
+++ +++
{{% grid class="row" %}} {{% grid class="row faq" %}}
{{% grid class="container" %}} {{% grid class="container" %}}
{{% grid class="col-sm-12" %}} {{% grid class="col-sm-12" %}}
<h2 class="text-center">Quelques questions pour découvrir PeerTube…</h2> <h2 class="text-center">Quelques questions pour découvrir PeerTube…</h2>

View file

@ -5,7 +5,6 @@ title = "Home"
author = "Framasoft" author = "Framasoft"
draft = false draft = false
type = "page" type = "page"
id = "-home"
+++ +++
{{% grid class="row intro" %}} {{% grid class="row intro" %}}

View file

@ -5,7 +5,6 @@ title = "Accueil"
author = "Framasoft" author = "Framasoft"
draft = false draft = false
type = "page" type = "page"
id = "-home"
+++ +++
{{% grid class="row intro" %}} {{% grid class="row intro" %}}

View file

@ -12,7 +12,7 @@ body {
body > .container { body > .container {
padding: 0 15px; padding: 0 15px;
margin-top: 0px; margin-top: 0px;
width:100%; width: 100%;
} }
.navbar-brand { .navbar-brand {
@ -74,8 +74,8 @@ body .content .container {
background: #fff; background: #fff;
margin-top: 30px; margin-top: 30px;
margin-bottom: 30px; margin-bottom: 30px;
padding-top:20px; padding-top: 20px;
padding-bottom:20px; padding-bottom: 20px;
-webkit-box-shadow: 0px 3px 4px rgba(50, 50, 50, 0.2); -webkit-box-shadow: 0px 3px 4px rgba(50, 50, 50, 0.2);
-moz-box-shadow: 0px 3px 4px rgba(50, 50, 50, 0.2); -moz-box-shadow: 0px 3px 4px rgba(50, 50, 50, 0.2);
box-shadow: 0px 3px 4px rgba(50, 50, 50, 0.2); box-shadow: 0px 3px 4px rgba(50, 50, 50, 0.2);
@ -85,9 +85,9 @@ body .medias .container {
background: transparent; background: transparent;
} }
.intro { .intro, .faq {
background: transparent; background: transparent;
margin-top:-70px; margin-top: -70px;
} }
.medias { .medias {
@ -126,8 +126,8 @@ body .medias .container {
.navbar { .navbar {
background: transparent; background: transparent;
border: none; border: none;
margin-top:30px; margin-top: 30px;
z-index:2; z-index: 2;
} }
.navbar .container { .navbar .container {
background: #f7f7f7; background: #f7f7f7;
@ -143,7 +143,7 @@ body .medias .container {
padding: 30px; padding: 30px;
font-size: 1.5em; font-size: 1.5em;
color: #F1680D; color: #F1680D;
opacity:0.7; opacity: 0.7;
} }
@ -164,23 +164,25 @@ body .medias .container {
/* Buttons */ /* Buttons */
.intro a[href^="#"], .intro a[href^="#"],
.install a[href="https://github.com/Chocobozzz/PeerTube/#production"], .install a[href="https://github.com/Chocobozzz/PeerTube/#production"],
.how-it-works a[href^="#"] { .how-it-works a[href^="#"],
margin-top:20px; .how-it-works a[href*="/faq"],
margin-bottom:20px; .faq a[href="https://framacolibri.org/c/qualite/peertube"] {
margin-top: 20px;
margin-bottom: 20px;
font-weight: 500; font-weight: 500;
padding: 10px 16px; padding: 10px 16px;
font-size: 18px; font-size: 18px;
line-height: 1.3333333; line-height: 1.3333333;
border-radius: 6px; border-radius: 6px;
opacity:0.8; opacity: 0.8;
text-decoration:none; text-decoration: none;
display:inline-block; display: inline-block;
} }
.intro a[href^="#"]:hover, .intro a[href^="#"]:hover,
.install a:hover, .install a:hover,
.how-it-works a[href^="#"]:hover { .how-it-works a[href^="#"]:hover {
opacity:1; opacity: 1;
} }
.intro a[href="#getting-started"], .intro a[href="#getting-started"],
@ -191,7 +193,9 @@ body .medias .container {
} }
.intro a[href="#how-it-works"], .intro a[href="#how-it-works"],
.install a[href="https://github.com/Chocobozzz/PeerTube/#production"] { .install a[href="https://github.com/Chocobozzz/PeerTube/#production"],
.how-it-works a[href*="/faq"],
.faq a[href="https://framacolibri.org/c/qualite/peertube"] {
margin-right: auto; margin-right: auto;
color: #F1680D; color: #F1680D;
background: #fff; background: #fff;
@ -266,3 +270,7 @@ body .medias .container {
margin: 0; margin: 0;
padding: 5px 0; padding: 5px 0;
} }
.faq h2 {
margin: 40px 0px;
}