Minor UI patch (#17955)

* Add comment * EASE mode toggle logic check * CSS adjustments
EFForg · May 13, 2019 · d9a6da1 · d9a6da1
1 parent 6b71fab
commit d9a6da1
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/chromium/pages/popup/index.html b/chromium/pages/popup/index.html
@@ -32,9 +32,9 @@ <h1 id="onoffswitch_label" data-i18n="menu_globalEnable"></h1>
     </section>
 
     <section id="HttpNowhere" class="options settings_block" style="visibility: hidden;">
-      <h1 id="HttpNowhere__header" data-i18n="menu_encryptAllSitesEligibleOn"></h1>
+      <h1 id="HttpNowhere__header"></h1>
       <input aria-hidden="true" id="http-nowhere-checkbox" type="checkbox"><label id="http-nowhere-checkbox_label" aria-label="Toggle on or off" for="http-nowhere-checkbox"></label>
-      <h2 id="HttpNowhere__explained" data-i18n="menu_httpNoWhereExplainedAllowed"></h2>
+      <h2 id="HttpNowhere__explained"></h2>
     </section>
 
     <section id="RuleManagement" class="settings_block">

diff --git a/chromium/pages/popup/style.css b/chromium/pages/popup/style.css
@@ -261,7 +261,7 @@ input:checked+label:after {
 
 #StableRules h3 {
   float: left;
-  margin-left: 10px;
+  margin: 10px;
 }
 #StableRules h2 {
   margin-left: 10px;
@@ -271,12 +271,11 @@ input:checked+label:after {
   border-radius: 20px;
   color: #fff;
   display: block;
-  float: right;
+  float: left;
   font-size: 12px;
   font-weight: bold;
   height: 15px;
-  margin-top: 10px;
-  margin-right: 55%;
+  margin-top: 8px;
   padding: 5px;
   text-align: center;
   width: 15px;

diff --git a/chromium/pages/popup/ux.js b/chromium/pages/popup/ux.js
@@ -138,9 +138,10 @@ function showHttpNowhereUI() {
       e('http-nowhere-checkbox').checked = true;
       e('HttpNowhere__header').innerText = chrome.i18n.getMessage("menu_encryptAllSitesEligibleOn");
       e('HttpNowhere__explained').innerText = chrome.i18n.getMessage("menu_httpNoWhereExplainedBlocked");
+    } else {
+      e('HttpNowhere__header').innerText = chrome.i18n.getMessage("menu_encryptAllSitesEligibleOff");
+      e('HttpNowhere__explained').innerText = chrome.i18n.getMessage("menu_httpNoWhereExplainedAllowed");
     }
-    e('HttpNowhere__header').innerText = chrome.i18n.getMessage("menu_encryptAllSitesEligibleOff");
-    e('HttpNowhere__explained').innerText = chrome.i18n.getMessage("menu_httpNoWhereExplainedAllowed");
     e('HttpNowhere').style.visibility = "visible";
   });
 };