4 files changed, 183 insertions, 121 deletions

diff --git a/client/src/app/+about/about-peertube/about-peertube-contributors.component.html b/client/src/app/+about/about-peertube/about-peertube-contributors.component.html
index de60754cb..4e7d2389b 100644
--- a/client/src/app/+about/about-peertube/about-peertube-contributors.component.html
+++ b/client/src/app/+about/about-peertube/about-peertube-contributors.component.html
@@ -1,11 +1,9 @@
 <div class="peertube-contributors">
-  <h3 i18n class="section-title">Who made this software?</h3>
-
-  <p align="center">
-    <strong>Developed with &#10084; by <a target="_blank" rel="noopener noreferrer" href="https://framasoft.org">Framasoft</a></strong>
+  <p class="framasoft">
+    <strong i18n>Developed with &#10084; by <a target="_blank" rel="noopener noreferrer" href="https://framasoft.org">Framasoft</a></strong>
   </p>
 
-  <p align="center">
+  <p>
     <a target="_blank" rel="noopener noreferrer" href="https://framasoft.org">
       <img width="150px" src="/client/assets/images/framasoft.png" alt="Framasoft logo"/>
     </a>
diff --git a/client/src/app/+about/about-peertube/about-peertube-contributors.component.scss b/client/src/app/+about/about-peertube/about-peertube-contributors.component.scss
index 6a22f569f..03e6ce8c8 100644
--- a/client/src/app/+about/about-peertube/about-peertube-contributors.component.scss
+++ b/client/src/app/+about/about-peertube/about-peertube-contributors.component.scss
@@ -2,12 +2,24 @@
 @import '_mixins';
 
 .peertube-contributors {
+  .framasoft {
+    font-size: 18px;
+  }
+
+  > p {
+    text-align: center;
+  }
+
   /deep/ h1 {
     font-size: 1rem;
+    text-align: center;
+    font-weight: $font-semibold;
+    margin-top: 20px;
   }
 
   /deep/ ul {
     padding: 0;
+    text-align: center;
 
     li {
       display: inline-block;
diff --git a/client/src/app/+about/about-peertube/about-peertube.component.html b/client/src/app/+about/about-peertube/about-peertube.component.html
index c6f21d35a..53aee5634 100644
--- a/client/src/app/+about/about-peertube/about-peertube.component.html
+++ b/client/src/app/+about/about-peertube/about-peertube.component.html
@@ -1,111 +1,158 @@
-<h1 i18n class="about-peertube-title">
-  What is PeerTube?
-</h1>
+<div class="root">
+  <h1 i18n class="about-peertube-title">
+    What is PeerTube?
+  </h1>
 
-<img class="mascot" width="121px" height="147px" src="/client/assets/images/mascot/default.png" alt="mascot" />
-
-<div class="description">
-  <p i18n>
-    PeerTube is a self hosted federated (ActivityPub) video streaming platform using P2P directly in the web browser.
-  </p>
-
-  <p i18n>
-    It is a free and open-source software, under the <a href="https://github.com/Chocobozzz/PeerTube/blob/develop/LICENSE">AGPLv3 licence</a>.
-  </p>
-
-  <p i18n>
-    For more information, please visit <a target="_blank" rel="noopener noreferrer" href="https://joinpeertube.org">joinpeertube.org</a>.
-  </p>
-</div>
-
-<div class="documentation">
-
-
-</div>
-
-<div class="privacy-contributors">
-  <my-about-peertube-contributors></my-about-peertube-contributors>
-
-  <div class="p2p-privacy">
-    <h3 i18n class="section-title">P2P & Privacy</h3>
-
-    <p i18n>
-      PeerTube uses the BitTorrent protocol to share bandwidth between users.
-      This implies that your IP address is stored in the instance's BitTorrent tracker as long as you download or watch the video.
-    </p>
-
-    <h6 i18n class="p2p-privacy-title">What are the consequences?</h6>
-
-    <p i18n>
-      In theory, someone with enough technical skills could create a script that tracks which IP is downloading which video.
-      In practice, this is much more difficult because:
-    </p>
-
-    <ul>
-      <li i18n>
-        An HTTP request has to be sent on each tracker for each video to spy.
-        If we want to spy all PeerTube's videos, we have to send as many requests as there are videos (so potentially a lot)
-      </li>
-
-      <li i18n>
-        For each request sent, the tracker returns random peers at a limited number.
-        For instance, if there are 1000 peers in the swarm and the tracker sends only 20 peers for each request, there must be at least 50 requests sent to know every peers in the swarm
-      </li>
-
-      <li i18n>
-        Those requests have to be sent regularly to know who starts/stops watching a video. It is easy to detect that kind of behaviour
-      </li>
-
-      <li i18n>
-        If an IP address is stored in the tracker, it doesn't mean that the person behind the IP (if this person exists) has watched the video
-      </li>
-
-      <li i18n>
-        The IP address is a vague information: usually, it regularly changes and can represent many persons or entities
-      </li>
-
-      <li i18n>
-        Web peers are not publicly accessible: because we use WebRTC inside the web browser (<a href="https://webtorrent.io/">with the WebTorrent library</a>), the protocol is different from classic BitTorrent.
-        When you are in a web browser, you send a signal containing your IP address to the tracker that will randomly choose other peers to forward the information to.
-        See <a href="https://github.com/yciabaud/webtorrent/blob/beps/bep_webrtc.rst">this document</a> for more information
-      </li>
-    </ul>
+  <img class="mascot" width="121px" height="147px" src="/client/assets/images/mascot/default.png" alt="mascot"/>
 
+  <div class="description">
     <p i18n>
-      The worst-case scenario of an average person spying on their friends is quite unlikely.
-      There are much more effective ways to get that kind of information.
+      PeerTube is a self hosted federated (ActivityPub) video streaming platform using P2P directly in the web browser.
     </p>
 
-    <h6 i18n class="p2p-privacy-title">How does PeerTube compare with YouTube?</h6>
-
     <p i18n>
-      The threats to privacy in YouTube are different from PeerTube's.
-      In YouTube's case, the platform gathers a huge amount of your personal information (not only your IP) to analyze them and track you.
-      Moreover, YouTube is owned by Google/Alphabet, a company that tracks you across many websites (via AdSense or Google Analytics).
+      It is a free and open-source software, under the <a href="https://github.com/Chocobozzz/PeerTube/blob/develop/LICENSE">AGPLv3
+      licence</a>.
     </p>
 
-    <h6 i18n class="p2p-privacy-title">What can I do to limit the exposure of my IP address?</h6>
-
     <p i18n>
-      Your IP address is public so every time you consult a website, there is a number of actors (in addition to the final website) seeing your IP in their connection logs: ISP/routers/trackers/CDN and more.
-      PeerTube is transparent about it: we warn you that if you want to keep your IP private, you must use a VPN or Tor Browser.
-      Thinking that removing P2P from PeerTube will give you back anonymity doesn't make sense.
+      For more information, please visit <a target="_blank" rel="noopener noreferrer" href="https://joinpeertube.org">joinpeertube.org</a>.
     </p>
+  </div>
 
-    <h6 i18n class="p2p-privacy-title">What will be done to mitigate this problem?</h6>
+  <div class="documentation">
+
+    <div class="card">
+      <div class="card-body">
+        <h5 class="card-title">
+          <a i18n target="_blank" rel="noopener noreferrer" href="https://docs.joinpeertube.org/#/use-setup-account">Use PeerTube
+            documentation</a>
+        </h5>
+
+        <div i18n class="card-text">
+          Discover how to setup your account, what is a channel, how to create a playlist and more!
+        </div>
+      </div>
+    </div>
+
+    <div class="card">
+      <div class="card-body">
+        <h5 class="card-title">
+          <a i18n target="_blank" rel="noopener noreferrer" href="https://docs.joinpeertube.org/#/use-third-party-application">PeerTube
+            Applications</a>
+        </h5>
+
+        <div i18n class="card-text">
+          Discover unofficial Android applications or browser addons!
+        </div>
+      </div>
+    </div>
+
+    <div class="card">
+      <div class="card-body">
+        <h5 class="card-title">
+          <a i18n target="_blank" rel="noopener noreferrer" href="https://docs.joinpeertube.org/#/contribute-getting-started">Contribute on
+            PeerTube</a>
+        </h5>
+
+        <div i18n class="card-text">
+          Want to help to improve PeerTube? You can translate the web interface, give your feedback or directly contribute to the code!
+        </div>
+      </div>
+    </div>
+  </div>
 
-    <p i18n>
-      PeerTube is in its early stages, and want to deliver the best countermeasures possible by the time the stable is released.
-      In the meantime, we want to test different ideas related to this issue:
-    </p>
+  <div class="privacy-contributors">
+    <my-about-peertube-contributors></my-about-peertube-contributors>
+
+    <div class="p2p-privacy">
+      <h3 i18n class="section-title">P2P & Privacy</h3>
+
+      <p i18n>
+        PeerTube uses the BitTorrent protocol to share bandwidth between users.
+        This implies that your IP address is stored in the instance's BitTorrent tracker as long as you download or watch the video.
+      </p>
+
+      <h6 i18n class="p2p-privacy-title">What are the consequences?</h6>
+
+      <p i18n>
+        In theory, someone with enough technical skills could create a script that tracks which IP is downloading which video.
+        In practice, this is much more difficult because:
+      </p>
+
+      <ul>
+        <li i18n>
+          An HTTP request has to be sent on each tracker for each video to spy.
+          If we want to spy all PeerTube's videos, we have to send as many requests as there are videos (so potentially a lot)
+        </li>
+
+        <li i18n>
+          For each request sent, the tracker returns random peers at a limited number.
+          For instance, if there are 1000 peers in the swarm and the tracker sends only 20 peers for each request, there must be at least 50
+          requests sent to know every peers in the swarm
+        </li>
+
+        <li i18n>
+          Those requests have to be sent regularly to know who starts/stops watching a video. It is easy to detect that kind of behaviour
+        </li>
+
+        <li i18n>
+          If an IP address is stored in the tracker, it doesn't mean that the person behind the IP (if this person exists) has watched the
+          video
+        </li>
+
+        <li i18n>
+          The IP address is a vague information: usually, it regularly changes and can represent many persons or entities
+        </li>
+
+        <li i18n>
+          Web peers are not publicly accessible: because we use WebRTC inside the web browser (<a href="https://webtorrent.io/">with the
+          WebTorrent library</a>), the protocol is different from classic BitTorrent.
+          When you are in a web browser, you send a signal containing your IP address to the tracker that will randomly choose other peers
+          to forward the information to.
+          See <a href="https://github.com/yciabaud/webtorrent/blob/beps/bep_webrtc.rst">this document</a> for more information
+        </li>
+      </ul>
+
+      <p i18n>
+        The worst-case scenario of an average person spying on their friends is quite unlikely.
+        There are much more effective ways to get that kind of information.
+      </p>
+
+      <h6 i18n class="p2p-privacy-title">How does PeerTube compare with YouTube?</h6>
+
+      <p i18n>
+        The threats to privacy in YouTube are different from PeerTube's.
+        In YouTube's case, the platform gathers a huge amount of your personal information (not only your IP) to analyze them and track you.
+        Moreover, YouTube is owned by Google/Alphabet, a company that tracks you across many websites (via AdSense or Google Analytics).
+      </p>
+
+      <h6 i18n class="p2p-privacy-title">What can I do to limit the exposure of my IP address?</h6>
+
+      <p i18n>
+        Your IP address is public so every time you consult a website, there is a number of actors (in addition to the final website) seeing
+        your IP in their connection logs: ISP/routers/trackers/CDN and more.
+        PeerTube is transparent about it: we warn you that if you want to keep your IP private, you must use a VPN or Tor Browser.
+        Thinking that removing P2P from PeerTube will give you back anonymity doesn't make sense.
+      </p>
+
+      <h6 i18n class="p2p-privacy-title">What will be done to mitigate this problem?</h6>
+
+      <p i18n>
+        PeerTube is in its early stages, and want to deliver the best countermeasures possible by the time the stable is released.
+        In the meantime, we want to test different ideas related to this issue:
+      </p>
+
+      <ul>
+        <li i18n>Set a limit to the number of peers sent by the tracker</li>
+        <li i18n>Set a limit on the request frequency received by the tracker (being tested)</li>
+        <li i18n>Ring a bell if there are unusual requests (being tested)</li>
+        <li i18n>Disable P2P from the administration interface</li>
+        <li i18n>An automatic video redundancy program: we wouldn't know if the IP downloaded the video on purpose or if it was the
+          automatized program
+        </li>
+      </ul>
+    </div>
 
-    <ul>
-      <li i18n>Set a limit to the number of peers sent by the tracker</li>
-      <li i18n>Set a limit on the request frequency received by the tracker (being tested)</li>
-      <li i18n>Ring a bell if there are unusual requests (being tested)</li>
-      <li i18n>Disable P2P from the administration interface</li>
-      <li i18n>An automatic video redundancy program: we wouldn't know if the IP downloaded the video on purpose or if it was the automatized program</li>
-    </ul>
   </div>
-
 </div>
diff --git a/client/src/app/+about/about-peertube/about-peertube.component.scss b/client/src/app/+about/about-peertube/about-peertube.component.scss
index cd1364c14..a43eb6fe1 100644
--- a/client/src/app/+about/about-peertube/about-peertube.component.scss
+++ b/client/src/app/+about/about-peertube/about-peertube.component.scss
@@ -1,6 +1,11 @@
 @import '_variables';
 @import '_mixins';
 
+.root {
+  max-width: 1200px;
+  margin: auto;
+}
+
 .about-peertube-title {
   font-size: 25px;
   text-align: center;
@@ -20,10 +25,22 @@
 }
 
 .description {
-  margin-bottom: 100px;
   text-align: center;
 }
 
+.documentation {
+  display: flex;
+  flex-wrap: wrap;
+  margin: 50px 0;
+  justify-content: center;
+
+  .card {
+    margin: 30px;
+    flex-basis: 300px;
+    font-size: 15px;
+  }
+}
+
 .description,
 .p2p-privacy,
 my-about-peertube-contributors {
@@ -34,31 +51,19 @@ my-about-peertube-contributors {
   }
 }
 
-.p2p-privacy-title {
-  margin-top: 15px;
-}
-
 .privacy-contributors {
   display: flex;
-  flex-direction: row;
-
-  > div,
-  > my-about-peertube-contributors {
-    flex-basis: 100%;
-    display: block;
-  }
+  flex-direction: column;
 
   .p2p-privacy {
+    .section-title {
+      margin: 50px 0 20px;
+      text-align: center;
+    }
+
     h6 {
       font-size: 20px;
+      margin-top: 15px;
     }
   }
-
-  my-about-peertube-contributors {
-    margin: 0 40px 40px 0;
-  }
-
-  @media screen and (max-width: $small-view) {
-    flex-direction: column;
-  }
 }