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

UHF-7111: Changed high school and vocational school to use unified ca… #278

Merged
merged 6 commits into from
Feb 3, 2023
Merged

UHF-7111: Changed high school and vocational school to use unified ca… #278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
695fd1a
UHF-7111: Changed high school and vocational school to use unified ca…
Dec 1, 2022
5c49d46
UHF-7111: Added unique class for different view modes
Dec 1, 2022
7ec3b17
UHF-7111: Merge branch 'dev' into UHF-7111-kasko-unified-cards
teroelonen Feb 2, 2023
d2fdd3c
UHF-7111 removed file that shouldn't even be here in the first place
teroelonen Feb 2, 2023
8f989ba
UHF-7111 Recompiled the theme and added package-lock changes
teroelonen Feb 2, 2023
2c2e533
UHF-7111 Fixed unit search tabs
teroelonen Feb 2, 2023
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
10 changes: 5 additions & 5 deletions composer.lock
View file
Open in desktop

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

3 changes: 2 additions & 1 deletion public/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,5 @@ example.gitignore
index.php
robots.txt
update.php
web.config
web.config
/autoload.php
2 changes: 1 addition & 1 deletion public/themes/custom/hdbt_subtheme/dist/css/styles.min.css
View file
Open in desktop

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

1 change: 1 addition & 0 deletions public/themes/custom/hdbt_subtheme/hdbt_subtheme.libraries.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ high-school-search:
js:
dist/js/high-school-search.min.js: { }
dependencies:
- hdbt/tabs
- core/drupal

high-school-mobile-menu:
Expand Down
22 changes: 21 additions & 1 deletion public/themes/custom/hdbt_subtheme/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.

24 changes: 0 additions & 24 deletions .../themes/custom/hdbt_subtheme/src/scss/06_components/paragraphs/_unit-search-variants.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,30 +30,6 @@ $card_spacing: $spacing-and-half;
margin-bottom: $spacing-quarter;
}
}

.unit-search__result--list {
display: flex;
flex-direction: column;
margin-bottom: 0;

// @TODO: Needs subtheme tpr-unit.html.twig updates from hdbt theme.
img {
height: auto;
width: 100%;
}

.image-placeholder {
$-placeholder-aspect-ratio: 3 / 2;
padding-bottom: aspect-ratio-padding($-placeholder-aspect-ratio);
}

@include breakpoint($breakpoint-s) {
flex-direction: row;
flex-wrap: wrap;
margin-left: -$card_spacing;
width: calc(100% + #{$card_spacing});
}
}
}

.unit-search--daycare-search {
Expand Down
Loading