From f130fd0598bbbfa0b32a11e9d7241bfc525eb479 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Tue, 28 Feb 2017 18:02:12 +0100
Subject: [PATCH] Fix horizontal scrollbar in edge

---
 customize.dist/about.html                  |  7 ++---
 customize.dist/contact.html                |  7 ++---
 customize.dist/index.html                  |  7 ++---
 customize.dist/main.css                    |  6 ++--
 customize.dist/main.js                     |  2 --
 customize.dist/privacy.html                |  8 ++---
 customize.dist/src/fragments/noscript.html |  5 ++-
 customize.dist/src/less/cryptpad.less      | 36 +++++++++++-----------
 customize.dist/terms.html                  |  7 ++---
 www/login/index.html                       | 25 ++++++++-------
 www/login/main.js                          |  2 --
 www/register/index.html                    | 25 ++++++++-------
 www/register/main.js                       |  2 --
 www/settings/index.html                    |  7 ++---
 14 files changed, 64 insertions(+), 82 deletions(-)

diff --git a/customize.dist/about.html b/customize.dist/about.html
index ca47ede06..c0f3a0b97 100644
--- a/customize.dist/about.html
+++ b/customize.dist/about.html
@@ -50,10 +50,10 @@
 </div>
 
 
-        <div id="noscriptContainer">
+    <noscript>
+    <div id="noscriptContainer">
         <div class="mainOverlay"></div>
         <div id="noscript">
-          <noscript>
           <p>
             <strong>OOPS</strong> In order to do encryption in your browser, Javascript is really <strong>really</strong> required.
           </p>
@@ -61,10 +61,9 @@
           <p>
             <strong>OUPS</strong> Afin de pouvoir réaliser le chiffrement dans votre navigateur, Javascript est <strong>vraiment</strong> nécessaire.
           </p>
-          </noscript>
         </div>
     </div>
-
+</noscript>
 
 
     <div id="mainBlock" class="hidden">
diff --git a/customize.dist/contact.html b/customize.dist/contact.html
index 9147d7b7c..7b2cd03ae 100644
--- a/customize.dist/contact.html
+++ b/customize.dist/contact.html
@@ -50,10 +50,10 @@
 </div>
 
 
-        <div id="noscriptContainer">
+    <noscript>
+    <div id="noscriptContainer">
         <div class="mainOverlay"></div>
         <div id="noscript">
-          <noscript>
           <p>
             <strong>OOPS</strong> In order to do encryption in your browser, Javascript is really <strong>really</strong> required.
           </p>
@@ -61,10 +61,9 @@
           <p>
             <strong>OUPS</strong> Afin de pouvoir réaliser le chiffrement dans votre navigateur, Javascript est <strong>vraiment</strong> nécessaire.
           </p>
-          </noscript>
         </div>
     </div>
-
+</noscript>
 
 
     <div id="mainBlock" class="hidden">
diff --git a/customize.dist/index.html b/customize.dist/index.html
index 63db2de39..eb1815e34 100644
--- a/customize.dist/index.html
+++ b/customize.dist/index.html
@@ -50,10 +50,10 @@
 </div>
 
 
-        <div id="noscriptContainer">
+    <noscript>
+    <div id="noscriptContainer">
         <div class="mainOverlay"></div>
         <div id="noscript">
-          <noscript>
           <p>
             <strong>OOPS</strong> In order to do encryption in your browser, Javascript is really <strong>really</strong> required.
           </p>
@@ -61,10 +61,9 @@
           <p>
             <strong>OUPS</strong> Afin de pouvoir réaliser le chiffrement dans votre navigateur, Javascript est <strong>vraiment</strong> nécessaire.
           </p>
-          </noscript>
         </div>
     </div>
-
+</noscript>
 
 
     <div id="mainBlock" class="hidden">
diff --git a/customize.dist/main.css b/customize.dist/main.css
index 3c2ec600a..fb3be659c 100644
--- a/customize.dist/main.css
+++ b/customize.dist/main.css
@@ -714,7 +714,7 @@ html.cp,
   background-color: #000;
   opacity: 0.35;
 }
-.cp #noscriptContainer {
+.cp noscript #noscriptContainer {
   color: black;
   position: absolute;
   top: 50px;
@@ -723,7 +723,7 @@ html.cp,
   right: 0;
   z-index: 2;
 }
-.cp #noscriptContainer #noscript {
+.cp noscript #noscriptContainer #noscript {
   width: 1000px;
   display: flex;
   align-items: center;
@@ -732,8 +732,6 @@ html.cp,
   margin-left: auto;
   margin-right: auto;
   position: relative;
