diff options
author | Rigel Kent <sendmemail@rigelk.eu> | 2020-02-28 13:52:21 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-02-28 13:52:21 +0100 |
commit | d3217560a611b94f888ecf3de93b428a7521d4de (patch) | |
tree | 26fc984f351afb994dc13c94e138476ded50c76a /client/src/sass/include | |
parent | 64645512b08875c18ebdc009a550cdfa69def955 (diff) | |
download | PeerTube-d3217560a611b94f888ecf3de93b428a7521d4de.tar.gz PeerTube-d3217560a611b94f888ecf3de93b428a7521d4de.tar.zst PeerTube-d3217560a611b94f888ecf3de93b428a7521d4de.zip |
Add visitor settings, rework logged-in dropdown (#2514)
* Add visitor settings, rework logged-in dropdown
* Make user dropdown P2P switch functional
* Fix lint
* Fix unnecessary notification when user logs out
* Simplify visitor settings code and remove unnecessary icons
* Catch parsing errors and reindent menu styles
Diffstat (limited to 'client/src/sass/include')
-rw-r--r-- | client/src/sass/include/_mixins.scss | 8 | ||||
-rw-r--r-- | client/src/sass/include/_variables.scss | 7 |
2 files changed, 13 insertions, 2 deletions
diff --git a/client/src/sass/include/_mixins.scss b/client/src/sass/include/_mixins.scss index 4766e4490..bafc82d7d 100644 --- a/client/src/sass/include/_mixins.scss +++ b/client/src/sass/include/_mixins.scss | |||
@@ -72,6 +72,14 @@ | |||
72 | } | 72 | } |
73 | } | 73 | } |
74 | 74 | ||
75 | @mixin fill-svg-color ($color) { | ||
76 | ::ng-deep svg { | ||
77 | path { | ||
78 | fill: $color; | ||
79 | } | ||
80 | } | ||
81 | } | ||
82 | |||
75 | @mixin button-focus-visible-shadow($color) { | 83 | @mixin button-focus-visible-shadow($color) { |
76 | &.focus-visible { | 84 | &.focus-visible { |
77 | box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 4px $color; | 85 | box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 4px $color; |
diff --git a/client/src/sass/include/_variables.scss b/client/src/sass/include/_variables.scss index 4ef8e17b9..91229cee0 100644 --- a/client/src/sass/include/_variables.scss +++ b/client/src/sass/include/_variables.scss | |||
@@ -14,6 +14,7 @@ $grey-foreground-color: #585858; | |||
14 | $grey-foreground-hover-color: #303030; | 14 | $grey-foreground-hover-color: #303030; |
15 | 15 | ||
16 | $orange-color: #F1680D; | 16 | $orange-color: #F1680D; |
17 | $orange-color-lighter: rgb(233, 159, 110); | ||
17 | $orange-hover-color: #F97D46; | 18 | $orange-hover-color: #F97D46; |
18 | 19 | ||
19 | $cyan-color: hsl(187, 77%, 34%); | 20 | $cyan-color: hsl(187, 77%, 34%); |
@@ -74,6 +75,7 @@ $activated-action-button-color: black; | |||
74 | // to be warned of non-existing variables | 75 | // to be warned of non-existing variables |
75 | $variables: ( | 76 | $variables: ( |
76 | --mainColor: var(--mainColor), | 77 | --mainColor: var(--mainColor), |
78 | --mainColorLighter: var(--mainColorLighter), | ||
77 | --mainHoverColor: var(--mainHoverColor), | 79 | --mainHoverColor: var(--mainHoverColor), |
78 | --mainBackgroundColor: var(--mainBackgroundColor), | 80 | --mainBackgroundColor: var(--mainBackgroundColor), |
79 | --mainForegroundColor: var(--mainForegroundColor), | 81 | --mainForegroundColor: var(--mainForegroundColor), |
@@ -112,8 +114,9 @@ $zindex: ( | |||
112 | tooltip : 14000, | 114 | tooltip : 14000, |
113 | loadbar : 15000, | 115 | loadbar : 15000, |
114 | modal : 16000, | 116 | modal : 16000, |
115 | notification : 17000, | 117 | help-popover : 17000, |
116 | hotkeys : 18000 | 118 | notification : 18000, |
119 | hotkeys : 19000 | ||
117 | ); | 120 | ); |
118 | 121 | ||
119 | @function z($label) { | 122 | @function z($label) { |