diff options
author | Chocobozzz <me@florianbigard.com> | 2021-05-27 17:45:36 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2021-06-28 09:36:35 +0200 |
commit | fa12eacc014aae8094d108634371640f2695bf9f (patch) | |
tree | 15b1153a9c830f5caa7e93f0939ba4153ab7624c /client/src/sass/include | |
parent | e2e0b645cdac3c705b1988fbb0eff723ad5e885d (diff) | |
download | PeerTube-fa12eacc014aae8094d108634371640f2695bf9f.tar.gz PeerTube-fa12eacc014aae8094d108634371640f2695bf9f.tar.zst PeerTube-fa12eacc014aae8094d108634371640f2695bf9f.zip |
Move to sass @use
Diffstat (limited to 'client/src/sass/include')
-rw-r--r-- | client/src/sass/include/_actor.scss | 2 | ||||
-rw-r--r-- | client/src/sass/include/_bootstrap.scss | 74 | ||||
-rw-r--r-- | client/src/sass/include/_miniature.scss | 4 | ||||
-rw-r--r-- | client/src/sass/include/_mixins.scss | 2 | ||||
-rw-r--r-- | client/src/sass/include/_variables.scss | 5 |
5 files changed, 44 insertions, 43 deletions
diff --git a/client/src/sass/include/_actor.scss b/client/src/sass/include/_actor.scss index ab2038dde..31c145319 100644 --- a/client/src/sass/include/_actor.scss +++ b/client/src/sass/include/_actor.scss | |||
@@ -1,4 +1,4 @@ | |||
1 | @import '_variables'; | 1 | @use '_variables'; |
2 | 2 | ||
3 | @mixin section-label-responsive { | 3 | @mixin section-label-responsive { |
4 | color: pvar(--mainColor); | 4 | color: pvar(--mainColor); |
diff --git a/client/src/sass/include/_bootstrap.scss b/client/src/sass/include/_bootstrap.scss index d9e5efc02..4f4f48e58 100644 --- a/client/src/sass/include/_bootstrap.scss +++ b/client/src/sass/include/_bootstrap.scss | |||
@@ -1,40 +1,40 @@ | |||
1 | @import './_bootstrap-variables'; | 1 | @use './_bootstrap-variables'; |
2 | 2 | ||
3 | @import '~bootstrap/scss/functions'; | 3 | @use '~bootstrap/scss/functions'; |
4 | @import '~bootstrap/scss/variables'; | 4 | @use '~bootstrap/scss/variables'; |
5 | 5 | ||
6 | @import '~bootstrap/scss/mixins'; | 6 | @use '~bootstrap/scss/mixins'; |
7 | @import '~bootstrap/scss/root'; | 7 | @use '~bootstrap/scss/root'; |
8 | @import '~bootstrap/scss/reboot'; | 8 | @use '~bootstrap/scss/reboot'; |
9 | @import '~bootstrap/scss/type'; | 9 | @use '~bootstrap/scss/type'; |
10 | //@import '~bootstrap/scss/images'; | 10 | //@use '~bootstrap/scss/images'; |
11 | //@import '~bootstrap/scss/code'; | 11 | //@use '~bootstrap/scss/code'; |
12 | @import '~bootstrap/scss/grid'; | 12 | @use '~bootstrap/scss/grid'; |
13 | @import '~bootstrap/scss/tables'; | 13 | @use '~bootstrap/scss/tables'; |
14 | @import '~bootstrap/scss/forms'; | 14 | @use '~bootstrap/scss/forms'; |
15 | @import '~bootstrap/scss/buttons'; | 15 | @use '~bootstrap/scss/buttons'; |
16 | //@import '~bootstrap/scss/transitions'; | 16 | //@use '~bootstrap/scss/transitions'; |
17 | @import '~bootstrap/scss/dropdown'; | 17 | @use '~bootstrap/scss/dropdown'; |
18 | @import '~bootstrap/scss/button-group'; | 18 | @use '~bootstrap/scss/button-group'; |
19 | @import '~bootstrap/scss/input-group'; | 19 | @use '~bootstrap/scss/input-group'; |
20 | //@import '~bootstrap/scss/custom-forms'; | 20 | //@use '~bootstrap/scss/custom-forms'; |
21 | @import '~bootstrap/scss/nav'; | 21 | @use '~bootstrap/scss/nav'; |
22 | //@import '~bootstrap/scss/navbar'; | 22 | //@use '~bootstrap/scss/navbar'; |
23 | @import '~bootstrap/scss/card'; | 23 | @use '~bootstrap/scss/card'; |
24 | //@import '~bootstrap/scss/breadcrumb'; | 24 | //@use '~bootstrap/scss/breadcrumb'; |
25 | //@import '~bootstrap/scss/pagination'; | 25 | //@use '~bootstrap/scss/pagination'; |
26 | @import '~bootstrap/scss/badge'; | 26 | @use '~bootstrap/scss/badge'; |
27 | //@import '~bootstrap/scss/jumbotron'; | 27 | //@use '~bootstrap/scss/jumbotron'; |
28 | @import '~bootstrap/scss/alert'; | 28 | @use '~bootstrap/scss/alert'; |
29 | //@import '~bootstrap/scss/progress'; | 29 | //@use '~bootstrap/scss/progress'; |
30 | //@import '~bootstrap/scss/media'; | 30 | //@use '~bootstrap/scss/media'; |
31 | //@import '~bootstrap/scss/list-group'; | 31 | //@use '~bootstrap/scss/list-group'; |
32 | @import '~bootstrap/scss/close'; | 32 | @use '~bootstrap/scss/close'; |
33 | @import '~bootstrap/scss/modal'; | 33 | @use '~bootstrap/scss/modal'; |
34 | @import '~bootstrap/scss/tooltip'; | 34 | @use '~bootstrap/scss/tooltip'; |
35 | @import '~bootstrap/scss/popover'; | 35 | @use '~bootstrap/scss/popover'; |
36 | //@import '~bootstrap/scss/carousel'; | 36 | //@use '~bootstrap/scss/carousel'; |
37 | @import '~bootstrap/scss/utilities'; | 37 | @use '~bootstrap/scss/utilities'; |
38 | //@import '~bootstrap/scss/print'; | 38 | //@use '~bootstrap/scss/print'; |
39 | 39 | ||
40 | @import '~@neos21/bootstrap3-glyphicons/assets/stylesheets/bootstrap3-glyphicons'; | 40 | @use '~@neos21/bootstrap3-glyphicons/assets/stylesheets/bootstrap3-glyphicons'; |
diff --git a/client/src/sass/include/_miniature.scss b/client/src/sass/include/_miniature.scss index 0d3f2b6e0..fb12da49e 100644 --- a/client/src/sass/include/_miniature.scss +++ b/client/src/sass/include/_miniature.scss | |||
@@ -1,5 +1,5 @@ | |||
1 | @import '_variables'; | 1 | @use '_variables'; |
2 | @import '_mixins'; | 2 | @use '_mixins'; |
3 | 3 | ||
4 | @mixin miniature-name { | 4 | @mixin miniature-name { |
5 | @include ellipsis-multiline(1.1em, 2); | 5 | @include ellipsis-multiline(1.1em, 2); |
diff --git a/client/src/sass/include/_mixins.scss b/client/src/sass/include/_mixins.scss index 62e1ca163..bf7504d91 100644 --- a/client/src/sass/include/_mixins.scss +++ b/client/src/sass/include/_mixins.scss | |||
@@ -1,4 +1,4 @@ | |||
1 | @import '_variables'; | 1 | @use '_variables'; |
2 | 2 | ||
3 | @mixin disable-default-a-behaviour { | 3 | @mixin disable-default-a-behaviour { |
4 | &:hover, | 4 | &:hover, |
diff --git a/client/src/sass/include/_variables.scss b/client/src/sass/include/_variables.scss index d54563df6..b9c82ea77 100644 --- a/client/src/sass/include/_variables.scss +++ b/client/src/sass/include/_variables.scss | |||
@@ -1,4 +1,5 @@ | |||
1 | @import '_bootstrap-variables'; | 1 | @use 'sass:math'; |
2 | @use '_bootstrap-variables'; | ||
2 | 3 | ||
3 | $small-view: 800px; | 4 | $small-view: 800px; |
4 | $mobile-view: 500px; | 5 | $mobile-view: 500px; |
@@ -53,7 +54,7 @@ $sub-menu-height: 81px; | |||
53 | 54 | ||
54 | $channel-background-color: #f6ede8; | 55 | $channel-background-color: #f6ede8; |
55 | 56 | ||
56 | $banner-inverted-ratio: 1/6; | 57 | $banner-inverted-ratio: #{math.div(1, 6)}; |
57 | 58 | ||
58 | $max-channels-width: 1200px; | 59 | $max-channels-width: 1200px; |
59 | 60 | ||