-}
-.cp #noscriptContainer #noscript noscript {
   font-size: 25px;
   text-align: center;
   color: #fff;
diff --git a/customize.dist/main.js b/customize.dist/main.js
index 7498724f7..4c6d37ae5 100644
--- a/customize.dist/main.js
+++ b/customize.dist/main.js
@@ -15,8 +15,6 @@ define([
     $(function () {
         var $main = $('#mainBlock');
 
-        $('#noscriptContainer').remove();
-
         // Language selector
         var $sel = $('#language-selector');
         Cryptpad.createLanguageSelector(undefined, $sel);
diff --git a/customize.dist/privacy.html b/customize.dist/privacy.html
index f0335f398..10910bfff 100644
--- a/customize.dist/privacy.html
+++ b/customize.dist/privacy.html
@@ -50,10 +50,10 @@
 </div>
 
 
-        <div id="noscriptContainer">
+    <noscript>
+    <div id="noscriptContainer">
         <div class="mainOverlay"></div>
         <div id="noscript">
-          <noscript>
           <p>
             <strong>OOPS</strong> In order to do encryption in your browser, Javascript is really <strong>really</strong> required.
           </p>
@@ -61,10 +61,9 @@
           <p>
             <strong>OUPS</strong> Afin de pouvoir réaliser le chiffrement dans votre navigateur, Javascript est <strong>vraiment</strong> nécessaire.
           </p>
-          </noscript>
         </div>
     </div>
-
+</noscript>
 
 
     <div id="mainBlock" class="hidden">
@@ -92,7 +91,6 @@
     <h2 data-localization="policy_choices"></h2>
     <p data-localization="policy_choices_open"></p>
     <p data-localization="policy_choices_vpn"></p>
-    <p data-localization="policy_choices_ads"></p>
 
     <br />
 </div>
diff --git a/customize.dist/src/fragments/noscript.html b/customize.dist/src/fragments/noscript.html
index 3328a56d1..f59294ea3 100644
--- a/customize.dist/src/fragments/noscript.html
+++ b/customize.dist/src/fragments/noscript.html
@@ -1,7 +1,7 @@
+<noscript>
     <div id="noscriptContainer">
         <div class="mainOverlay"></div>
         <div id="noscript">
-          <noscript>
           <p>
             <strong>OOPS</strong> In order to do encryption in your browser, Javascript is really <strong>really</strong> required.
           </p>
@@ -9,7 +9,6 @@
           <p>
             <strong>OUPS</strong> Afin de pouvoir réaliser le chiffrement dans votre navigateur, Javascript est <strong>vraiment</strong> nécessaire.
           </p>
-          </noscript>
         </div>
     </div>
-
+</noscript>
diff --git a/customize.dist/src/less/cryptpad.less b/customize.dist/src/less/cryptpad.less
index 650c03228..a4b2f148e 100644
--- a/customize.dist/src/less/cryptpad.less
+++ b/customize.dist/src/less/cryptpad.less
@@ -253,24 +253,24 @@ body.html {
         opacity: 0.35;
     }
 }
-#noscriptContainer {
-    color: black;
-    position: absolute;
-    top: @topbar-height;
-    left: 0;
-    bottom: 0;
-    right: 0;
-    z-index: 2;
-    #noscript {
-        width: 1000px;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        height: 100%;
-        margin-left: auto;
-        margin-right: auto;
-        position: relative;
-        noscript {
+noscript {
+    #noscriptContainer {
+        color: black;
+        position: absolute;
+        top: @topbar-height;
+        left: 0;
+        bottom: 0;
+        right: 0;
+        z-index: 2;
+        #noscript {
+            width: 1000px;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            height: 100%;
+            margin-left: auto;
+            margin-right: auto;
+            position: relative;
             font-size: 25px;
             text-align: center;
             color: @main-color;
diff --git a/customize.dist/terms.html b/customize.dist/terms.html
index 31f02bfa7..205f6c2a7 100644
--- a/customize.dist/terms.html
+++ b/customize.dist/terms.html
@@ -50,10 +50,10 @@
 </div>
 
 
-        <div id="noscriptContainer">
+    <noscript>
+    <div id="noscriptContainer">
         <div class="mainOverlay"></div>
         <div id="noscript">
-          <noscript>
           <p>
             <strong>OOPS</strong> In order to do encryption in your browser, Javascript is really <strong>really</strong> required.
           </p>
@@ -61,10 +61,9 @@
           <p>
             <strong>OUPS</strong> Afin de pouvoir réaliser le chiffrement dans votre navigateur, Javascript est <strong>vraiment</strong> nécessaire.
           </p>
-          </noscript>
         </div>
     </div>
-
+</noscript>
 
 
     <div id="mainBlock" class="hidden">
diff --git a/www/login/index.html b/www/login/index.html
index a8e408a89..6dd755e2f 100644
--- a/www/login/index.html
+++ b/www/login/index.html
@@ -40,21 +40,20 @@
         <a href="/contact.html" data-localization="contact">Contact</a>
     </span>
 </div>
-
+    <noscript>
         <div id="noscriptContainer">
-        <div class="mainOverlay"></div>
-        <div id="noscript">
-          <noscript>
-          <p>
-            <strong>OOPS</strong> In order to do encryption in your browser, Javascript is really <strong>really</strong> required.
-          </p>
-          <hr>
-          <p>
-            <strong>OUPS</strong> Afin de pouvoir réaliser le chiffrement dans votre navigateur, Javascript est <strong>vraiment</strong> nécessaire.
-          </p>
-          </noscript>
+            <div class="mainOverlay"></div>
+            <div id="noscript">
+              <p>
+                <strong>OOPS</strong> In order to do encryption in your browser, Javascript is really <strong>really</strong> required.
+              </p>
+              <hr>
+              <p>
+                <strong>OUPS</strong> Afin de pouvoir réaliser le chiffrement dans votre navigateur, Javascript est <strong>vraiment</strong> nécessaire.
+              </p>
+            </div>
         </div>
-    </div>
+    </noscript>
 
     <div id="mainBlock" class="hidden">
 
diff --git a/www/login/main.js b/www/login/main.js
index 04128f402..e18732671 100644
--- a/www/login/main.js
+++ b/www/login/main.js
@@ -13,8 +13,6 @@ define([
         var $main = $('#mainBlock');
         var Messages = Cryptpad.Messages;
 
-        $('#noscriptContainer').remove();
-
         // Language selector
         var $sel = $('#language-selector');
         Cryptpad.createLanguageSelector(undefined, $sel);
diff --git a/www/register/index.html b/www/register/index.html
index 067b18863..0e427c3da 100644
--- a/www/register/index.html
+++ b/www/register/index.html
@@ -37,21 +37,20 @@
         <a href="/contact.html" data-localization="contact">Contact</a>
     </span>
 </div>
-
+    <noscript>
         <div id="noscriptContainer">
-        <div class="mainOverlay"></div>
-        <div id="noscript">
-          <noscript>
-          <p>
-            <strong>OOPS</strong> In order to do encryption in your browser, Javascript is really <strong>really</strong> required.
-          </p>
-          <hr>
-          <p>
-            <strong>OUPS</strong> Afin de pouvoir réaliser le chiffrement dans votre navigateur, Javascript est <strong>vraiment</strong> nécessaire.
-          </p>
-          </noscript>
+            <div class="mainOverlay"></div>
+            <div id="noscript">
+              <p>
+                <strong>OOPS</strong> In order to do encryption in your browser, Javascript is really <strong>really</strong> required.
+              </p>
+              <hr>
+              <p>
+                <strong>OUPS</strong> Afin de pouvoir réaliser le chiffrement dans votre navigateur, Javascript est <strong>vraiment</strong> nécessaire.
+              </p>
+            </div>
         </div>
-    </div>
+    </noscript>
 
     <div id="mainBlock" class="hidden">
 
diff --git a/www/register/main.js b/www/register/main.js
index d0a05212a..e432830a8 100644
--- a/www/register/main.js
+++ b/www/register/main.js
@@ -16,8 +16,6 @@ define([
     $(function () {
         var $main = $('#mainBlock');
 
-        $('#noscriptContainer').remove();
-
         // Language selector
         var $sel = $('#language-selector');
         Cryptpad.createLanguageSelector(undefined, $sel);
diff --git a/www/settings/index.html b/www/settings/index.html
index f3d603b6b..bbe122ed1 100644
--- a/www/settings/index.html
+++ b/www/settings/index.html
@@ -51,10 +51,10 @@
 </div>
 
 
-        <div id="noscriptContainer">
+    <noscript>
+    <div id="noscriptContainer">
         <div class="mainOverlay"></div>
         <div id="noscript">
-          <noscript>
           <p>
             <strong>OOPS</strong> In order to do encryption in your browser, Javascript is really <strong>really</strong> required.
           </p>
@@ -62,10 +62,9 @@
           <p>
             <strong>OUPS</strong> Afin de pouvoir réaliser le chiffrement dans votre navigateur, Javascript est <strong>vraiment</strong> nécessaire.
           </p>
-          </noscript>
         </div>
     </div>
-
+</noscript>
 
 
     <div id="mainBlock" class="hidden">