diff options
author | Chocobozzz <me@florianbigard.com> | 2021-05-27 18:25:00 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2021-06-28 10:54:02 +0200 |
commit | 8cbc40b2fe9d36ef0505b9441276ca561342e9e9 (patch) | |
tree | 5777288d76c0926f5b4484e2689d0fe741462a36 /client/src/sass/include | |
parent | fa12eacc014aae8094d108634371640f2695bf9f (diff) | |
download | PeerTube-8cbc40b2fe9d36ef0505b9441276ca561342e9e9.tar.gz PeerTube-8cbc40b2fe9d36ef0505b9441276ca561342e9e9.tar.zst PeerTube-8cbc40b2fe9d36ef0505b9441276ca561342e9e9.zip |
Move to sass module
Diffstat (limited to 'client/src/sass/include')
-rw-r--r-- | client/src/sass/include/_actor.scss | 3 | ||||
-rw-r--r-- | client/src/sass/include/_bootstrap.scss | 40 | ||||
-rw-r--r-- | client/src/sass/include/_miniature.scss | 4 | ||||
-rw-r--r-- | client/src/sass/include/_mixins.scss | 11 | ||||
-rw-r--r-- | client/src/sass/include/_variables.scss | 4 |
5 files changed, 12 insertions, 50 deletions
diff --git a/client/src/sass/include/_actor.scss b/client/src/sass/include/_actor.scss index 31c145319..b135bbb6d 100644 --- a/client/src/sass/include/_actor.scss +++ b/client/src/sass/include/_actor.scss | |||
@@ -1,4 +1,5 @@ | |||
1 | @use '_variables'; | 1 | @use '_variables' as *; |
2 | @use '_mixins' as *; | ||
2 | 3 | ||
3 | @mixin section-label-responsive { | 4 | @mixin section-label-responsive { |
4 | color: pvar(--mainColor); | 5 | color: pvar(--mainColor); |
diff --git a/client/src/sass/include/_bootstrap.scss b/client/src/sass/include/_bootstrap.scss deleted file mode 100644 index 4f4f48e58..000000000 --- a/client/src/sass/include/_bootstrap.scss +++ /dev/null | |||
@@ -1,40 +0,0 @@ | |||
1 | @use './_bootstrap-variables'; | ||
2 | |||
3 | @use '~bootstrap/scss/functions'; | ||
4 | @use '~bootstrap/scss/variables'; | ||
5 | |||
6 | @use '~bootstrap/scss/mixins'; | ||
7 | @use '~bootstrap/scss/root'; | ||
8 | @use '~bootstrap/scss/reboot'; | ||
9 | @use '~bootstrap/scss/type'; | ||
10 | //@use '~bootstrap/scss/images'; | ||
11 | //@use '~bootstrap/scss/code'; | ||
12 | @use '~bootstrap/scss/grid'; | ||
13 | @use '~bootstrap/scss/tables'; | ||
14 | @use '~bootstrap/scss/forms'; | ||
15 | @use '~bootstrap/scss/buttons'; | ||
16 | //@use '~bootstrap/scss/transitions'; | ||
17 | @use '~bootstrap/scss/dropdown'; | ||
18 | @use '~bootstrap/scss/button-group'; | ||
19 | @use '~bootstrap/scss/input-group'; | ||
20 | //@use '~bootstrap/scss/custom-forms'; | ||
21 | @use '~bootstrap/scss/nav'; | ||
22 | //@use '~bootstrap/scss/navbar'; | ||
23 | @use '~bootstrap/scss/card'; | ||
24 | //@use '~bootstrap/scss/breadcrumb'; | ||
25 | //@use '~bootstrap/scss/pagination'; | ||
26 | @use '~bootstrap/scss/badge'; | ||
27 | //@use '~bootstrap/scss/jumbotron'; | ||
28 | @use '~bootstrap/scss/alert'; | ||
29 | //@use '~bootstrap/scss/progress'; | ||
30 | //@use '~bootstrap/scss/media'; | ||
31 | //@use '~bootstrap/scss/list-group'; | ||
32 | @use '~bootstrap/scss/close'; | ||
33 | @use '~bootstrap/scss/modal'; | ||
34 | @use '~bootstrap/scss/tooltip'; | ||
35 | @use '~bootstrap/scss/popover'; | ||
36 | //@use '~bootstrap/scss/carousel'; | ||
37 | @use '~bootstrap/scss/utilities'; | ||
38 | //@use '~bootstrap/scss/print'; | ||
39 | |||
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 fb12da49e..a1b963400 100644 --- a/client/src/sass/include/_miniature.scss +++ b/client/src/sass/include/_miniature.scss | |||
@@ -1,5 +1,5 @@ | |||
1 | @use '_variables'; | 1 | @use '_variables' as *; |
2 | @use '_mixins'; | 2 | @use '_mixins' as *; |
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 bf7504d91..4d4c52b34 100644 --- a/client/src/sass/include/_mixins.scss +++ b/client/src/sass/include/_mixins.scss | |||
@@ -1,4 +1,5 @@ | |||
1 | @use '_variables'; | 1 | @use 'sass:math'; |
2 | @use '_variables' as *; | ||
2 | 3 | ||
3 | @mixin disable-default-a-behaviour { | 4 | @mixin disable-default-a-behaviour { |
4 | &:hover, | 5 | &:hover, |
@@ -745,7 +746,7 @@ | |||
745 | 746 | ||
746 | > div { | 747 | > div { |
747 | box-sizing: border-box; | 748 | box-sizing: border-box; |
748 | flex: 0 0 percentage(1/3); | 749 | flex: 0 0 percentage(math.div(1, 3)); |
749 | padding: 0 5px; | 750 | padding: 0 5px; |
750 | margin-bottom: 10px; | 751 | margin-bottom: 10px; |
751 | 752 | ||
@@ -867,7 +868,7 @@ | |||
867 | // applies ratio (default to 16:9) to a child element (using $selector) only using | 868 | // applies ratio (default to 16:9) to a child element (using $selector) only using |
868 | // an immediate's parent size. This allows to set a ratio without explicit | 869 | // an immediate's parent size. This allows to set a ratio without explicit |
869 | // dimensions, as width/height cannot be computed from each other. | 870 | // dimensions, as width/height cannot be computed from each other. |
870 | @mixin block-ratio ($selector: 'div', $inverted-ratio: 9/16) { | 871 | @mixin block-ratio ($selector: 'div', $inverted-ratio: math.div(9, 16)) { |
871 | $padding-percent: percentage($inverted-ratio); | 872 | $padding-percent: percentage($inverted-ratio); |
872 | 873 | ||
873 | position: relative; | 874 | position: relative; |
@@ -916,8 +917,8 @@ | |||
916 | top: 50%; | 917 | top: 50%; |
917 | transform: translate(-50%, -50%) scale(0.5); | 918 | transform: translate(-50%, -50%) scale(0.5); |
918 | 919 | ||
919 | border-top: ($height / 2) solid transparent; | 920 | border-top: #{math.div($height, 2)} solid transparent; |
920 | border-bottom: ($height / 2) solid transparent; | 921 | border-bottom: #{math.div($height, 2)} solid transparent; |
921 | 922 | ||
922 | border-left: $width solid rgba(255, 255, 255, 0.95); | 923 | border-left: $width solid rgba(255, 255, 255, 0.95); |
923 | } | 924 | } |
diff --git a/client/src/sass/include/_variables.scss b/client/src/sass/include/_variables.scss index b9c82ea77..8f3d3c3b4 100644 --- a/client/src/sass/include/_variables.scss +++ b/client/src/sass/include/_variables.scss | |||
@@ -1,5 +1,4 @@ | |||
1 | @use 'sass:math'; | 1 | @use 'sass:math'; |
2 | @use '_bootstrap-variables'; | ||
3 | 2 | ||
4 | $small-view: 800px; | 3 | $small-view: 800px; |
5 | $mobile-view: 500px; | 4 | $mobile-view: 500px; |
@@ -54,7 +53,8 @@ $sub-menu-height: 81px; | |||
54 | 53 | ||
55 | $channel-background-color: #f6ede8; | 54 | $channel-background-color: #f6ede8; |
56 | 55 | ||
57 | $banner-inverted-ratio: #{math.div(1, 6)}; | 56 | // FIXME: cannot use math.div here because of compilation error |
57 | $banner-inverted-ratio: 0.1666666666; | ||
58 | 58 | ||
59 | $max-channels-width: 1200px; | 59 | $max-channels-width: 1200px; |
60 | 60 | ||