diff options
author | Rigel Kent <sendmemail@rigelk.eu> | 2020-01-21 09:35:23 +0100 |
---|---|---|
committer | Chocobozzz <chocobozzz@cpy.re> | 2020-01-21 09:35:23 +0100 |
commit | aa0f19635ae4632e286de1599fc24f95f32a108c (patch) | |
tree | 347518feb2534da9466b169a48a6cead0e1f2999 /client/src/sass | |
parent | a56053a2a49431aeddcf8bcdd804b2e0abb93621 (diff) | |
download | PeerTube-aa0f19635ae4632e286de1599fc24f95f32a108c.tar.gz PeerTube-aa0f19635ae4632e286de1599fc24f95f32a108c.tar.zst PeerTube-aa0f19635ae4632e286de1599fc24f95f32a108c.zip |
Add manage buttons for own channels and account, video counts (#2421)
* Add manage buttons for own channels and account, video counts
* Change manage button color and introduce secondary color
Diffstat (limited to 'client/src/sass')
-rw-r--r-- | client/src/sass/application.scss | 1 | ||||
-rw-r--r-- | client/src/sass/bootstrap.scss | 10 | ||||
-rw-r--r-- | client/src/sass/include/_mixins.scss | 11 | ||||
-rw-r--r-- | client/src/sass/include/_variables.scss | 3 |
4 files changed, 24 insertions, 1 deletions
diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss index 9877a07d5..5dacdd73b 100644 --- a/client/src/sass/application.scss +++ b/client/src/sass/application.scss | |||
@@ -26,6 +26,7 @@ body { | |||
26 | --mainHoverColor: #{$orange-hover-color}; | 26 | --mainHoverColor: #{$orange-hover-color}; |
27 | --mainBackgroundColor: #{$bg-color}; | 27 | --mainBackgroundColor: #{$bg-color}; |
28 | --mainForegroundColor: #{$fg-color}; | 28 | --mainForegroundColor: #{$fg-color}; |
29 | --secondaryColor: #{$cyan-color}; | ||
29 | 30 | ||
30 | --menuBackgroundColor: #{$menu-background}; | 31 | --menuBackgroundColor: #{$menu-background}; |
31 | --menuForegroundColor: #{$menu-color}; | 32 | --menuForegroundColor: #{$menu-color}; |
diff --git a/client/src/sass/bootstrap.scss b/client/src/sass/bootstrap.scss index dc0d075c9..fca116701 100644 --- a/client/src/sass/bootstrap.scss +++ b/client/src/sass/bootstrap.scss | |||
@@ -170,3 +170,13 @@ ngb-tabset.bootstrap { | |||
170 | ngb-modal-backdrop { | 170 | ngb-modal-backdrop { |
171 | z-index: 10000 !important; | 171 | z-index: 10000 !important; |
172 | } | 172 | } |
173 | |||
174 | .btn-outline-tertiary { | ||
175 | color: var(--secondaryColor); | ||
176 | border-color: var(--secondaryColor); | ||
177 | |||
178 | &:hover { | ||
179 | color: var(--mainBackgroundColor); | ||
180 | background-color: var(--secondaryColor); | ||
181 | } | ||
182 | } | ||
diff --git a/client/src/sass/include/_mixins.scss b/client/src/sass/include/_mixins.scss index 099a909bb..136eddd3a 100644 --- a/client/src/sass/include/_mixins.scss +++ b/client/src/sass/include/_mixins.scss | |||
@@ -179,6 +179,15 @@ | |||
179 | @include peertube-button; | 179 | @include peertube-button; |
180 | } | 180 | } |
181 | 181 | ||
182 | @mixin peertube-button-outline { | ||
183 | display: inline-block; | ||
184 | |||
185 | @include disable-default-a-behaviour; | ||
186 | @include peertube-button; | ||
187 | |||
188 | border: 1px solid; | ||
189 | } | ||
190 | |||
182 | @mixin button-with-icon($width: 20px, $margin-right: 3px, $top: -1px) { | 191 | @mixin button-with-icon($width: 20px, $margin-right: 3px, $top: -1px) { |
183 | my-global-icon { | 192 | my-global-icon { |
184 | position: relative; | 193 | position: relative; |
@@ -453,7 +462,7 @@ | |||
453 | } | 462 | } |
454 | 463 | ||
455 | @mixin sub-menu-with-actor { | 464 | @mixin sub-menu-with-actor { |
456 | height: 160px; | 465 | height: max-content; |
457 | display: flex; | 466 | display: flex; |
458 | flex-direction: column; | 467 | flex-direction: column; |
459 | align-items: flex-start; | 468 | align-items: flex-start; |
diff --git a/client/src/sass/include/_variables.scss b/client/src/sass/include/_variables.scss index 6dededb0e..5b5ac9adc 100644 --- a/client/src/sass/include/_variables.scss +++ b/client/src/sass/include/_variables.scss | |||
@@ -14,6 +14,8 @@ $grey-foreground-hover-color: #303030; | |||
14 | $orange-color: #F1680D; | 14 | $orange-color: #F1680D; |
15 | $orange-hover-color: #F97D46; | 15 | $orange-hover-color: #F97D46; |
16 | 16 | ||
17 | $cyan-color: hsl(187, 77%, 34%); | ||
18 | |||
17 | $support-button: inherit; | 19 | $support-button: inherit; |
18 | $support-button-heart: #e83e8c; | 20 | $support-button-heart: #e83e8c; |
19 | 21 | ||
@@ -73,6 +75,7 @@ $variables: ( | |||
73 | --mainHoverColor: var(--mainHoverColor), | 75 | --mainHoverColor: var(--mainHoverColor), |
74 | --mainBackgroundColor: var(--mainBackgroundColor), | 76 | --mainBackgroundColor: var(--mainBackgroundColor), |
75 | --mainForegroundColor: var(--mainForegroundColor), | 77 | --mainForegroundColor: var(--mainForegroundColor), |
78 | --secondaryColor: var(--secondaryColor), | ||
76 | 79 | ||
77 | --menuBackgroundColor: var(--menuBackgroundColor), | 80 | --menuBackgroundColor: var(--menuBackgroundColor), |
78 | --menuForegroundColor: var(--menuForegroundColor), | 81 | --menuForegroundColor: var(--menuForegroundColor), |