diff options
author | Chocobozzz <me@florianbigard.com> | 2019-02-11 11:52:34 +0100 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2019-02-11 11:52:34 +0100 |
commit | 88108880bbdba473cfe36ecbebc1c3c4f972e102 (patch) | |
tree | b242efb3b4f0d7e49d88f2d1f2063b5b3b0489c0 /client/src/app/shared/buttons/action-dropdown.component.scss | |
parent | 53a94c7cfa8368da4cd248d65df8346905938f0c (diff) | |
parent | 9b712a2017e4ab3cf12cd6bd58278905520159d0 (diff) | |
download | PeerTube-88108880bbdba473cfe36ecbebc1c3c4f972e102.tar.gz PeerTube-88108880bbdba473cfe36ecbebc1c3c4f972e102.tar.zst PeerTube-88108880bbdba473cfe36ecbebc1c3c4f972e102.zip |
Merge branch 'develop' into pr/1217
Diffstat (limited to 'client/src/app/shared/buttons/action-dropdown.component.scss')
-rw-r--r-- | client/src/app/shared/buttons/action-dropdown.component.scss | 34 |
1 files changed, 26 insertions, 8 deletions
diff --git a/client/src/app/shared/buttons/action-dropdown.component.scss b/client/src/app/shared/buttons/action-dropdown.component.scss index 00f120fb8..985b2ca88 100644 --- a/client/src/app/shared/buttons/action-dropdown.component.scss +++ b/client/src/app/shared/buttons/action-dropdown.component.scss | |||
@@ -1,9 +1,20 @@ | |||
1 | @import '_variables'; | 1 | @import '_variables'; |
2 | @import '_mixins'; | 2 | @import '_mixins'; |
3 | 3 | ||
4 | .dropdown-divider:last-child { | ||
5 | display: none; | ||
6 | } | ||
7 | |||
4 | .action-button { | 8 | .action-button { |
5 | @include peertube-button; | 9 | @include peertube-button; |
6 | @include grey-button; | 10 | |
11 | &.grey { | ||
12 | @include grey-button; | ||
13 | } | ||
14 | |||
15 | &.orange { | ||
16 | @include orange-button; | ||
17 | } | ||
7 | 18 | ||
8 | display: inline-block; | 19 | display: inline-block; |
9 | padding: 0 10px; | 20 | padding: 0 10px; |
@@ -13,14 +24,11 @@ | |||
13 | } | 24 | } |
14 | 25 | ||
15 | &:hover, &:active, &:focus { | 26 | &:hover, &:active, &:focus { |
16 | background-color: $grey-color; | 27 | background-color: $grey-background-color; |
17 | } | 28 | } |
18 | 29 | ||
19 | .icon-action { | 30 | .more-icon { |
20 | @include icon(21px); | 31 | width: 21px; |
21 | |||
22 | background-image: url('../../../assets/images/video/more.svg'); | ||
23 | top: -1px; | ||
24 | } | 32 | } |
25 | 33 | ||
26 | &.small { | 34 | &.small { |
@@ -30,9 +38,19 @@ | |||
30 | } | 38 | } |
31 | } | 39 | } |
32 | 40 | ||
41 | .dropdown-toggle::after { | ||
42 | position: relative; | ||
43 | top: 1px; | ||
44 | } | ||
45 | |||
33 | .dropdown-menu { | 46 | .dropdown-menu { |
34 | .dropdown-item { | 47 | .dropdown-item { |
35 | cursor: pointer; | 48 | cursor: pointer; |
36 | color: #000 !important; | 49 | color: #000 !important; |
50 | |||
51 | a, span { | ||
52 | display: block; | ||
53 | width: 100%; | ||
54 | } | ||
37 | } | 55 | } |
38 | } \ No newline at end of file | 56 | } |