diff options
author | Chocobozzz <me@florianbigard.com> | 2022-06-14 13:54:54 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2022-06-15 13:31:53 +0200 |
commit | 6f03f944c34f78b38a68128413b55186e0676949 (patch) | |
tree | 81a0c79184cb5ac800c31f1d5334471ee506ac19 /client/src/sass | |
parent | 936ce6e5635f3a52acbc799e1fcba9a948a7e390 (diff) | |
download | PeerTube-6f03f944c34f78b38a68128413b55186e0676949.tar.gz PeerTube-6f03f944c34f78b38a68128413b55186e0676949.tar.zst PeerTube-6f03f944c34f78b38a68128413b55186e0676949.zip |
Redesign register steps
Diffstat (limited to 'client/src/sass')
-rw-r--r-- | client/src/sass/application.scss | 1 | ||||
-rw-r--r-- | client/src/sass/class-helpers.scss | 43 | ||||
-rw-r--r-- | client/src/sass/include/_bootstrap-variables.scss | 2 | ||||
-rw-r--r-- | client/src/sass/include/_mixins.scss | 12 | ||||
-rw-r--r-- | client/src/sass/include/_variables.scss | 5 |
5 files changed, 59 insertions, 4 deletions
diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss index 893afdd2b..2af456375 100644 --- a/client/src/sass/application.scss +++ b/client/src/sass/application.scss | |||
@@ -26,6 +26,7 @@ body { | |||
26 | --mainColor: #{$main-color}; | 26 | --mainColor: #{$main-color}; |
27 | --mainColorLighter: #{$main-color-lighter}; | 27 | --mainColorLighter: #{$main-color-lighter}; |
28 | --mainColorLightest: #{$main-color-lightest}; | 28 | --mainColorLightest: #{$main-color-lightest}; |
29 | --mainColorVeryLight: #{$main-color-very-light}; | ||
29 | 30 | ||
30 | --mainHoverColor: #{$main-hover-color}; | 31 | --mainHoverColor: #{$main-hover-color}; |
31 | --mainBackgroundHoverColor: #{$main-background-hover-color}; | 32 | --mainBackgroundHoverColor: #{$main-background-hover-color}; |
diff --git a/client/src/sass/class-helpers.scss b/client/src/sass/class-helpers.scss index 45d45e0f8..0b2e6176a 100644 --- a/client/src/sass/class-helpers.scss +++ b/client/src/sass/class-helpers.scss | |||
@@ -3,6 +3,24 @@ | |||
3 | @use '_badges' as *; | 3 | @use '_badges' as *; |
4 | @use '_icons' as *; | 4 | @use '_icons' as *; |
5 | 5 | ||
6 | .link-orange { | ||
7 | color: pvar(--mainForegroundColor); | ||
8 | font-weight: $font-bold; | ||
9 | border-bottom: 3px solid pvar(--mainColor); | ||
10 | |||
11 | &:hover { | ||
12 | color: pvar(--mainForegroundColor); | ||
13 | opacity: 0.8; | ||
14 | } | ||
15 | } | ||
16 | |||
17 | .underline-orange { | ||
18 | display: inline-block; | ||
19 | border-bottom: 3px solid pvar(--mainColor); | ||
20 | } | ||
21 | |||
22 | // --------------------------------------------------------------------------- | ||
23 | |||
6 | .peertube-button { | 24 | .peertube-button { |
7 | @include peertube-button; | 25 | @include peertube-button; |
8 | } | 26 | } |
@@ -70,6 +88,11 @@ | |||
70 | margin-top: 10px; | 88 | margin-top: 10px; |
71 | } | 89 | } |
72 | 90 | ||
91 | label + .form-group-description { | ||
92 | margin-bottom: 10px; | ||
93 | margin-top: 0; | ||
94 | } | ||
95 | |||
73 | // --------------------------------------------------------------------------- | 96 | // --------------------------------------------------------------------------- |
74 | 97 | ||
75 | 98 | ||
@@ -192,9 +215,12 @@ | |||
192 | border-left-width: .25rem; | 215 | border-left-width: .25rem; |
193 | } | 216 | } |
194 | 217 | ||
195 | &.callout-info { | 218 | &.callout-orange { |
196 | border-color: pvar(--mainColorLightest); | 219 | border-color: pvar(--mainColorLightest); |
197 | border-left-color: pvar(--mainColor); | 220 | |
221 | &:not(.callout-light) { | ||
222 | border-left-color: pvar(--mainColor); | ||
223 | } | ||
198 | } | 224 | } |
199 | } | 225 | } |
200 | 226 | ||
@@ -210,3 +236,16 @@ | |||
210 | top: #{-($header-height + $sub-menu-height + 20px)}; | 236 | top: #{-($header-height + $sub-menu-height + 20px)}; |
211 | } | 237 | } |
212 | } | 238 | } |
239 | |||
240 | // --------------------------------------------------------------------------- | ||
241 | |||
242 | .alert { | ||
243 | p:last-child { | ||
244 | margin-bottom: 0; | ||
245 | } | ||
246 | |||
247 | &.pt-alert-primary { | ||
248 | background-color: pvar(--mainColorVeryLight); | ||
249 | border: 2px solid pvar(--mainColorLightest); | ||
250 | } | ||
251 | } | ||
diff --git a/client/src/sass/include/_bootstrap-variables.scss b/client/src/sass/include/_bootstrap-variables.scss index c103e485a..796850174 100644 --- a/client/src/sass/include/_bootstrap-variables.scss +++ b/client/src/sass/include/_bootstrap-variables.scss | |||
@@ -46,5 +46,5 @@ $dropdown-border-radius: 3px; | |||
46 | $dropdown-link-active-color: pvar(--mainForegroundColor); | 46 | $dropdown-link-active-color: pvar(--mainForegroundColor); |
47 | $dropdown-link-active-bg: pvar(--mainBackgroundHoverColor); | 47 | $dropdown-link-active-bg: pvar(--mainBackgroundHoverColor); |
48 | 48 | ||
49 | $accordion-button-active-bg: pvar(--mainColorLightest); | 49 | $accordion-button-active-bg: pvar(--mainColorVeryLight); |
50 | $accordion-button-active-color: pvar(--mainForegroundColor); | 50 | $accordion-button-active-color: pvar(--mainForegroundColor); |
diff --git a/client/src/sass/include/_mixins.scss b/client/src/sass/include/_mixins.scss index 22c3b2a2f..565012717 100644 --- a/client/src/sass/include/_mixins.scss +++ b/client/src/sass/include/_mixins.scss | |||
@@ -264,6 +264,18 @@ | |||
264 | } | 264 | } |
265 | } | 265 | } |
266 | 266 | ||
267 | @mixin peertube-button-big { | ||
268 | height: auto; | ||
269 | padding: 10px 25px; | ||
270 | font-size: 18px; | ||
271 | line-height: 1.2; | ||
272 | border: 0; | ||
273 | font-weight: $font-semibold; | ||
274 | |||
275 | // Because of primeng that redefines border-radius of all input[type="..."] | ||
276 | border-radius: 3px !important; | ||
277 | } | ||
278 | |||
267 | @mixin peertube-button-link { | 279 | @mixin peertube-button-link { |
268 | @include disable-default-a-behaviour; | 280 | @include disable-default-a-behaviour; |
269 | @include peertube-button; | 281 | @include peertube-button; |
diff --git a/client/src/sass/include/_variables.scss b/client/src/sass/include/_variables.scss index 6102e32f1..ef22fafe0 100644 --- a/client/src/sass/include/_variables.scss +++ b/client/src/sass/include/_variables.scss | |||
@@ -1,4 +1,5 @@ | |||
1 | @use 'sass:math'; | 1 | @use 'sass:math'; |
2 | @use 'sass:color'; | ||
2 | @use '~bootstrap/scss/functions' as *; | 3 | @use '~bootstrap/scss/functions' as *; |
3 | 4 | ||
4 | $small-view: 800px; | 5 | $small-view: 800px; |
@@ -14,11 +15,12 @@ $grey-background-color: #E5E5E5; | |||
14 | $grey-background-hover-color: #EFEFEF; | 15 | $grey-background-hover-color: #EFEFEF; |
15 | $grey-foreground-color: #585858; | 16 | $grey-foreground-color: #585858; |
16 | $grey-foreground-hover-color: #303030; | 17 | $grey-foreground-hover-color: #303030; |
17 | $grey-button-outline-color: scale-color($grey-foreground-color, $alpha: -95%); | 18 | $grey-button-outline-color: color.scale($grey-foreground-color, $alpha: -95%); |
18 | 19 | ||
19 | $main-color: hsl(24, 90%, 50%); | 20 | $main-color: hsl(24, 90%, 50%); |
20 | $main-color-lighter: lighten($main-color, 10%); | 21 | $main-color-lighter: lighten($main-color, 10%); |
21 | $main-color-lightest: lighten($main-color, 40%); | 22 | $main-color-lightest: lighten($main-color, 40%); |
23 | $main-color-very-light: #fff5eb; | ||
22 | 24 | ||
23 | $main-hover-color: lighten($main-color, 5%); | 25 | $main-hover-color: lighten($main-color, 5%); |
24 | $main-background-hover-color: #e9ecef; | 26 | $main-background-hover-color: #e9ecef; |
@@ -109,6 +111,7 @@ $variables: ( | |||
109 | --mainColor: var(--mainColor), | 111 | --mainColor: var(--mainColor), |
110 | --mainColorLighter: var(--mainColorLighter), | 112 | --mainColorLighter: var(--mainColorLighter), |
111 | --mainColorLightest: var(--mainColorLightest), | 113 | --mainColorLightest: var(--mainColorLightest), |
114 | --mainColorVeryLight: var(--mainColorVeryLight), | ||
112 | 115 | ||
113 | --mainHoverColor: var(--mainHoverColor), | 116 | --mainHoverColor: var(--mainHoverColor), |
114 | --mainBackgroundHoverColor: var(--mainBackgroundHoverColor), | 117 | --mainBackgroundHoverColor: var(--mainBackgroundHoverColor), |