From a1f6784faedc4bc672ce8037f423c43179ae3724 Mon Sep 17 00:00:00 2001 From: ilyaigpetrov Date: Fri, 21 Apr 2017 18:10:44 -0700 Subject: [PATCH] Change colors, make apply-button shared --- .../runet-censorship-bypass/.gitignore | 2 + .../pages/choose-pac-provider/index.html | 74 ++++++++++--------- .../src/templates-data.js | 2 +- 3 files changed, 41 insertions(+), 37 deletions(-) diff --git a/extensions/chromium/runet-censorship-bypass/.gitignore b/extensions/chromium/runet-censorship-bypass/.gitignore index c7bfad5..b4cc6d0 100644 --- a/extensions/chromium/runet-censorship-bypass/.gitignore +++ b/extensions/chromium/runet-censorship-bypass/.gitignore @@ -1,4 +1,6 @@ node_modules +node_modules_linux +node_modules_win npm-debug.log .swp build/ diff --git a/extensions/chromium/runet-censorship-bypass/src/extension-common/pages/choose-pac-provider/index.html b/extensions/chromium/runet-censorship-bypass/src/extension-common/pages/choose-pac-provider/index.html index fa67d25..ed9397a 100644 --- a/extensions/chromium/runet-censorship-bypass/src/extension-common/pages/choose-pac-provider/index.html +++ b/extensions/chromium/runet-censorship-bypass/src/extension-common/pages/choose-pac-provider/index.html @@ -8,6 +8,8 @@ --ribbon-color: #4169e1; --blue-bg: dodgerblue; --default-grey: #bfbfbf; + --mild-hr: #d3d3d3; + --hr: #bababa; max-width: 28em; } body { @@ -52,7 +54,7 @@ #list-of-notifiers { margin-left: 0.4em; } - li, footer { + li, .nowrap { display: block; white-space: nowrap; word-break: keep-all; @@ -67,7 +69,8 @@ cursor: pointer; } hr { - border-width: 1px 0 0 0; + border: none; + border-top: 1px solid var(--hr); margin: 0 0 0.6em 0; padding: 0; } @@ -143,17 +146,19 @@ :root.if-options-page section[data-for] { padding-bottom: 0.6em; } - :root.if-options-page section[data-for]:not(:last-child) { - border-bottom: 1px solid var(--default-grey); + :root.if-options-page section[data-for]:not(:last-child), + .underlined { + border-bottom: 1px solid var(--mild-hr); } - /* HIDE */ - + /* HIDE starts. */ :root:not(.if-options-page) #acc-pac:not(:checked) ~ .main-nav section[data-for="acc-pac"], :root:not(.if-options-page) #acc-exc:not(:checked) ~ .main-nav section[data-for="acc-exc"], - :root:not(.if-options-page) #acc-own:not(:checked) ~ .main-nav section[data-for="acc-own"], + :root:not(.if-options-page) #acc-own-mods:not(:checked) ~ .main-nav section[data-for="acc-own-mods"], :root:not(.if-options-page) #acc-mods:not(:checked) ~ .main-nav section[data-for="acc-mods"], - :root:not(.if-options-page) #acc-ntf:not(:checked) ~ .main-nav section[data-for="acc-ntf"] + :root:not(.if-options-page) #acc-ntf:not(:checked) ~ .main-nav section[data-for="acc-ntf"], + /* One button shared between two sections: */ + :root:not(.if-options-page) #acc-own-mods:not(:checked) + #acc-mods:not(:checked) ~ .main-nav #apply-mods-button { /* Hide, but preclude width resizes. */ height: 0px !important; @@ -169,21 +174,25 @@ } :root:not(.if-options-page) #acc-pac:not(:checked) ~ .main-nav section[data-for="acc-pac"] *, :root:not(.if-options-page) #acc-exc:not(:checked) ~ .main-nav section[data-for="acc-exc"] *, - :root:not(.if-options-page) #acc-own:not(:checked) ~ .main-nav section[data-for="acc-own"] *, + :root:not(.if-options-page) #acc-own-mods:not(:checked) ~ .main-nav section[data-for="acc-own-mods"] *, :root:not(.if-options-page) #acc-mods:not(:checked) ~ .main-nav section[data-for="acc-mods"] *, - :root:not(.if-options-page) #acc-ntf:not(:checked) ~ .main-nav section[data-for="acc-ntf"] * + :root:not(.if-options-page) #acc-ntf:not(:checked) ~ .main-nav section[data-for="acc-ntf"] *, + /* One button shared between two sections: */ + :root:not(.if-options-page) #acc-own-mods:not(:checked) + #acc-mods:not(:checked) ~ .main-nav #apply-mods-button * { margin-top: 0 !important; margin-bottom: 0 !important; } + /* HIDE ends. */ + .nav-labels { - background-color: #eef; + background-color: var(--chrome-grey); text-align: center; } .nav-labels li label { display: inline-block; - border: 1px solid var(--blue-bg); + border: 1px solid var(--ribbon-color); border-radius: 0.2em; background-color: white; @@ -201,10 +210,11 @@ border-color: white; border-style: dotted;*/ } - /* CHECKED LABELS */ + + /* LABELS starts. */ #acc-pac:checked ~ .nav-labels label[for="acc-pac"]:not(:hover), #acc-exc:checked ~ .nav-labels label[for="acc-exc"]:not(:hover), - #acc-own:checked ~ .nav-labels label[for="acc-own"]:not(:hover), + #acc-own-mods:checked ~ .nav-labels label[for="acc-own-mods"]:not(:hover), #acc-mods:checked ~ .nav-labels label[for="acc-mods"]:not(:hover), #acc-ntf:checked ~ .nav-labels label[for="acc-ntf"]:not(:hover) { @@ -220,12 +230,13 @@ .nav-labels li label:hover:before, #acc-pac:checked ~ .nav-labels label[for="acc-pac"]:before, #acc-exc:checked ~ .nav-labels label[for="acc-exc"]:before, - #acc-own:checked ~ .nav-labels label[for="acc-own"]:before, + #acc-own-mods:checked ~ .nav-labels label[for="acc-own-mods"]:before, #acc-mods:checked ~ .nav-labels label[for="acc-mods"]:before, #acc-ntf:checked ~ .nav-labels label[for="acc-ntf"]:before { visibility: initial; } + /* LABELS ends. */ /* COMMON 2 */ @@ -444,7 +455,7 @@ - + @@ -452,7 +463,7 @@ @@ -479,7 +490,7 @@ -
+
Редактор исключений доступен толко для вкладок.
@@ -507,28 +518,19 @@
-
- - - +
+
    - - - +
      +
      + + К изначальным! +
      +
      Я ❤ yведомления:
        @@ -544,7 +546,7 @@
        Загрузка...
        -