From 057b6bfc45f687e9909c8778629cd72a9553a3e6 Mon Sep 17 00:00:00 2001
From: "Ilya Ig. Petrov" <ilyaigpetrov@gmail.com>
Date: Fri, 26 May 2017 08:34:58 -0700
Subject: [PATCH] Visual changes, refactor

---
 .../pages/options/src/components/Exceptions.js       |  9 +++++----
 .../pages/options/src/components/InfoLi.js           |  6 +++++-
 .../pages/options/src/components/ProxyEditor.js      | 12 ++++++------
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/extensions/chromium/runet-censorship-bypass/src/extension-common/pages/options/src/components/Exceptions.js b/extensions/chromium/runet-censorship-bypass/src/extension-common/pages/options/src/components/Exceptions.js
index 3ee2c95..c97d77d 100644
--- a/extensions/chromium/runet-censorship-bypass/src/extension-common/pages/options/src/components/Exceptions.js
+++ b/extensions/chromium/runet-censorship-bypass/src/extension-common/pages/options/src/components/Exceptions.js
@@ -9,10 +9,10 @@ export default function getExceptions(theState) {
 
   const scopedCss = css`
 
-    #excMods {
+    .excMods {
       padding-top: 1em;
     }
-    #excMods input#mods-if-mind-exceptions:not(:checked) + .label-container label {
+    .excMods input#mods-ifMindExceptions:not(:checked) + * > label {
       color: red;
     }
 
@@ -41,13 +41,14 @@ export default function getExceptions(theState) {
         :
         (<div>
           {createElement(ExcEditor, props)}
-          <ul id="excMods">
+          <ul class={scopedCss.excMods}>
             {
               props.apis.pacKitchen.getOrderedConfigs('exceptions').map((conf) => {
 
                 return <InfoLi
-                  conf={conf}
                   type="checkbox"
+                  conf={conf}
+                  idPrefix="mods-"
                   checked={conf.value}
                   disabled={props.ifInputsDisabled}
                   onClick={(evt) => {
diff --git a/extensions/chromium/runet-censorship-bypass/src/extension-common/pages/options/src/components/InfoLi.js b/extensions/chromium/runet-censorship-bypass/src/extension-common/pages/options/src/components/InfoLi.js
index 0cdccfc..ebb12d8 100644
--- a/extensions/chromium/runet-censorship-bypass/src/extension-common/pages/options/src/components/InfoLi.js
+++ b/extensions/chromium/runet-censorship-bypass/src/extension-common/pages/options/src/components/InfoLi.js
@@ -10,7 +10,7 @@ export default function getInfoLi() {
       flex-grow: 9;
       padding-left: 0.3em;
       /* Vertical align to middle. */
-      align-self: flex-end;
+      /*align-self: flex-end;*/
       line-height: 100%;
     }
 
@@ -25,6 +25,10 @@ export default function getInfoLi() {
       position: relative;
       flex-wrap: wrap;
     }
+    .infoRow > input[type="checkbox"] {
+      position: relative;
+      top: -0.08em;
+    }
     .rightBottomIcon {
       margin-left: 0.1em;
       vertical-align: bottom;
diff --git a/extensions/chromium/runet-censorship-bypass/src/extension-common/pages/options/src/components/ProxyEditor.js b/extensions/chromium/runet-censorship-bypass/src/extension-common/pages/options/src/components/ProxyEditor.js
index ba9fb67..335948e 100644
--- a/extensions/chromium/runet-censorship-bypass/src/extension-common/pages/options/src/components/ProxyEditor.js
+++ b/extensions/chromium/runet-censorship-bypass/src/extension-common/pages/options/src/components/ProxyEditor.js
@@ -460,7 +460,7 @@ PROXY foobar.com:8080; # Not HTTP!`.trim()}
 
   }
 
-  let waitingNewValues = [];
+  let waitingTillMount = [];
 
   return class ProxyEditor extends Component {
 
@@ -474,22 +474,22 @@ PROXY foobar.com:8080; # Not HTTP!`.trim()}
         ifExportsMode: false,
       };
       this.handleSwitch = () => this.setState({ifExportsMode: !this.state.ifExportsMode});
-      waitingNewValues.push(newValue); // Wait till mount or eat bugs.
+      waitingTillMount.push(newValue); // Wait till mount or eat bugs.
       
     }
 
     componentDidMount() {
 
-      if (waitingNewValues.length) {
-        this.mayEmitNewValue(this.props.value, waitingNewValues.pop());
-        waitingNewValues = [];
+      if (waitingTillMount.length) {
+        this.mayEmitNewValue(this.props.value, waitingTillMount.pop());
+        waitingTillMount = [];
       }
 
     }
 
     componentDidUnmount() {
 
-      waitingNewValues = [];
+      waitingTillMount = [];
 
     }