summaryrefslogtreecommitdiff
path: root/web
diff options
context:
space:
mode:
authorDevaev Maxim <[email protected]>2018-11-24 04:41:25 +0300
committerDevaev Maxim <[email protected]>2018-11-24 04:41:25 +0300
commit6c9372a8ff34ca3d6f3edcea4da6404422dcfadf (patch)
treee389901c64a4e922aeeaa17e2ba97487285d088b /web
parent97d8d6ea4c2ce88e6045f89461ac0ca8caff0830 (diff)
css refactoring
Diffstat (limited to 'web')
-rw-r--r--web/css/index/index.css8
-rw-r--r--web/css/kvm/about.css6
-rw-r--r--web/css/kvm/hid.css4
-rw-r--r--web/css/kvm/keyboard.css24
-rw-r--r--web/css/kvm/stream.css4
-rw-r--r--web/css/main.css42
-rw-r--r--web/css/menu.css22
-rw-r--r--web/css/modals.css8
-rw-r--r--web/css/progress.css6
-rw-r--r--web/css/sliders.css16
-rw-r--r--web/css/switches.css10
-rw-r--r--web/css/vars.css81
-rw-r--r--web/css/windows.css15
13 files changed, 136 insertions, 110 deletions
diff --git a/web/css/index/index.css b/web/css/index/index.css
index 6a34448c..72ab5c24 100644
--- a/web/css/index/index.css
+++ b/web/css/index/index.css
@@ -12,11 +12,11 @@ div#start {
outline: none;
word-wrap: break-word;
max-width: 800px;
- border: var(--border-dark-thin);
+ border: var(--border-window-thin);
border-radius: 8px;
box-sizing: border-box;
box-shadow: var(--shadow-big);
- background-color: var(--bg-color-light);
+ background-color: var(--cs-window-default-bg);
padding: 15px;
}
@@ -41,9 +41,9 @@ div#start div#apps-box ul#apps li div.app {
height: 100px;
width: 100px;
text-align: center;
- background-color: var(--bg-color-normal);
+ background-color: var(--cs-control-default-bg);
box-shadow: var(--shadow-micro);
- border: var(--border-dark-thin);
+ border: var(--border-key-thin);
border-radius: 8px;
}
diff --git a/web/css/kvm/about.css b/web/css/kvm/about.css
index a841c3a6..c049dd59 100644
--- a/web/css/kvm/about.css
+++ b/web/css/kvm/about.css
@@ -30,8 +30,8 @@ div#about textarea {
width: 100%;
height: 200px;
padding: 0;
- color: var(--fg-color-light);
- background-color: var(--bg-color-dark);
+ color: var(--cs-code-default-fg);
+ background-color: var(--cs-code-default-bg);
border: none;
border-radius: 4px;
outline: 0 !important;
@@ -55,5 +55,5 @@ div#about textarea::-webkit-scrollbar {
}
div#about textarea::-webkit-scrollbar-thumb {
border-radius: 4px;
- background: var(--fg-color-inactive);
+ background: var(--cs-scroll-default-bg);
}
diff --git a/web/css/kvm/hid.css b/web/css/kvm/hid.css
index 28f4291e..6663a85c 100644
--- a/web/css/kvm/hid.css
+++ b/web/css/kvm/hid.css
@@ -3,8 +3,8 @@ textarea#hid-pak-text {
resize: none;
width: 100%;
height: 40px;
- color: var(--fg-color-intensive);
- background-color: var(--bg-color-light);
+ color: var(--cs-window-default-fg);
+ background-color: var(--cs-window-default-bg);
border: none;
outline: 0 !important;
-webkit-appearance:none;
diff --git a/web/css/kvm/keyboard.css b/web/css/kvm/keyboard.css
index 5d9b5df3..2ff622f3 100644
--- a/web/css/kvm/keyboard.css
+++ b/web/css/kvm/keyboard.css
@@ -31,26 +31,26 @@ div.keyboard div.key, div.modifier {
text-align: center;
vertical-align: top;
box-shadow: var(--shadow-micro);
- border: var(--border-gray-thin);
+ border: var(--border-key-thin);
border-radius: 6px;
- color: var(--fg-color-normal);
- background-color: var(--bg-color-gray);
+ color: var(--cs-key-default-fg);
+ background-color: var(--cs-key-default-bg);
cursor: pointer;
height: 40px;
}
div.keyboard div.key:hover, div.modifier:hover {
- color: var(--fg-color-intensive);
- background-color: var(--bg-color-menu);
+ color: var(--cs-key-hovered-fg);
+ background-color: var(--cs-key-hovered-bg);
}
div.keyboard div.pressed {
box-shadow: none;
- color: var(--fg-color-selected) !important;
- background-color: var(--bg-color-dark) !important;
+ color: var(--cs-key-pressed-fg) !important;
+ background-color: var(--cs-key-pressed-bg) !important;
}
div.keyboard div.holded {
box-shadow: none;
- color: var(--fg-color-normal) !important;
- background-color: var(--bg-color-intensive) !important;
+ color: var(--cs-key-default-fg) !important;
+ background-color: var(--cs-key-holded-bg) !important;
}
div.keyboard div.key:last-child, div.empty-key:last-child, div.modifier:last-child {
margin-right: 0;
@@ -96,7 +96,7 @@ div.keyboard p {
transform: translateY(-50%);
}
div.keyboard b {
- color: var(--bg-color-intensive);
+ color: var(--cs-key-holded-bg);
}
@media only screen and (min-device-width: 768px) and (max-device-width: 1024px) {
@@ -133,8 +133,8 @@ div#keyboard-mobile {
}
div.keyboard div.key:hover, div.modifier:hover {
- color: var(--fg-color-normal);
- background-color: var(--bg-color-gray);
+ color: var(--cs-key-default-fg);
+ background-color: var(--cs-key-default-bg);
}
div#keyboard-desktop {
diff --git a/web/css/kvm/stream.css b/web/css/kvm/stream.css
index 10670ef4..c99c3c9c 100644
--- a/web/css/kvm/stream.css
+++ b/web/css/kvm/stream.css
@@ -5,7 +5,7 @@ div#stream-info {
div#stream-box {
position: relative;
display: inline-block;
- border: var(--border-dark-thin);
+ border: var(--border-window-thin);
}
div.stream-box-inactive::after {
cursor: wait;
@@ -82,7 +82,7 @@ div#stream-mouse-buttons {
padding: 0;
padding-bottom: 3px;
font-size: 0.8em;
- color: var(--fg-color-dark);
+ color: var(--cs-window-header-default-fg);
}
div#stream-mouse-buttons {
display: block !important;
diff --git a/web/css/main.css b/web/css/main.css
index 8f37f6bd..28361905 100644
--- a/web/css/main.css
+++ b/web/css/main.css
@@ -1,8 +1,8 @@
body {
margin: 0;
overflow: hidden;
- color: var(--fg-color-normal);
- background-color: var(--bg-color-normal);
+ color: var(--cs-page-default-fg);
+ background-color: var(--cs-page-default-bg);
font-family: sans-serif !important;
}
body.body-no-select {
@@ -13,12 +13,12 @@ body.body-no-select {
}
a {
- color: var(--fg-color-normal);
+ color: var(--cs-page-default-fg);
}
hr {
border: none;
- border-top: var(--border-normal-thin);
+ border-top: var(--border-default-thin);
}
p.text {
@@ -36,8 +36,8 @@ div.code {
overflow-x: auto;
font-family: monospace;
border-radius: 4px;
- color: var(--fg-color-dark);
- background-color: var(--bg-color-dark);
+ color: var(--cs-code-default-fg);
+ background-color: var(--cs-code-default-bg);
padding: 10px;
}
div.code::-webkit-scrollbar {
@@ -46,11 +46,11 @@ div.code::-webkit-scrollbar {
}
div.code::-webkit-scrollbar-thumb {
border-radius: 4px;
- background: var(--fg-color-inactive);
+ background: var(--cs-scroll-default-bg);
}
div.code span.code-comment {
- color: var(--fg-color-inactive);
+ color: var(--cs-code-comment-fg);
}
img.svg-gray {
@@ -62,8 +62,8 @@ img.svg-gray {
button, select {
box-shadow: none;
border: none;
- color: var(--fg-color-normal);
- background-color: var(--bg-color-normal);
+ color: var(--cs-control-default-fg);
+ background-color: var(--cs-control-default-bg);
display: block;
width: 100%;
height: 30px;
@@ -74,11 +74,11 @@ button, select {
@media (hover: hover), (min--moz-device-pixel-ratio: 0) {
/* If we have a mouse cursor */
button:enabled:hover, select:enabled:hover {
- color: var(--fg-color-intensive);
- background-color: var(--bg-color-dark) !important;
+ color: var(--cs-control-hovered-fg);
+ background-color: var(--cs-control-hovered-bg) !important;
}
button:active, select:active {
- color: var(--fg-color-selected) !important;
+ color: var(--cs-control-pressed-fg) !important;
}
select:enabled:hover {
background-image: url("../svg/select-arrow-intensive.svg") !important;
@@ -87,12 +87,12 @@ button, select {
@media (hover: none) {
/* If we DON'T have a mouse cursor */
button:active, select:active {
- color: var(--fg-color-intensive);
- background-color: var(--bg-color-dark);
+ color: var(--cs-control-hovered-fg);
+ background-color: var(--cs-control-hovered-bg);
}
}
button:disabled, select:disabled {
- color: var(--fg-color-inactive);
+ color: var(--cs-control-disabled-fg);
cursor: default;
}
@@ -111,8 +111,8 @@ select:disabled {
background-image: url("../svg/select-arrow-inactive.svg") !important;
}
select:active {
- color: var(--fg-color-intensive) !important;
- background-color: var(--bg-color-dark) !important;
+ color: var(--cs-control-intensive-fg) !important;
+ background-color: var(--cs-bg-control-intensive) !important;
background-image: url("../svg/select-arrow-intensive.svg") !important;
}
@@ -141,7 +141,7 @@ div.buttons-row {
width: 16.66%
}
.row50:not(:first-child), .row25:not(:first-child), .row16:not(:first-child) {
- border-left: var(--border-dark-thin);
+ border-left: var(--border-control-thin);
}
ul.footer {
@@ -151,7 +151,7 @@ ul.footer {
width: 100%;
padding: 0;
font-size: 0.7em;
- color: var(--fg-color-inactive);
+ color: var(--cs-page-obscure-fg);
z-index: -10;
}
ul.footer li {
@@ -164,5 +164,5 @@ ul.footer li.footer-right {
float: right;
}
ul.footer li a {
- color: var(--fg-color-inactive);
+ color: var(--cs-page-obscure-fg);
}
diff --git a/web/css/menu.css b/web/css/menu.css
index 581aaf97..789f4119 100644
--- a/web/css/menu.css
+++ b/web/css/menu.css
@@ -3,7 +3,7 @@ ul.menu {
list-style-type: none;
margin: 0;
padding: 0;
- background-color: var(--bg-color-menu);
+ background-color: var(--cs-menu-default-bg);
position: fixed;
top: 0;
width: 100%;
@@ -32,27 +32,27 @@ ul.menu li a.menu-item {
line-height: 50px;
outline: none;
cursor: pointer;
- border-left: var(--border-black-thin);
+ border-left: var(--border-menu-thin);
display: inline-block;
- color: var(--fg-color-normal);
+ color: var(--cs-menu-default-fg);
padding-left: 16px;
padding-right: 16px;
text-decoration: none;
}
ul.menu li a.menu-item:hover:not(.active) {
- background-color: var(--bg-color-hovered);
+ background-color: var(--cs-menu-hovered-bg);
}
@media only screen and (min-device-width: 768px) and (max-device-width: 1024px) {
/* iPad 8 */
ul.menu li a.menu-item:hover:not(.active) {
- background-color: var(--bg-color-menu) !important;
+ background-color: var(--cs-menu-default-bg) !important;
}
}
ul.menu li a.menu-item-selected {
- box-shadow: 0 5px 0 var(--border-color-intensive) inset;
- background-color: var(--bg-color-selected) !important;
+ box-shadow: var(--shadow-menu-pressed);
+ background-color: var(--cs-menu-pressed-bg) !important;
}
ul.menu li div.menu-item-content {
@@ -60,17 +60,17 @@ ul.menu li div.menu-item-content {
overflow: hidden;
white-space: nowrap;
border: var(--border-intensive-2px);
- border-top: var(--border-dark-thin);
+ border-top: var(--border-control-thin);
border-radius: 0 0 8px 8px;
position: absolute;
- background-color: var(--bg-color-menu);
+ background-color: var(--cs-menu-default-bg);
min-width: 180px;
box-shadow: var(--shadow-big);
z-index: 2147483645;
}
ul.menu li div.menu-item-content-buttons {
- background-color: var(--bg-color-normal);
+ background-color: var(--cs-control-default-bg);
}
ul.menu li div.menu-item-content-text {
@@ -89,5 +89,5 @@ ul.menu li div.menu-item-content hr {
height: 0px;
padding: 0;
border: none;
- border-top: var(--border-dark-thin);
+ border-top: var(--border-control-thin);
}
diff --git a/web/css/modals.css b/web/css/modals.css
index 955795bb..0be761f0 100644
--- a/web/css/modals.css
+++ b/web/css/modals.css
@@ -15,11 +15,11 @@ div.modal div.modal-window {
outline: none;
margin: 15% auto;
overflow: hidden;
- border: var(--border-dark-thin);
+ border: var(--border-window-thin);
border-radius: 8px;
box-sizing: border-box;
box-shadow: var(--shadow-big);
- background-color: var(--bg-color-light);
+ background-color: var(--cs-window-default-bg);
padding: 0;
}
div.modal div.modal-window:focus {
@@ -30,7 +30,7 @@ div.modal div.modal-window div.modal-header {
text-align: center;
font-weight: bold;
padding: 3px 9px 3px 9px;
- border-bottom: var(--border-normal-thin);
+ border-bottom: var(--border-default-thin);
}
div.modal div.modal-window div.modal-content {
@@ -40,7 +40,7 @@ div.modal div.modal-window div.modal-content {
}
div.modal div.modal-window div.modal-buttons {
- border-top: var(--border-dark-thin);
+ border-top: var(--border-control-thin);
margin: 0;
padding: 0;
font-size: 0;
diff --git a/web/css/progress.css b/web/css/progress.css
index 37eeb380..1085e5cf 100644
--- a/web/css/progress.css
+++ b/web/css/progress.css
@@ -1,12 +1,12 @@
div.progress {
- background-color: var(--bg-color-selected);
+ background-color: var(--cs-progress-default-bg);
height: 1.5em;
width: 100%;
position: relative;
}
div.progress:before {
- color: var(--fg-color-intensive);
+ color: var(--cs-progress-default-fg);
content: attr(data-label);
font-size: 0.8em;
position: absolute;
@@ -17,7 +17,7 @@ div.progress:before {
}
div.progress span.progress-value {
- background-color: var(--bg-color-intensive);
+ background-color: var(--cs-progress-bar-bg);
display: inline-block;
height: 100%;
}
diff --git a/web/css/sliders.css b/web/css/sliders.css
index 472734eb..2ad2bf45 100644
--- a/web/css/sliders.css
+++ b/web/css/sliders.css
@@ -33,7 +33,7 @@ input[type=range].slider:disabled {
input[type=range].slider::-webkit-slider-runnable-track {
height: 5px;
- background: var(--bg-color-light);
+ background: var(--cs-control-default-bg);
border-radius: 3px;
}
input[type=range].slider:disabled::-webkit-slider-runnable-track {
@@ -45,19 +45,19 @@ input[type=range].slider::-webkit-slider-thumb {
height: 18px;
width: 18px;
border-radius: 25px;
- background: var(--bg-color-intensive);
+ background: var(--cs-thumb-default-bg);
-webkit-appearance: none;
margin-top: -7px;
}
input[type=range].slider:disabled::-webkit-slider-thumb {
cursor: default;
- border: var(--border-inactive-2px);
- background: var(--bg-color-normal);
+ border: var(--border-default-2px);
+ background: var(--cs-thumb-disabled-bg);
}
input[type=range].slider::-moz-range-track {
height: 5px;
- background: var(--bg-color-light);
+ background: var(--cs-control-default-bg);
border-radius: 3px;
}
input[type=range].slider:disabled::-moz-range-track {
@@ -69,10 +69,10 @@ input[type=range].slider::-moz-range-thumb {
height: 18px;
width: 18px;
border-radius: 25px;
- background: var(--bg-color-intensive);
+ background: var(--cs-thumb-disabled-bg);
}
input[type=range].slider:disabled::-moz-range-thumb {
cursor: default;
- border: var(--border-inactive-2px);
- background: var(--bg-color-normal);
+ border: var(--border-default-2px);
+ background: var(--cs-control-default-bg);
}
diff --git a/web/css/switches.css b/web/css/switches.css
index 603115c4..65e187f9 100644
--- a/web/css/switches.css
+++ b/web/css/switches.css
@@ -41,16 +41,16 @@ div.switch-box label.switch-label span.switch-inner:before, span.switch-inner:af
div.switch-box label.switch-label span.switch-inner:before {
content: "ON";
padding-left: 5px;
- background-color: var(--bg-color-gray);
- color: var(--fg-color-normal);
+ background-color: var(--cs-control-default-bg);
+ color: var(--cs-control-default-fg);
text-align: left;
}
div.switch-box label.switch-label span.switch-inner:after {
content: "OFF";
padding-right: 5px;
- background-color: var(--bg-color-gray);
- color: var(--fg-color-inactive);
+ background-color: var(--cs-control-default-bg);
+ color: var(--cs-control-disabled-fg);
text-align: right;
}
@@ -58,7 +58,7 @@ div.switch-box label.switch-label span.switch {
display: block;
width: 15px;
margin: 0px;
- background: var(--bg-color-intensive);
+ background: var(--cs-thumb-default-bg);
position: absolute;
top: 0;
bottom: 0;
diff --git a/web/css/vars.css b/web/css/vars.css
index 3a92e220..8f5c6d52 100644
--- a/web/css/vars.css
+++ b/web/css/vars.css
@@ -1,34 +1,59 @@
:root {
- --bg-color-normal: #36393f;
- --bg-color-light: #484b51;
- --bg-color-gray: #3b3e43;
- --bg-color-dark: #17191d;
- --bg-color-menu: #202225;
- --bg-color-intensive: #436a8a;
- --bg-color-hovered: #1a1c1f;
- --bg-color-selected: #171717;
-
- --fg-color-normal: #c3c3c3;
- --fg-color-dark: #aaaaaa;
- --fg-color-intensive: white;
- --fg-color-inactive: #6c7481;
- --fg-color-selected: var(--fg-color-inactive);
-
- --border-color-normal: var(--bg-color-normal);
- --border-color-gray: var(--bg-color-menu);
- --border-color-dark: var(--bg-color-dark);
- --border-color-intensive: #5b90bb;
- --border-color-important: #ff6467;
-
- --border-dark-thin: thin solid var(--border-color-dark);
- --border-gray-thin: thin solid var(--border-color-gray);
- --border-normal-thin: thin solid var(--border-color-normal);
- --border-black-thin: thin solid black;
- --border-inactive-2px: 2px solid var(--border-color-normal);
- --border-intensive-2px: 2px solid var(--border-color-intensive);
- --border-intensive-thin: thin solid var(--border-color-intensive);
+ --cs-page-default-bg: #36393f;
+ --cs-page-default-fg: #c3c3c3;
+ --cs-page-obscure-fg: #6c7481;
+
+ --cs-control-default-bg: #36393f;
+ --cs-control-default-fg: #c3c3c3;
+ --cs-control-intensive-fg: white;
+ --cs-control-hovered-bg: #17191d;
+ --cs-control-hovered-fg: white;
+ --cs-control-pressed-fg: #6c7481;
+ --cs-control-disabled-fg: #6c7481;
+
+ --cs-menu-default-bg: #202225;
+ --cs-menu-default-fg: #c3c3c3;
+ --cs-menu-hovered-bg: #1a1c1f;
+ --cs-menu-pressed-bg: #171717;
+
+ --cs-window-default-bg: #484b51;
+ --cs-window-default-fg: #c3c3c3;
+ --cs-window-header-default-fg: #aaaaaa;
+ --cs-window-header-grabbed-bg: #436a8a;
+ --cs-window-header-grabbed-fg: white;
+ --cs-window-closer-default-fg: #6c7481;
+
+ --cs-code-default-bg: #17191d;
+ --cs-code-default-fg: #aaaaaa;
+ --cs-code-comment-fg: #6c7481;
+
+ --cs-scroll-default-bg: #6c7481;
+ --cs-thumb-default-bg: #436a8a;
+ --cs-thumb-disabled-bg: #202225;
+
+ --cs-progress-default-bg: #171717;
+ --cs-progress-default-fg: white;
+ --cs-progress-bar-bg: #436a8a;
+
+ --cs-key-default-bg: #3b3e43;
+ --cs-key-default-fg: #c3c3c3;
+ --cs-key-hovered-bg: #202225;
+ --cs-key-hovered-fg: white;
+ --cs-key-pressed-bg: #17191d;
+ --cs-key-pressed-fg: #6c7481;
+ --cs-key-holded-bg: #436a8a;
--shadow-micro: 1px 2px 4px 0 rgba(0, 0, 0, 0.4);
--shadow-small: 0 2px 4px 0 rgba(0, 0, 0, 0.2);
--shadow-big: 0 8px 16px 0 rgba(0, 0, 0, 0.4);
+ --shadow-menu-pressed: 0 5px 0 #5b90bb inset;
+
+ --border-default-thin: thin solid #36393f;
+ --border-default-2px: 2px solid #36393f;
+ --border-menu-thin: thin solid black;
+ --border-control-thin: thin solid #17191d;
+ --border-window-thin: thin solid #17191d;
+ --border-key-thin: thin solid #202225;
+ --border-intensive-2px: 2px solid #5b90bb;
+ --border-intensive-thin: thin solid #5b90bb;
}
diff --git a/web/css/windows.css b/web/css/windows.css
index 68351896..a8948164 100644
--- a/web/css/windows.css
+++ b/web/css/windows.css
@@ -3,12 +3,13 @@ div.window {
outline: none;
overflow: hidden;
position: fixed;
- border: var(--border-dark-thin);
+ border: var(--border-window-thin);
border-radius: 8px;
box-sizing: border-box;
box-shadow: var(--shadow-big);
white-space: nowrap;
- background-color: var(--bg-color-light);
+ color: var(--cs-window-default-fg);
+ background-color: var(--cs-window-default-bg);
padding: 30px 9px 9px 9px;
}
div.window:focus {
@@ -24,8 +25,8 @@ div.window div.window-header {
padding: 0;
height: 20px;
font-size: 0.8em;
- color: var(--fg-color-dark);
- border-bottom: var(--border-normal-thin);
+ color: var(--cs-window-header-default-fg);
+ border-bottom: var(--border-default-thin);
}
div.window div.window-header div.window-grab {
@@ -40,8 +41,8 @@ div.window div.window-header div.window-grab {
}
div.window div.window-header-grabbed {
- color: var(--fg-color-intensive);
- background-color: var(--bg-color-intensive);
+ color: var(--cs-window-header-grabbed-fg);
+ background-color: var(--cs-window-header-grabbed-bg);
border-bottom: var(--border-intensive-thin);
}
@@ -52,7 +53,7 @@ div.window div.window-header button.window-button-close {
width: 44px;
height: 24px;
padding-left: 0;
- color: var(--fg-color-inactive);
+ color: var(--cs-window-closer-default-fg);
display: inline-block;
}