diff options
author | Chocobozzz <me@florianbigard.com> | 2018-09-20 16:24:49 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-20 16:24:49 +0200 |
commit | dc27668fceb1d0270c391c93c3bbc95d12e83218 (patch) | |
tree | ce6621597505f9518cfdf0981977d097c63f9fad /client/src | |
parent | 6247b2057b792cea155a1abd9788c363ae7d2cc2 (diff) | |
parent | 0491173a61aed66205c017e0d7e0503ea316c144 (diff) | |
download | PeerTube-dc27668fceb1d0270c391c93c3bbc95d12e83218.tar.gz PeerTube-dc27668fceb1d0270c391c93c3bbc95d12e83218.tar.zst PeerTube-dc27668fceb1d0270c391c93c3bbc95d12e83218.zip |
Merge pull request #941 from rigelk/cli-wrapper
adding cli wrapper
Diffstat (limited to 'client/src')
-rw-r--r-- | client/src/app/menu/menu.component.scss | 8 | ||||
-rw-r--r-- | client/src/sass/application.scss | 2 | ||||
-rw-r--r-- | client/src/sass/include/_variables.scss | 2 |
3 files changed, 8 insertions, 4 deletions
diff --git a/client/src/app/menu/menu.component.scss b/client/src/app/menu/menu.component.scss index 0f98da0e2..3e072279f 100644 --- a/client/src/app/menu/menu.component.scss +++ b/client/src/app/menu/menu.component.scss | |||
@@ -10,14 +10,14 @@ | |||
10 | } | 10 | } |
11 | 11 | ||
12 | menu { | 12 | menu { |
13 | background-color: $menu-background; | 13 | background-color: var(--menuBackgroundColor); |
14 | margin: 0; | 14 | margin: 0; |
15 | padding: 0; | 15 | padding: 0; |
16 | height: 100%; | 16 | height: 100%; |
17 | white-space: nowrap; | 17 | white-space: nowrap; |
18 | text-overflow: ellipsis; | 18 | text-overflow: ellipsis; |
19 | overflow: hidden; | 19 | overflow: hidden; |
20 | color: $menu-color; | 20 | color: var(--menuForegroundColor); |
21 | display: flex; | 21 | display: flex; |
22 | flex-direction: column; | 22 | flex-direction: column; |
23 | width: 100%; | 23 | width: 100%; |
@@ -52,7 +52,7 @@ menu { | |||
52 | .logged-in-username { | 52 | .logged-in-username { |
53 | font-size: 16px; | 53 | font-size: 16px; |
54 | font-weight: $font-semibold; | 54 | font-weight: $font-semibold; |
55 | color: $menu-color; | 55 | color: var(--menuForegroundColor); |
56 | cursor: pointer; | 56 | cursor: pointer; |
57 | 57 | ||
58 | @include disable-default-a-behaviour; | 58 | @include disable-default-a-behaviour; |
@@ -124,7 +124,7 @@ menu { | |||
124 | display: flex; | 124 | display: flex; |
125 | align-items: center; | 125 | align-items: center; |
126 | padding-left: $menu-lateral-padding; | 126 | padding-left: $menu-lateral-padding; |
127 | color: $menu-color; | 127 | color: var(--menuForegroundColor); |
128 | cursor: pointer; | 128 | cursor: pointer; |
129 | height: 40px; | 129 | height: 40px; |
130 | font-size: 16px; | 130 | font-size: 16px; |
diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss index c1135cd02..f21b91d2e 100644 --- a/client/src/sass/application.scss +++ b/client/src/sass/application.scss | |||
@@ -26,6 +26,8 @@ body { | |||
26 | --mainHoverColor: #{$orange-hoover-color}; | 26 | --mainHoverColor: #{$orange-hoover-color}; |
27 | --mainBackgroundColor: #{$bg-color}; | 27 | --mainBackgroundColor: #{$bg-color}; |
28 | --mainForegroundColor: #{$fg-color}; | 28 | --mainForegroundColor: #{$fg-color}; |
29 | --menuBackgroundColor: #{$menu-background}; | ||
30 | --menuForegroundColor: #{$menu-color}; | ||
29 | --submenuColor: #{$sub-menu-color}; | 31 | --submenuColor: #{$sub-menu-color}; |
30 | --inputColor: #{$input-background-color}; | 32 | --inputColor: #{$input-background-color}; |
31 | --inputPlaceholderColor: #{$input-placeholder-color}; | 33 | --inputPlaceholderColor: #{$input-placeholder-color}; |
diff --git a/client/src/sass/include/_variables.scss b/client/src/sass/include/_variables.scss index 3514bdb9b..fdf33b12a 100644 --- a/client/src/sass/include/_variables.scss +++ b/client/src/sass/include/_variables.scss | |||
@@ -58,6 +58,8 @@ $variables: ( | |||
58 | --mainHoverColor: var(--mainHoverColor), | 58 | --mainHoverColor: var(--mainHoverColor), |
59 | --mainBackgroundColor: var(--mainBackgroundColor), | 59 | --mainBackgroundColor: var(--mainBackgroundColor), |
60 | --mainForegroundColor: var(--mainForegroundColor), | 60 | --mainForegroundColor: var(--mainForegroundColor), |
61 | --menuBackgroundColor: var(--menuBackgroundColor), | ||
62 | --menuForegroundColor: var(--menuForegroundColor), | ||
61 | --submenuColor: var(--submenuColor), | 63 | --submenuColor: var(--submenuColor), |
62 | --inputColor: var(--inputColor), | 64 | --inputColor: var(--inputColor), |
63 | --inputPlaceholderColor: var(--inputPlaceholderColor) | 65 | --inputPlaceholderColor: var(--inputPlaceholderColor) |