Fix angular build, again

Maybe a bug in the sass loader

diff --git a/client/src/app/+admin/moderation/registration-list/registration-list.component.scss b/client/src/app/+admin/moderation/registration-list/registration-list.component.scss
index 9cae08e8571fbc4eddaa60862853634ecdfc8fc1..a02b10c8493093998413d02a331a4df4c397058e 100644 (file)
--- a/client/src/app/+admin/moderation/registration-list/registration-list.component.scss
+++ b/client/src/app/+admin/moderation/registration-list/registration-list.component.scss
@@ -1,5 +1,5 @@
-@use '_mixins' as *;
 @use '_variables' as *;
+@use '_mixins' as *;
 
 my-global-icon {
   width: 24px;

diff --git a/client/src/app/+admin/moderation/video-block-list/video-block-list.component.scss b/client/src/app/+admin/moderation/video-block-list/video-block-list.component.scss
index 9cae08e8571fbc4eddaa60862853634ecdfc8fc1..a02b10c8493093998413d02a331a4df4c397058e 100644 (file)
--- a/client/src/app/+admin/moderation/video-block-list/video-block-list.component.scss
+++ b/client/src/app/+admin/moderation/video-block-list/video-block-list.component.scss
@@ -1,5 +1,5 @@
-@use '_mixins' as *;
 @use '_variables' as *;
+@use '_mixins' as *;
 
 my-global-icon {
   width: 24px;

diff --git a/client/src/app/+admin/overview/comments/video-comment-list.component.scss b/client/src/app/+admin/overview/comments/video-comment-list.component.scss
index d7eb02142f3c9e497cd6f2bfe768f8cee7a9dc4e..2777bf6d17ec9fd96842e722687f803981cf96b4 100644 (file)
--- a/client/src/app/+admin/overview/comments/video-comment-list.component.scss
+++ b/client/src/app/+admin/overview/comments/video-comment-list.component.scss
@@ -1,5 +1,5 @@
-@use '_mixins' as *;
 @use '_variables' as *;
+@use '_mixins' as *;
 
 my-feed {
   @include margin-left(5px);

diff --git a/client/src/app/+my-library/my-video-channel-syncs/my-video-channel-syncs.component.scss b/client/src/app/+my-library/my-video-channel-syncs/my-video-channel-syncs.component.scss
index 88738e54d997a992c5b1ba7e7ddcf2ae66e93df3..6c09cc9ef6547b47940a18912db99303078a2302 100644 (file)
--- a/client/src/app/+my-library/my-video-channel-syncs/my-video-channel-syncs.component.scss
+++ b/client/src/app/+my-library/my-video-channel-syncs/my-video-channel-syncs.component.scss
@@ -1,5 +1,5 @@
-@use '_mixins' as *;
 @use '_variables' as *;
+@use '_mixins' as *;
 @use '_actor' as *;
 
 .add-sync {

diff --git a/client/src/app/+stats/video/video-stats.component.scss b/client/src/app/+stats/video/video-stats.component.scss
index 007d5fa0e9ed364dddba39fca42865f26fb947d2..ea75a48d358f9cfbd43f737c94277fd9108f67a5 100644 (file)
--- a/client/src/app/+stats/video/video-stats.component.scss
+++ b/client/src/app/+stats/video/video-stats.component.scss
@@ -1,6 +1,6 @@
 @use '_variables' as *;
 @use '_mixins' as *;
-@use '_nav' as *;
+@use 'nav' as *;
 
 .stats-embed {
   display: flex;

diff --git a/client/src/app/+videos/+video-edit/video-add.component.scss b/client/src/app/+videos/+video-edit/video-add.component.scss
index 461a38204143e673fae906032c60c7065e65d9a5..7e766a81857b55a309363e5ab67c892c9be640ca 100644 (file)
--- a/client/src/app/+videos/+video-edit/video-add.component.scss
+++ b/client/src/app/+videos/+video-edit/video-add.component.scss
@@ -1,6 +1,6 @@
 @use '_variables' as *;
 @use '_mixins' as *;
-@use '_nav' as *;
+@use 'nav' as *;
 
 $border-width: 3px;
 $border-type: solid;

diff --git a/client/src/app/header/search-typeahead.component.scss b/client/src/app/header/search-typeahead.component.scss
index ae0f1547e661ee987a3879cf2553052423e31b1a..48b61cf3fe3b57b97646edfa9cbe51826867eab8 100644 (file)
--- a/client/src/app/header/search-typeahead.component.scss
+++ b/client/src/app/header/search-typeahead.component.scss
@@ -1,5 +1,5 @@
-@use '_mixins' as *;
 @use '_variables' as *;
+@use '_mixins' as *;
 
 #search-video {
   @include peertube-input-text($search-input-width);

diff --git a/client/src/app/modal/account-setup-warning-modal.component.scss b/client/src/app/modal/account-setup-warning-modal.component.scss
index 25e67b08ff6094861a4e4f02a889f94b33b0a914..dbaf0f4e81e1174849204cc778eda59a0dc5dbf1 100644 (file)
--- a/client/src/app/modal/account-setup-warning-modal.component.scss
+++ b/client/src/app/modal/account-setup-warning-modal.component.scss
@@ -1,5 +1,5 @@
-@use '_mixins' as *;
 @use '_variables' as *;
+@use '_mixins' as *;
 
 .modal-body {
   display: flex;

diff --git a/client/src/app/modal/admin-welcome-modal.component.scss b/client/src/app/modal/admin-welcome-modal.component.scss
index 716f1fff0180a0bfc03c0989912069095ec50a6b..d19ff9bded1b567ff7e1a121102636d54d58460b 100644 (file)
--- a/client/src/app/modal/admin-welcome-modal.component.scss
+++ b/client/src/app/modal/admin-welcome-modal.component.scss
@@ -1,5 +1,5 @@
-@use '_mixins' as *;
 @use '_variables' as *;
+@use '_mixins' as *;
 
 .two-columns {
   display: flex;

diff --git a/client/src/app/modal/custom-modal.component.scss b/client/src/app/modal/custom-modal.component.scss
index c5b77994ed8a61572b119bc1b0153b8ffd042f89..757b9ac667eb03147c389856e7aa4b853b2a8454 100644 (file)
--- a/client/src/app/modal/custom-modal.component.scss
+++ b/client/src/app/modal/custom-modal.component.scss
@@ -1,5 +1,5 @@
-@use '_mixins' as *;
 @use '_variables' as *;
+@use '_mixins' as *;
 
 li {
   margin-bottom: 10px;

diff --git a/client/src/app/modal/instance-config-warning-modal.component.scss b/client/src/app/modal/instance-config-warning-modal.component.scss
index b650f4e69a51fa2db47c0cc37763da75d0bc0891..61ac955fc33d029a85e83a523b4b222e33780c0a 100644 (file)
--- a/client/src/app/modal/instance-config-warning-modal.component.scss
+++ b/client/src/app/modal/instance-config-warning-modal.component.scss
@@ -1,5 +1,5 @@
-@use '_mixins' as *;
 @use '_variables' as *;
+@use '_mixins' as *;
 
 li {
   margin-bottom: 10px;

diff --git a/client/src/app/shared/shared-abuse-list/abuse-list-table.component.scss b/client/src/app/shared/shared-abuse-list/abuse-list-table.component.scss
index 4852f2e8b44ab714381e35246befc1f09f69f751..2d5c77ea409ab27710c964a6a4fe8a05e93137f4 100644 (file)
--- a/client/src/app/shared/shared-abuse-list/abuse-list-table.component.scss
+++ b/client/src/app/shared/shared-abuse-list/abuse-list-table.component.scss
@@ -1,5 +1,5 @@
-@use '_mixins' as *;
 @use '_variables' as *;
+@use '_mixins' as *;
 
 .comment-flagged-account,
 .account-flagged-handle {

diff --git a/client/src/app/shared/shared-main/video/embed.component.scss b/client/src/app/shared/shared-main/video/embed.component.scss
index 420ba6f232bd89f8cab6e52ecd89dff736e71cb3..23ec23e8b43d1fb9069fd75ba499cb7946336340 100644 (file)
--- a/client/src/app/shared/shared-main/video/embed.component.scss
+++ b/client/src/app/shared/shared-main/video/embed.component.scss
@@ -1,5 +1,5 @@
-@use '_mixins' as *;
 @use '_variables' as *;
+@use '_mixins' as *;
 
 .screenratio {
   @include block-ratio($selector: 'div, ::ng-deep iframe') {

diff --git a/client/src/app/shared/shared-moderation/moderation.scss b/client/src/app/shared/shared-moderation/moderation.scss
index 7c1e308cfb3072aba5ad43e619e0272692a3dc2a..6aa27726005ae4c79e57168605989a1dc117dde4 100644 (file)
--- a/client/src/app/shared/shared-moderation/moderation.scss
+++ b/client/src/app/shared/shared-moderation/moderation.scss
@@ -1,6 +1,6 @@
 @use 'sass:math';
-@use '_mixins' as *;
 @use '_variables' as *;
+@use '_mixins' as *;
 @use '_miniature' as *;
 
 .moderation-expanded {

diff --git a/client/src/app/shared/shared-share-modal/video-share.component.scss b/client/src/app/shared/shared-share-modal/video-share.component.scss
index 6e80f8c76db6def5cb3921ad96903235646f0a83..7b6009f5ac4847d93a184f09f7fab796d2728e0f 100644 (file)
--- a/client/src/app/shared/shared-share-modal/video-share.component.scss
+++ b/client/src/app/shared/shared-share-modal/video-share.component.scss
@@ -1,5 +1,5 @@
-@use '_mixins' as *;
 @use '_variables' as *;
+@use '_mixins' as *;
 
 my-input-text {
   width: 100%;

diff --git a/client/src/app/shared/shared-tables/video-cell.component.scss b/client/src/app/shared/shared-tables/video-cell.component.scss
index 5d26b02eff0f493ac7fdd0172fa92cd0f24e7672..e0676ce07cea6bd351c5f65543a724133ade3b63 100644 (file)
--- a/client/src/app/shared/shared-tables/video-cell.component.scss
+++ b/client/src/app/shared/shared-tables/video-cell.component.scss
@@ -1,6 +1,6 @@
 @use 'sass:math';
-@use '_mixins' as *;
 @use '_variables' as *;
+@use '_mixins' as *;
 @use '_miniature' as *;
 
 .table-video-link {

diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss
index 1297855dad58e69c6f59fa09d753be9e83cde0e2..ba4df57c9e0d3b36666c56fb6080d975a359a1ce 100644 (file)
--- a/client/src/sass/application.scss
+++ b/client/src/sass/application.scss
@@ -6,7 +6,6 @@
 
 @use '_fonts';
 
-@use './class-helpers';
 @use './custom-markup';
 @use './ng-select';
 

diff --git a/client/src/sass/class-helpers/_common.scss b/client/src/sass/class-helpers/_common.scss
index 5fe8af26f7e95e69f49fe27c81c9baac07756146..0a81a415d564340c4ed12547f9337a8e9c51a3e1 100644 (file)
--- a/client/src/sass/class-helpers/_common.scss
+++ b/client/src/sass/class-helpers/_common.scss
@@ -1,7 +1,7 @@
 @use '_badges' as *;
 @use '_icons' as *;
-@use '_mixins' as *;
 @use '_variables' as *;
+@use '_mixins' as *;
 
 .link-orange {
   color: pvar(--mainForegroundColor);

diff --git a/client/src/sass/include/_mixins.scss b/client/src/sass/include/_mixins.scss
index 3941cf37481494ba1965f7df8112c8967486c280..cbf86040d0bc9b8e7d3143fb017b62dc44121297 100644 (file)
--- a/client/src/sass/include/_mixins.scss
+++ b/client/src/sass/include/_mixins.scss
@@ -3,7 +3,6 @@
 
 @import '_bootstrap-mixins';
 
-
 @mixin disable-default-a-behaviour {
   &:hover,
   &:focus,