diff options
author | Chocobozzz <me@florianbigard.com> | 2018-09-05 15:32:15 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2018-09-05 15:32:15 +0200 |
commit | dcbc29d5c89cc5106a7e738af6861565f740dbe7 (patch) | |
tree | 94ecffa14748dc43a95250b49da915bad0d455c4 /client/src/sass | |
parent | b0ee41df7d6de2f77d30e7bb47c245c0b33019d4 (diff) | |
download | PeerTube-dcbc29d5c89cc5106a7e738af6861565f740dbe7.tar.gz PeerTube-dcbc29d5c89cc5106a7e738af6861565f740dbe7.tar.zst PeerTube-dcbc29d5c89cc5106a7e738af6861565f740dbe7.zip |
Put "start at" at the top of the modal
Diffstat (limited to 'client/src/sass')
-rw-r--r-- | client/src/sass/application.scss | 17 | ||||
-rw-r--r-- | client/src/sass/include/_mixins.scss | 4 | ||||
-rw-r--r-- | client/src/sass/include/_variables.scss | 16 |
3 files changed, 17 insertions, 20 deletions
diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss index fd0d5e458..b96cf07c0 100644 --- a/client/src/sass/application.scss +++ b/client/src/sass/application.scss | |||
@@ -1,9 +1,9 @@ | |||
1 | @import '_variables'; | ||
2 | @import '_mixins'; | ||
3 | |||
4 | $icon-font-path: '../../node_modules/@neos21/bootstrap3-glyphicons/assets/fonts/'; | 1 | $icon-font-path: '../../node_modules/@neos21/bootstrap3-glyphicons/assets/fonts/'; |
5 | @import '_bootstrap'; | 2 | @import '_bootstrap'; |
6 | 3 | ||
4 | @import '_variables'; | ||
5 | @import '_mixins'; | ||
6 | |||
7 | @import '_fonts'; | 7 | @import '_fonts'; |
8 | 8 | ||
9 | @import '~video.js/dist/video-js.css'; | 9 | @import '~video.js/dist/video-js.css'; |
@@ -19,6 +19,17 @@ $assets-path: '../assets/'; | |||
19 | } | 19 | } |
20 | 20 | ||
21 | body { | 21 | body { |
22 | /*** theme ***/ | ||
23 | // now beware node-sass requires interpolation | ||
24 | // for css custom properties #{$var} | ||
25 | --mainColor: #{$orange-color}; | ||
26 | --mainHoverColor: #{$orange-hoover-color}; | ||
27 | --mainBackgroundColor: #{$bg-color}; | ||
28 | --mainForegroundColor: #{$fg-color}; | ||
29 | --submenuColor: #{$sub-menu-color}; | ||
30 | --inputColor: #{$input-color}; | ||
31 | --inputPlaceholderColor: #{$input-placeholder-color}; | ||
32 | |||
22 | font-family: $main-fonts; | 33 | font-family: $main-fonts; |
23 | font-weight: $font-regular; | 34 | font-weight: $font-regular; |
24 | color: var(--mainForegroundColor); | 35 | color: var(--mainForegroundColor); |
diff --git a/client/src/sass/include/_mixins.scss b/client/src/sass/include/_mixins.scss index 6e2feb748..03cb337c2 100644 --- a/client/src/sass/include/_mixins.scss +++ b/client/src/sass/include/_mixins.scss | |||
@@ -297,8 +297,8 @@ | |||
297 | height: 12px; | 297 | height: 12px; |
298 | opacity: 0; | 298 | opacity: 0; |
299 | transform: rotate(45deg) scale(0); | 299 | transform: rotate(45deg) scale(0); |
300 | border-right: 2px solid var(--mainForegroundColor); | 300 | border-right: 2px solid var(--mainBackgroundColor); |
301 | border-bottom: 2px solid var(--mainForegroundColor); | 301 | border-bottom: 2px solid var(--mainBackgroundColor); |
302 | } | 302 | } |
303 | } | 303 | } |
304 | 304 | ||
diff --git a/client/src/sass/include/_variables.scss b/client/src/sass/include/_variables.scss index fb253fc1f..0735a00a0 100644 --- a/client/src/sass/include/_variables.scss +++ b/client/src/sass/include/_variables.scss | |||
@@ -46,23 +46,9 @@ $video-thumbnail-width: 200px; | |||
46 | 46 | ||
47 | $theater-bottom-space: 85px; | 47 | $theater-bottom-space: 85px; |
48 | 48 | ||
49 | $input-color: $bg-color; | 49 | $input-color: inherit; |
50 | $input-placeholder-color: #898989; | 50 | $input-placeholder-color: #898989; |
51 | 51 | ||
52 | /*** theme ***/ | ||
53 | |||
54 | body { | ||
55 | // now beware node-sass requires interpolation | ||
56 | // for css custom properties #{$var} | ||
57 | --mainColor: #{$orange-color}; | ||
58 | --mainHoverColor: #{$orange-hoover-color}; | ||
59 | --mainBackgroundColor: #{$bg-color}; | ||
60 | --mainForegroundColor: #{$fg-color}; | ||
61 | --submenuColor: #{$sub-menu-color}; | ||
62 | --inputColor: #{$input-color}; | ||
63 | --inputPlaceholderColor: #{$input-placeholder-color}; | ||
64 | } | ||
65 | |||
66 | /*** map theme ***/ | 52 | /*** map theme ***/ |
67 | 53 | ||
68 | // pass variables into a sass map, | 54 | // pass variables into a sass map, |