Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix spanish vertex issues #1878

Merged
merged 17 commits into from
Mar 21, 2024
Merged

Fix spanish vertex issues #1878

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
61cd8c0
DS-5283 Baseline shows filtered/unfiltered scene count
artisticlight Mar 7, 2024
830b230
Merge pull request #1872 from asfadmin/andy-baseline-filter-count
artisticlight Mar 7, 2024
162505d
DS-5283 Baseline scene count for small screens size.
artisticlight Mar 7, 2024
5fedf27
Merge pull request #1873 from asfadmin/andy-baseline-filter-count
artisticlight Mar 7, 2024
f80936a
Updated translations from Phrase
ASF-Discovery Mar 12, 2024
69d9448
Merge pull request #1874 from asfadmin/phrase-translations
artisticlight Mar 12, 2024
09358b0
Merge remote-tracking branch 'asfadmin/test' into Yoreley-Test2
yoreley7 Mar 12, 2024
1c19929
Merge branch 'Yoreley-Test2' into HEAD
yoreley7 Mar 12, 2024
3133ee9
DS-5302
yoreley7 Mar 18, 2024
47791bb
Merge pull request #1876 from yoreley7/yoreley-test3
artisticlight Mar 18, 2024
87ace54
Updated translations from Phrase
ASF-Discovery Mar 18, 2024
fa3ba4d
More Translate
yoreley7 Mar 20, 2024
facc7ee
Merge pull request #1879 from yoreley7/yoreley-test3
artisticlight Mar 20, 2024
ac37fce
Updated translations from Phrase
ASF-Discovery Mar 21, 2024
1aeada6
Merge branch 'test' into phrase-translations
williamh890 Mar 21, 2024
61a6e70
Updated translations from Phrase
ASF-Discovery Mar 21, 2024
aaf87d5
Merge pull request #1881 from asfadmin/phrase-translations
williamh890 Mar 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
75 changes: 68 additions & 7 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/app/components/filters-dropdown/filters-dropdown.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
//max-height: calc(100vh - 32px);
max-height: 100vh;
overflow: hidden;
z-index: 1020;
z-index: 2020;
}

.no-pointer {
Expand Down
2 changes: 1 addition & 1 deletion src/app/components/header/header-buttons/preferences/preferences.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
.default-filters-presets,
.default-map {
margin-right: 30px;
width: 145px;
width: 220px;
}

.hyp3-url {
Expand Down
4 changes: 2 additions & 2 deletions src/app/components/results-menu/baseline-results-menu/baseline-results-menu.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<div>
<span class="fx-empty mr-10">
<span class="control-mat-button-toggle scene-text">
{{ numBaselineScenes$ | async }} {{ 'SCENE' | translate }}{{
{{ numBaselineScenes$ | async }} of {{ numUnfilteredBaselineScenes$ | async }} {{ 'SCENE' | translate }}{{
(numBaselineScenes$ | async) === 1 ? "" : "s"
}}
</span>
Expand Down Expand Up @@ -208,7 +208,7 @@
</ng-container>

<mat-card

class="mp0 no-box-shadow"
[ngClass]="{
'criteria-header--layout': breakpoint <= breakpoints.MEDIUM,
Expand Down
2 changes: 1 addition & 1 deletion src/app/components/results-menu/baseline-results-menu/baseline-results-menu.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ $config: mat.define-legacy-typography-config();
.list-button-group {
max-width: fit-content;
margin-top: -11px;
line-height: 26px !important;
line-height: 16px !important;
}

.button-group-label {
Expand Down
4 changes: 4 additions & 0 deletions src/app/components/results-menu/baseline-results-menu/baseline-results-menu.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,10 @@ export class BaselineResultsMenuComponent implements OnInit, OnDestroy {
map(scenes => scenes.length),
);

public numUnfilteredBaselineScenes$ = this.scenesService.unfilteredScenes$.pipe(
map(scenes => scenes.length),
);

public pairs = [];
public products = [];
public downloadableProds = [];
Expand Down
Loading