diff options
author | Chocobozzz <me@florianbigard.com> | 2023-02-20 14:51:29 +0100 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2023-02-20 14:51:29 +0100 |
commit | 035db86dd84c51a3cba8ed00282c03097e72395d (patch) | |
tree | d19b0f9317f31d306b703051d2b1f92cbf5c3579 /client/src | |
parent | 44f01f032faee3b29a9e01932b285340f9ce2a6a (diff) | |
download | PeerTube-035db86dd84c51a3cba8ed00282c03097e72395d.tar.gz PeerTube-035db86dd84c51a3cba8ed00282c03097e72395d.tar.zst PeerTube-035db86dd84c51a3cba8ed00282c03097e72395d.zip |
Fix angular build, again
Maybe a bug in the sass loader
Diffstat (limited to 'client/src')
19 files changed, 17 insertions, 19 deletions
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 9cae08e85..a02b10c84 100644 --- 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 @@ | |||
1 | @use '_mixins' as *; | ||
2 | @use '_variables' as *; | 1 | @use '_variables' as *; |
2 | @use '_mixins' as *; | ||
3 | 3 | ||
4 | my-global-icon { | 4 | my-global-icon { |
5 | width: 24px; | 5 | 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 9cae08e85..a02b10c84 100644 --- 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 @@ | |||
1 | @use '_mixins' as *; | ||
2 | @use '_variables' as *; | 1 | @use '_variables' as *; |
2 | @use '_mixins' as *; | ||
3 | 3 | ||
4 | my-global-icon { | 4 | my-global-icon { |
5 | width: 24px; | 5 | 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 d7eb02142..2777bf6d1 100644 --- 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 @@ | |||
1 | @use '_mixins' as *; | ||
2 | @use '_variables' as *; | 1 | @use '_variables' as *; |
2 | @use '_mixins' as *; | ||
3 | 3 | ||
4 | my-feed { | 4 | my-feed { |
5 | @include margin-left(5px); | 5 | @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 88738e54d..6c09cc9ef 100644 --- 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 @@ | |||
1 | @use '_mixins' as *; | ||
2 | @use '_variables' as *; | 1 | @use '_variables' as *; |
2 | @use '_mixins' as *; | ||
3 | @use '_actor' as *; | 3 | @use '_actor' as *; |
4 | 4 | ||
5 | .add-sync { | 5 | .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 007d5fa0e..ea75a48d3 100644 --- a/client/src/app/+stats/video/video-stats.component.scss +++ b/client/src/app/+stats/video/video-stats.component.scss | |||
@@ -1,6 +1,6 @@ | |||
1 | @use '_variables' as *; | 1 | @use '_variables' as *; |
2 | @use '_mixins' as *; | 2 | @use '_mixins' as *; |
3 | @use '_nav' as *; | 3 | @use 'nav' as *; |
4 | 4 | ||
5 | .stats-embed { | 5 | .stats-embed { |
6 | display: flex; | 6 | 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 461a38204..7e766a818 100644 --- 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 @@ | |||
1 | @use '_variables' as *; | 1 | @use '_variables' as *; |
2 | @use '_mixins' as *; | 2 | @use '_mixins' as *; |
3 | @use '_nav' as *; | 3 | @use 'nav' as *; |
4 | 4 | ||
5 | $border-width: 3px; | 5 | $border-width: 3px; |
6 | $border-type: solid; | 6 | $border-type: solid; |
diff --git a/client/src/app/header/search-typeahead.component.scss b/client/src/app/header/search-typeahead.component.scss index ae0f1547e..48b61cf3f 100644 --- a/client/src/app/header/search-typeahead.component.scss +++ b/client/src/app/header/search-typeahead.component.scss | |||
@@ -1,5 +1,5 @@ | |||
1 | @use '_mixins' as *; | ||
2 | @use '_variables' as *; | 1 | @use '_variables' as *; |
2 | @use '_mixins' as *; | ||
3 | 3 | ||
4 | #search-video { | 4 | #search-video { |
5 | @include peertube-input-text($search-input-width); | 5 | @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 25e67b08f..dbaf0f4e8 100644 --- 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 @@ | |||
1 | @use '_mixins' as *; | ||
2 | @use '_variables' as *; | 1 | @use '_variables' as *; |
2 | @use '_mixins' as *; | ||
3 | 3 | ||
4 | .modal-body { | 4 | .modal-body { |
5 | display: flex; | 5 | 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 716f1fff0..d19ff9bde 100644 --- a/client/src/app/modal/admin-welcome-modal.component.scss +++ b/client/src/app/modal/admin-welcome-modal.component.scss | |||
@@ -1,5 +1,5 @@ | |||
1 | @use '_mixins' as *; | ||
2 | @use '_variables' as *; | 1 | @use '_variables' as *; |
2 | @use '_mixins' as *; | ||
3 | 3 | ||
4 | .two-columns { | 4 | .two-columns { |
5 | display: flex; | 5 | display: flex; |
diff --git a/client/src/app/modal/custom-modal.component.scss b/client/src/app/modal/custom-modal.component.scss index c5b77994e..757b9ac66 100644 --- a/client/src/app/modal/custom-modal.component.scss +++ b/client/src/app/modal/custom-modal.component.scss | |||
@@ -1,5 +1,5 @@ | |||
1 | @use '_mixins' as *; | ||
2 | @use '_variables' as *; | 1 | @use '_variables' as *; |
2 | @use '_mixins' as *; | ||
3 | 3 | ||
4 | li { | 4 | li { |
5 | margin-bottom: 10px; | 5 | 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 b650f4e69..61ac955fc 100644 --- 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 @@ | |||
1 | @use '_mixins' as *; | ||
2 | @use '_variables' as *; | 1 | @use '_variables' as *; |
2 | @use '_mixins' as *; | ||
3 | 3 | ||
4 | li { | 4 | li { |
5 | margin-bottom: 10px; | 5 | 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 4852f2e8b..2d5c77ea4 100644 --- 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 @@ | |||
1 | @use '_mixins' as *; | ||
2 | @use '_variables' as *; | 1 | @use '_variables' as *; |
2 | @use '_mixins' as *; | ||
3 | 3 | ||
4 | .comment-flagged-account, | 4 | .comment-flagged-account, |
5 | .account-flagged-handle { | 5 | .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 420ba6f23..23ec23e8b 100644 --- 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 @@ | |||
1 | @use '_mixins' as *; | ||
2 | @use '_variables' as *; | 1 | @use '_variables' as *; |
2 | @use '_mixins' as *; | ||
3 | 3 | ||
4 | .screenratio { | 4 | .screenratio { |
5 | @include block-ratio($selector: 'div, ::ng-deep iframe') { | 5 | @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 7c1e308cf..6aa277260 100644 --- a/client/src/app/shared/shared-moderation/moderation.scss +++ b/client/src/app/shared/shared-moderation/moderation.scss | |||
@@ -1,6 +1,6 @@ | |||
1 | @use 'sass:math'; | 1 | @use 'sass:math'; |
2 | @use '_mixins' as *; | ||
3 | @use '_variables' as *; | 2 | @use '_variables' as *; |
3 | @use '_mixins' as *; | ||
4 | @use '_miniature' as *; | 4 | @use '_miniature' as *; |
5 | 5 | ||
6 | .moderation-expanded { | 6 | .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 6e80f8c76..7b6009f5a 100644 --- 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 @@ | |||
1 | @use '_mixins' as *; | ||
2 | @use '_variables' as *; | 1 | @use '_variables' as *; |
2 | @use '_mixins' as *; | ||
3 | 3 | ||
4 | my-input-text { | 4 | my-input-text { |
5 | width: 100%; | 5 | 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 5d26b02ef..e0676ce07 100644 --- 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 @@ | |||
1 | @use 'sass:math'; | 1 | @use 'sass:math'; |
2 | @use '_mixins' as *; | ||
3 | @use '_variables' as *; | 2 | @use '_variables' as *; |
3 | @use '_mixins' as *; | ||
4 | @use '_miniature' as *; | 4 | @use '_miniature' as *; |
5 | 5 | ||
6 | .table-video-link { | 6 | .table-video-link { |
diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss index 1297855da..ba4df57c9 100644 --- a/client/src/sass/application.scss +++ b/client/src/sass/application.scss | |||
@@ -6,7 +6,6 @@ | |||
6 | 6 | ||
7 | @use '_fonts'; | 7 | @use '_fonts'; |
8 | 8 | ||
9 | @use './class-helpers'; | ||
10 | @use './custom-markup'; | 9 | @use './custom-markup'; |
11 | @use './ng-select'; | 10 | @use './ng-select'; |
12 | 11 | ||
diff --git a/client/src/sass/class-helpers/_common.scss b/client/src/sass/class-helpers/_common.scss index 5fe8af26f..0a81a415d 100644 --- a/client/src/sass/class-helpers/_common.scss +++ b/client/src/sass/class-helpers/_common.scss | |||
@@ -1,7 +1,7 @@ | |||
1 | @use '_badges' as *; | 1 | @use '_badges' as *; |
2 | @use '_icons' as *; | 2 | @use '_icons' as *; |
3 | @use '_mixins' as *; | ||
4 | @use '_variables' as *; | 3 | @use '_variables' as *; |
4 | @use '_mixins' as *; | ||
5 | 5 | ||
6 | .link-orange { | 6 | .link-orange { |
7 | color: pvar(--mainForegroundColor); | 7 | color: pvar(--mainForegroundColor); |
diff --git a/client/src/sass/include/_mixins.scss b/client/src/sass/include/_mixins.scss index 3941cf374..cbf86040d 100644 --- a/client/src/sass/include/_mixins.scss +++ b/client/src/sass/include/_mixins.scss | |||
@@ -3,7 +3,6 @@ | |||
3 | 3 | ||
4 | @import '_bootstrap-mixins'; | 4 | @import '_bootstrap-mixins'; |
5 | 5 | ||
6 | |||
7 | @mixin disable-default-a-behaviour { | 6 | @mixin disable-default-a-behaviour { |
8 | &:hover, | 7 | &:hover, |
9 | &:focus, | 8 | &:focus, |