diff options
author | Chocobozzz <florian.bigard@gmail.com> | 2017-12-07 10:02:01 +0100 |
---|---|---|
committer | Chocobozzz <florian.bigard@gmail.com> | 2017-12-07 10:02:01 +0100 |
commit | 7b272fd73f1ea67e83c1924f2cc33503b8759811 (patch) | |
tree | 5c171a051c25878bd8010eab0f3ed503efe0da1c /client/src/sass | |
parent | 41c3dfac99c41d2daec2a55554bb517ed5d59fc4 (diff) | |
download | PeerTube-7b272fd73f1ea67e83c1924f2cc33503b8759811.tar.gz PeerTube-7b272fd73f1ea67e83c1924f2cc33503b8759811.tar.zst PeerTube-7b272fd73f1ea67e83c1924f2cc33503b8759811.zip |
Fix dropdown menu in video watch
Diffstat (limited to 'client/src/sass')
-rw-r--r-- | client/src/sass/_mixins.scss | 24 | ||||
-rw-r--r-- | client/src/sass/_variables.scss | 12 | ||||
-rw-r--r-- | client/src/sass/application.scss | 14 |
3 files changed, 34 insertions, 16 deletions
diff --git a/client/src/sass/_mixins.scss b/client/src/sass/_mixins.scss index 6a18f7a76..ddc9c6766 100644 --- a/client/src/sass/_mixins.scss +++ b/client/src/sass/_mixins.scss | |||
@@ -19,22 +19,34 @@ | |||
19 | } | 19 | } |
20 | } | 20 | } |
21 | 21 | ||
22 | @mixin orange-button { | ||
23 | color: #fff; | ||
24 | background-color: $orange-color; | ||
25 | |||
26 | &:hover { | ||
27 | background-color: $orange-hoover-color; | ||
28 | } | ||
29 | } | ||
30 | |||
31 | @mixin grey-button { | ||
32 | background-color: $grey-color; | ||
33 | color: #585858; | ||
34 | |||
35 | &:hover { | ||
36 | background-color: $grey-hoover-color; | ||
37 | } | ||
38 | } | ||
39 | |||
22 | @mixin peertube-button { | 40 | @mixin peertube-button { |
23 | border: none; | 41 | border: none; |
24 | color: #fff; | ||
25 | font-weight: $font-semibold; | 42 | font-weight: $font-semibold; |
26 | font-size: 15px; | 43 | font-size: 15px; |
27 | height: $button-height; | 44 | height: $button-height; |
28 | line-height: $button-height; | 45 | line-height: $button-height; |
29 | border-radius: 3px; | 46 | border-radius: 3px; |
30 | text-align: center; | 47 | text-align: center; |
31 | background-color: $orange-color; | ||
32 | padding: 0 17px 0 13px; | 48 | padding: 0 17px 0 13px; |
33 | cursor: pointer; | 49 | cursor: pointer; |
34 | |||
35 | &:hover { | ||
36 | background-color: $orange-hoover-color; | ||
37 | } | ||
38 | } | 50 | } |
39 | 51 | ||
40 | @mixin peertube-button-link { | 52 | @mixin peertube-button-link { |
diff --git a/client/src/sass/_variables.scss b/client/src/sass/_variables.scss index cc1cee75b..0d310409b 100644 --- a/client/src/sass/_variables.scss +++ b/client/src/sass/_variables.scss | |||
@@ -2,7 +2,8 @@ $font-regular: 400; | |||
2 | $font-semibold: 600; | 2 | $font-semibold: 600; |
3 | $font-bold: 700; | 3 | $font-bold: 700; |
4 | 4 | ||
5 | $grey-color: #555; | 5 | $grey-color: #E5E5E5; |
6 | $grey-hoover-color: #EFEFEF;; | ||
6 | $orange-color: #F1680D; | 7 | $orange-color: #F1680D; |
7 | $orange-hoover-color: #F97D46; | 8 | $orange-hoover-color: #F97D46; |
8 | 9 | ||
@@ -17,7 +18,6 @@ $button-height: 30px; | |||
17 | 18 | ||
18 | $header-height: 50px; | 19 | $header-height: 50px; |
19 | $header-border-color: #e9eff6; | 20 | $header-border-color: #e9eff6; |
20 | |||
21 | $search-input-width: 375px; | 21 | $search-input-width: 375px; |
22 | 22 | ||
23 | $menu-color: #fff; | 23 | $menu-color: #fff; |
@@ -27,11 +27,3 @@ $footer-height: 30px; | |||
27 | $footer-margin: 30px; | 27 | $footer-margin: 30px; |
28 | 28 | ||
29 | $footer-border-color: $header-border-color; | 29 | $footer-border-color: $header-border-color; |
30 | |||
31 | $video-miniature-other-infos: #686767; | ||
32 | |||
33 | $video-watch-border-color: #eceef4; | ||
34 | $video-watch-title-height: 90px; | ||
35 | $video-watch-info-color: #9da0ae; | ||
36 | $video-watch-info-height: 120px; | ||
37 | $video-watch-info-padding-left: 40px; | ||
diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss index b860e1bf2..c81031021 100644 --- a/client/src/sass/application.scss +++ b/client/src/sass/application.scss | |||
@@ -138,3 +138,17 @@ p-datatable { | |||
138 | } | 138 | } |
139 | } | 139 | } |
140 | } | 140 | } |
141 | |||
142 | .dropdown-menu { | ||
143 | border-radius: 3px; | ||
144 | box-shadow: 0 3px 6px; | ||
145 | font-size: 15px; | ||
146 | |||
147 | .dropdown-item { | ||
148 | padding: 3px 15px; | ||
149 | } | ||
150 | |||
151 | a { | ||
152 | color: #000 !important; | ||
153 | } | ||
154 | } | ||