From 55269c0460207ebd924fedeeb88fc0bca973b96d Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 10 Jun 2022 09:40:20 +0200 Subject: Fix search filters count --- client/src/app/+search/search-filters.component.ts | 8 +++--- .../shared/shared-search/advanced-search.model.ts | 31 ++++++++++------------ 2 files changed, 18 insertions(+), 21 deletions(-) diff --git a/client/src/app/+search/search-filters.component.ts b/client/src/app/+search/search-filters.component.ts index aaa4ecc5a..f9de04706 100644 --- a/client/src/app/+search/search-filters.component.ts +++ b/client/src/app/+search/search-filters.component.ts @@ -138,11 +138,11 @@ export class SearchFiltersComponent implements OnInit { private loadOriginallyPublishedAtYears () { this.originallyPublishedStartYear = this.advancedSearch.originallyPublishedStartDate ? new Date(this.advancedSearch.originallyPublishedStartDate).getFullYear().toString() - : null + : undefined this.originallyPublishedEndYear = this.advancedSearch.originallyPublishedEndDate ? new Date(this.advancedSearch.originallyPublishedEndDate).getFullYear().toString() - : null + : undefined } private loadFromDurationRange () { @@ -189,7 +189,7 @@ export class SearchFiltersComponent implements OnInit { this.advancedSearch.originallyPublishedStartDate = start.toISOString() } else { - this.advancedSearch.originallyPublishedStartDate = null + this.advancedSearch.originallyPublishedStartDate = undefined } if (this.originallyPublishedEndYear) { @@ -199,7 +199,7 @@ export class SearchFiltersComponent implements OnInit { this.advancedSearch.originallyPublishedEndDate = end.toISOString() } else { - this.advancedSearch.originallyPublishedEndDate = null + this.advancedSearch.originallyPublishedEndDate = undefined } } diff --git a/client/src/app/shared/shared-search/advanced-search.model.ts b/client/src/app/shared/shared-search/advanced-search.model.ts index e40fd2e66..1375820da 100644 --- a/client/src/app/shared/shared-search/advanced-search.model.ts +++ b/client/src/app/shared/shared-search/advanced-search.model.ts @@ -40,9 +40,6 @@ export class AdvancedSearch { searchTarget: SearchTargetType resultType: AdvancedSearchResultType - // Filters we don't want to count, because they are mandatory - private silentFilters = new Set([ 'sort', 'searchTarget' ]) - constructor (options?: { startDate?: string endDate?: string @@ -101,14 +98,7 @@ export class AdvancedSearch { } containsValues () { - const obj = this.toUrlObject() - for (const k of Object.keys(obj)) { - if (this.silentFilters.has(k)) continue - - if (this.isValidValue(obj[k])) return true - } - - return false + return this.size() !== 0 } reset () { @@ -193,12 +183,19 @@ export class AdvancedSearch { size () { let acc = 0 - const obj = this.toUrlObject() - for (const k of Object.keys(obj)) { - if (this.silentFilters.has(k)) continue - - if (this.isValidValue(obj[k])) acc++ - } + if (this.isValidValue(this.startDate) || this.isValidValue(this.endDate)) acc++ + if (this.isValidValue(this.originallyPublishedStartDate) || this.isValidValue(this.originallyPublishedEndDate)) acc++ + + if (this.isValidValue(this.nsfw)) acc++ + if (this.isValidValue(this.categoryOneOf)) acc++ + if (this.isValidValue(this.licenceOneOf)) acc++ + if (this.isValidValue(this.languageOneOf)) acc++ + if (this.isValidValue(this.tagsOneOf)) acc++ + if (this.isValidValue(this.tagsAllOf)) acc++ + if (this.isValidValue(this.durationMin) || this.isValidValue(this.durationMax)) acc++ + if (this.isValidValue(this.isLive)) acc++ + if (this.isValidValue(this.host)) acc++ + if (this.isValidValue(this.resultType)) acc++ return acc } -- cgit v1.2.3 From 9a872b03ddd7e4dea4d5bf9c4f290c4e47aec36e Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 10 Jun 2022 09:44:20 +0200 Subject: Fix upload banner icon margin --- .../actor-banner-edit.component.html | 14 ++++++++------ .../actor-banner-edit.component.scss | 4 ++++ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/client/src/app/shared/shared-actor-image-edit/actor-banner-edit.component.html b/client/src/app/shared/shared-actor-image-edit/actor-banner-edit.component.html index 266fc26c5..f675371d9 100644 --- a/client/src/app/shared/shared-actor-image-edit/actor-banner-edit.component.html +++ b/client/src/app/shared/shared-actor-image-edit/actor-banner-edit.component.html @@ -5,9 +5,7 @@
- - - +
- - Upload a new banner - +
@@ -32,3 +28,9 @@ Remove banner
+ + + + Upload a new banner + + diff --git a/client/src/app/shared/shared-actor-image-edit/actor-banner-edit.component.scss b/client/src/app/shared/shared-actor-image-edit/actor-banner-edit.component.scss index ec2de2528..90fcd81aa 100644 --- a/client/src/app/shared/shared-actor-image-edit/actor-banner-edit.component.scss +++ b/client/src/app/shared/shared-actor-image-edit/actor-banner-edit.component.scss @@ -25,3 +25,7 @@ margin-bottom: 0; } } + +my-global-icon { + margin: 0 5px; +} -- cgit v1.2.3 From 4c0b4a08fe5afb083d30f87adfbd7ada18a86bb4 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 10 Jun 2022 09:50:00 +0200 Subject: Fix peertube select weight --- client/src/sass/include/_mixins.scss | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/client/src/sass/include/_mixins.scss b/client/src/sass/include/_mixins.scss index 8de23e64d..a0bdfb3dc 100644 --- a/client/src/sass/include/_mixins.scss +++ b/client/src/sass/include/_mixins.scss @@ -415,14 +415,17 @@ option { color: #000; + + &[value=undefined] { + font-weight: $font-semibold; + } } } &.peertube-select-button { @include grey-button; - select, - option { + select { font-weight: $font-semibold; color: pvar(--greyForegroundColor); border: 0; -- cgit v1.2.3 From 60ab5b99c76103d14c0f3ce7b3bba6d7451e2220 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 10 Jun 2022 09:52:20 +0200 Subject: Fix filters error in console --- client/src/app/+my-library/my-videos/my-videos.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/app/+my-library/my-videos/my-videos.component.ts b/client/src/app/+my-library/my-videos/my-videos.component.ts index 64e56a250..91cc06702 100644 --- a/client/src/app/+my-library/my-videos/my-videos.component.ts +++ b/client/src/app/+my-library/my-videos/my-videos.component.ts @@ -67,7 +67,7 @@ export class MyVideosComponent implements OnInit, DisableForReuseHook { user: User - inputFilters: AdvancedInputFilter[] + inputFilters: AdvancedInputFilter[] = [] disabled = false -- cgit v1.2.3 From db129781cabca2c66d18cd1dcdfe40f87e9ec030 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 10 Jun 2022 10:04:23 +0200 Subject: Fix button icon margin --- client/src/app/shared/shared-main/buttons/button.component.html | 2 +- client/src/app/shared/shared-main/buttons/button.component.scss | 6 ++++++ client/src/app/shared/shared-main/buttons/button.component.ts | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/client/src/app/shared/shared-main/buttons/button.component.html b/client/src/app/shared/shared-main/buttons/button.component.html index 11c8ffedd..d1a4215e6 100644 --- a/client/src/app/shared/shared-main/buttons/button.component.html +++ b/client/src/app/shared/shared-main/buttons/button.component.html @@ -1,6 +1,6 @@ - + {{ label }} diff --git a/client/src/app/shared/shared-main/buttons/button.component.scss b/client/src/app/shared/shared-main/buttons/button.component.scss index c782ac3ef..c53b8f2e5 100644 --- a/client/src/app/shared/shared-main/buttons/button.component.scss +++ b/client/src/app/shared/shared-main/buttons/button.component.scss @@ -34,6 +34,12 @@ span[class$=-button] { @include button-with-icon(21px); width: 100%; // useful for ellipsis, allow to define a max-width on host component + + &.icon-only { + my-global-icon { + margin: 0; + } + } } .orange-button { diff --git a/client/src/app/shared/shared-main/buttons/button.component.ts b/client/src/app/shared/shared-main/buttons/button.component.ts index b97012d9a..52936a4d4 100644 --- a/client/src/app/shared/shared-main/buttons/button.component.ts +++ b/client/src/app/shared/shared-main/buttons/button.component.ts @@ -20,6 +20,7 @@ export class ButtonComponent { return { [this.className]: true, disabled: this.disabled, + 'icon-only': !this.label, 'responsive-label': this.responsiveLabel } } -- cgit v1.2.3 From a3d7aadb6dee3c23828672ddcc1227f412674e22 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 10 Jun 2022 10:05:50 +0200 Subject: Fix my import expander icon Should not be displayed if there is no import error --- .../app/+my-library/my-video-imports/my-video-imports.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/app/+my-library/my-video-imports/my-video-imports.component.html b/client/src/app/+my-library/my-video-imports/my-video-imports.component.html index e0d4e8f14..1525d0bd1 100644 --- a/client/src/app/+my-library/my-video-imports/my-video-imports.component.html +++ b/client/src/app/+my-library/my-video-imports/my-video-imports.component.html @@ -24,7 +24,7 @@ - + -- cgit v1.2.3 From bffee1d538aa7b51b78d646a0d372b352c073cd8 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 10 Jun 2022 10:18:44 +0200 Subject: Fix classic select and ng select css inconsistency --- .../my-video-playlist-edit.component.scss | 5 +++++ .../+video-edit/video-add-components/video-send.scss | 2 +- .../shared/comment/video-comment-add.component.scss | 6 +++--- .../shared/shared-forms/markdown-textarea.component.scss | 1 - client/src/sass/include/_mixins.scss | 15 +++++++-------- client/src/sass/include/_variables.scss | 1 + client/src/sass/ng-select.scss | 10 +++++++++- 7 files changed, 26 insertions(+), 14 deletions(-) diff --git a/client/src/app/+my-library/my-video-playlists/my-video-playlist-edit.component.scss b/client/src/app/+my-library/my-video-playlists/my-video-playlist-edit.component.scss index 47c323d6d..840e449ea 100644 --- a/client/src/app/+my-library/my-video-playlists/my-video-playlist-edit.component.scss +++ b/client/src/app/+my-library/my-video-playlists/my-video-playlist-edit.component.scss @@ -20,6 +20,11 @@ input[type=text] { @include peertube-select-container(340px); } +my-select-channel { + display: block; + max-width: 340px; +} + input[type=submit] { @include peertube-button; @include orange-button; diff --git a/client/src/app/+videos/+video-edit/video-add-components/video-send.scss b/client/src/app/+videos/+video-edit/video-add-components/video-send.scss index 7284ad00f..594999d66 100644 --- a/client/src/app/+videos/+video-edit/video-add-components/video-send.scss +++ b/client/src/app/+videos/+video-edit/video-add-components/video-send.scss @@ -17,7 +17,7 @@ $width-size: 250px; align-items: center; .upload-icon { - @include apply-svg-color(#C6C6C6); + @include apply-svg-color($input-border-color); width: 90px; margin-bottom: 25px; diff --git a/client/src/app/+videos/+video-watch/shared/comment/video-comment-add.component.scss b/client/src/app/+videos/+video-watch/shared/comment/video-comment-add.component.scss index fb79991db..ae889dd38 100644 --- a/client/src/app/+videos/+video-watch/shared/comment/video-comment-add.component.scss +++ b/client/src/app/+videos/+video-watch/shared/comment/video-comment-add.component.scss @@ -57,8 +57,8 @@ form { width: $markdown-icon-width; svg { - color: #C6C6C6; - fill: #C6C6C6; + color: $input-border-color; + fill: $input-border-color; border-radius: 3px; } } @@ -67,7 +67,7 @@ form { &:active, &:hover { my-global-icon svg { - background-color: #C6C6C6; + background-color: $input-border-color; color: pvar(--mainBackgroundColor); fill: pvar(--mainBackgroundColor); } diff --git a/client/src/app/shared/shared-forms/markdown-textarea.component.scss b/client/src/app/shared/shared-forms/markdown-textarea.component.scss index 0b4872d46..5939bb999 100644 --- a/client/src/app/shared/shared-forms/markdown-textarea.component.scss +++ b/client/src/app/shared/shared-forms/markdown-textarea.component.scss @@ -4,7 +4,6 @@ $nav-preview-tab-height: 30px; $base-padding: 15px; -$input-border-color: #C6C6C6; $input-border-radius: 3px; @mixin in-small-view { diff --git a/client/src/sass/include/_mixins.scss b/client/src/sass/include/_mixins.scss index a0bdfb3dc..3c5aa6cdf 100644 --- a/client/src/sass/include/_mixins.scss +++ b/client/src/sass/include/_mixins.scss @@ -91,7 +91,7 @@ width: $width; color: pvar(--inputForegroundColor); background-color: pvar(--inputBackgroundColor); - border: 1px solid #C6C6C6; + border: 1px solid $input-border-color; border-radius: 3px; font-size: 15px; @@ -150,7 +150,7 @@ &.disabled { cursor: default; color: #fff; - background-color: #C6C6C6; + background-color: $input-border-color; } my-global-icon { @@ -180,7 +180,7 @@ &.disabled { cursor: default; color: pvar(--mainColor); - background-color: #C6C6C6; + background-color: $input-border-color; } my-global-icon { @@ -396,10 +396,9 @@ select { padding: 0 35px 0 12px; position: relative; - border: 1px solid #C6C6C6; + border: 1px solid $input-border-color; background: transparent none; appearance: none; - cursor: pointer; height: $button-height; text-overflow: ellipsis; color: pvar(--mainForegroundColor); @@ -460,7 +459,7 @@ top: 0; width: 18px; height: 18px; - border: 1px solid #C6C6C6; + border: 1px solid $input-border-color; border-radius: 100%; background: #fff; } @@ -507,7 +506,7 @@ width: 18px; min-width: 18px; height: 18px; - border: $border-width solid #C6C6C6; + border: $border-width solid $input-border-color; border-radius: 3px; vertical-align: middle; cursor: pointer; @@ -670,7 +669,7 @@ margin-bottom: 20px; @if $separator { - border-bottom: 1px solid #C6C6C6; + border-bottom: 1px solid $input-border-color; } @media screen and (max-width: $small-view) { diff --git a/client/src/sass/include/_variables.scss b/client/src/sass/include/_variables.scss index fd1b137dc..e46b96d8a 100644 --- a/client/src/sass/include/_variables.scss +++ b/client/src/sass/include/_variables.scss @@ -84,6 +84,7 @@ $theater-bottom-space: 115px; $input-foreground-color: $fg-color; $input-background-color: $bg-color; $input-placeholder-color: #898989; +$input-border-color: #C6C6C6; $textarea-foreground-color: $fg-color; $textarea-background-color: $bg-color; diff --git a/client/src/sass/ng-select.scss b/client/src/sass/ng-select.scss index 97e61e068..b1b82b573 100644 --- a/client/src/sass/ng-select.scss +++ b/client/src/sass/ng-select.scss @@ -4,7 +4,7 @@ $ng-select-highlight: #f2690d; // $ng-select-primary-text: #333 !default; // $ng-select-disabled-text: #f9f9f9 !default; -// $ng-select-border: #ccc !default; +$ng-select-border: $input-border-color; // $ng-select-border-radius: 4px !default; // $ng-select-bg: #ffffff !default; // $ng-select-selected: lighten($ng-select-highlight, 46) !default; @@ -46,6 +46,14 @@ $ng-select-value-font-size: 15px; @include padding-right(12px); } + .ng-arrow { + border-color: #000 transparent transparent !important; + } + + &.ng-select-opened .ng-arrow { + border-color: transparent transparent #000 !important; + } + &.ng-select-single .ng-value-container .ng-value { color: pvar(--inputForegroundColor); -- cgit v1.2.3