Fix horizontal scrollbar in edge

8 years ago · f130fd0598
parent 345d2faab2
commit f130fd0598
14 changed files with 64 additions and 82 deletions
--- a/customize.dist/about.html
+++ b/customize.dist/about.html
@ -50,10 +50,10 @@
 </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>
@ -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">
--- a/customize.dist/contact.html
+++ b/customize.dist/contact.html
@ -50,10 +50,10 @@
 </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>
@ -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">
--- a/customize.dist/index.html
+++ b/customize.dist/index.html
@ -50,10 +50,10 @@
 </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>
@ -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">
--- 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;
--- 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);
--- a/customize.dist/privacy.html
+++ b/customize.dist/privacy.html
@ -50,10 +50,10 @@
 </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>
@ -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>
--- 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>
--- a/customize.dist/src/less/cryptpad.less
+++ b/customize.dist/src/less/cryptpad.less
@ -253,6 +253,7 @@ body.html {
        opacity: 0.35;
    }
 }
+noscript {
    #noscriptContainer {
        color: black;
        position: absolute;
@ -270,7 +271,6 @@ body.html {
            margin-left: auto;
            margin-right: auto;
            position: relative;
-        noscript {
            font-size: 25px;
            text-align: center;
            color: @main-color;
--- a/customize.dist/terms.html
+++ b/customize.dist/terms.html
@ -50,10 +50,10 @@
 </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>
@ -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">
--- a/www/login/index.html
+++ b/www/login/index.html
@ -40,11 +40,10 @@
        <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>
@ -52,9 +51,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">

--- 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);
--- a/www/register/index.html
+++ b/www/register/index.html
@ -37,11 +37,10 @@
        <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>
@ -49,9 +48,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">

--- 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);
--- a/www/settings/index.html
+++ b/www/settings/index.html
@ -51,10 +51,10 @@
 </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>
@ -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">