Skip to content

UHF-10374: Change the color-silver-light to color-black-5 #1171

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

Merged
teroelonen merged 3 commits into from
Feb 4, 2025
Merged

UHF-10374: Change the color-silver-light to color-black-5 #1171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6f1a2cd
UHF-10374: Replace the color-silver-light background colors from the …
teroelonen Jan 30, 2025
4e1771e
UHF-10374: Remove unused styles
teroelonen Jan 30, 2025
3883dfc
UHF-10374: Added check for 'install-drupal-from-scratch' label.
khalima Feb 4, 2025
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: 7 additions & 3 deletions .github/workflows/visual.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,9 @@ jobs:
# Install the site from existing dump if the cache restoration was successful.
- name: Install Drupal from existing dump
working-directory: ${{ env.DRUPAL_ROOT }}
if: steps.drupal-cache.outputs.cache-hit == 'true'
if: |
!contains(github.event.pull_request.labels.*.name, 'install-drupal-from-scratch') &&
steps.drupal-cache.outputs.cache-hit == 'true'
run: |
docker compose exec app bash -c "mysql --user=drupal --password=drupal --database=drupal --host=db --port=3306 -A < /app/public/sites/default/files/latest.sql"
docker compose exec app bash -c "drush updb -y && drush cr"
Expand All @@ -100,7 +102,9 @@ jobs:
# installation process and install Drupal using that dump from now on.
- name: Install Drupal from scratch
working-directory: ${{ env.DRUPAL_ROOT }}
if: steps.drupal-cache.outputs.cache-hit != 'true'
if: |
contains(github.event.pull_request.labels.*.name, 'install-drupal-from-scratch') ||
steps.drupal-cache.outputs.cache-hit != 'true'
run: |
docker compose exec app bash -c "drush si minimal -y"
docker compose exec app bash -c "drush en redis -y"
Expand Down Expand Up @@ -131,7 +135,7 @@ jobs:
- name: Evaluate if we should re-create reference images
id: evaluate-reference-images
if: |
contains( github.event.pull_request.labels.*.name, 'recreate-reference-images') ||
contains(github.event.pull_request.labels.*.name, 'recreate-reference-images') ||
hashFiles('backstop/full/bitmaps_reference/') != '' ||
github.ref == 'refs/heads/main'
run: echo "generate-references=true" >> $GITHUB_OUTPUT
Expand Down
2 changes: 1 addition & 1 deletion dist/css/nav_global.min.css
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions dist/css/styles.min.css
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 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/scss/06_components/block/_language-switcher.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ $-language-block-height: 52px;
align-content: stretch;
align-items: center;
align-self: center;
background-color: $color-silver-light;
background-color: $color-black-5;
border-bottom: 1px solid $color-black-20;
display: flex;
grid-area: lang;
Expand Down
2 changes: 1 addition & 1 deletion src/scss/06_components/helfi_calculator/_helfi_calculator.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@
}

.helfi-calculator__dynamic-slot {
background-color: $color-silver-light;
background-color: $color-black-5;
padding: $spacing-double $spacing-and-half;

&:not(:first-child) {
Expand Down
2 changes: 1 addition & 1 deletion src/scss/06_components/messages/_announcement.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
}

.announcement__container {
--announcement-bg-color: #{$color-silver-light}; // Defaults to .announcement--notification styles
--announcement-bg-color: #{$color-black-5}; // Defaults to .announcement--notification styles
--announcement-bg-size: #{$spacing-double};
--announcement-color: #{$color-info}; // Defaults to .announcement--notification styles
align-items: flex-start;
Expand Down
2 changes: 1 addition & 1 deletion src/scss/06_components/navigation/_header-search.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.nav-toggle-dropdown--search .nav-toggle-dropdown__content {
background-color: $color-silver-light;
background-color: $color-black-5;
}

.header-search-wrapper {
Expand Down
4 changes: 2 additions & 2 deletions src/scss/06_components/navigation/_sidebar-menu.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ $section-navigation-toggle-button-size: 54px;

.sidebar-navigation--section-navigation {
@include breakpoint(max-width $breakpoint-l) {
background-color: $color-silver-light;
background-color: $color-black-5;
display: block;
}

Expand Down Expand Up @@ -253,7 +253,7 @@ $section-navigation-toggle-button-size: 54px;
.section-navigation__title {
@include breakpoint(max-width $breakpoint-l) {
@include font('h5');
background-color: $color-silver-light;
background-color: $color-black-5;
border-bottom: 0 none;
flex-grow: 1;
margin-top: 0;
Expand Down
4 changes: 2 additions & 2 deletions src/scss/06_components/navigation/_table-of-contents.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
}

.table-of-contents__container {
background-color: $color-silver-light;
background-color: $color-black-5;
border-inline-start: $spacing-half solid $color-gold;
max-width: $spacing-and-half + $content-width-max + $spacing-and-half; // Max-width: Content max width (860px) + left and right paddings.
padding: $spacing-double $spacing-and-half;
Expand Down Expand Up @@ -81,7 +81,7 @@
}

.table-of-contents__nojs {
background-color: $color-silver-light;
background-color: $color-black-5;
display: flex;
flex-flow: column;
padding: $spacing-double $spacing-and-half;
Expand Down
11 changes: 6 additions & 5 deletions src/scss/06_components/navigation/global/_mmenu.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ $-footerlink-target-size: 44px;

.mmenu {
@include font('body');
background: $color-silver-light;
background: $color-black-5;
display: none;
width: 100vw; // this causes panel flex to break.
z-index: 2;
Expand Down Expand Up @@ -41,7 +41,7 @@ $-footerlink-target-size: 44px;
}

.mmenu__panels {
background: $color-silver-light;
background: $color-black-5;
display: grid;
grid-template-areas: 'panels';
grid-template-columns: 1fr;
Expand Down Expand Up @@ -119,7 +119,7 @@ $-footerlink-target-size: 44px;
}

&::after {
background: $color-silver-light;
background: $color-black-5;
content: '';
display: block;
grid-area: icon;
Expand Down Expand Up @@ -297,7 +297,7 @@ $-footerlink-target-size: 44px;
}

.mmenu__footer {
background: $color-silver-light;
background: $color-black-5;
flex-grow: 1;
padding-bottom: $spacing;
padding-top: $spacing;
Expand All @@ -317,8 +317,9 @@ $-footerlink-target-size: 44px;
.menu__nolink {
$-footer-link-font: 'body';
$-footer-link-vertical-padding: 0.5 * ($-footerlink-target-size - get-line-height($-footer-link-font, true));
display: block;

@include font($-footer-link-font);
display: block;
padding-bottom: $-footer-link-vertical-padding;
padding-left: $spacing;
padding-right: $spacing;
Expand Down
62 changes: 0 additions & 62 deletions src/scss/06_components/pages/_news-page.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,68 +144,6 @@
}
}

// News listing using teasers.
.news-listing--teasers {
max-width: $content-width-max;

.news-listing__item {
align-items: flex-start;
border-bottom: 1px solid $color-silver-light;
display: flex;
flex-wrap: wrap;
padding-bottom: $spacing-and-half;
position: relative;

&:first-child {
margin-top: $spacing-and-half;
}

&:last-child {
border-bottom: none;
padding-bottom: 0;
}
}

.news-listing__content {
width: 100%;

@include breakpoint($breakpoint-m) {
padding-inline-end: $spacing-and-half;
width: 75%;
}
}

.news-listing__content--with-image {
padding-inline-end: $spacing-and-half;
width: 75%;
}

.news-listing__img {
@include loading-image-background;
width: 25%;

img {
display: block;
height: auto;
width: 100%;
}
}

.news-listing__title {
@include font('h4');
}

.news-listing__datetime {
@include font(small);
display: block;
margin-top: $spacing-half;

@include breakpoint($breakpoint-l) {
margin-top: $spacing;
}
}
}

.news-listing--card-teasers {
display: grid;
gap: 0;
Expand Down
2 changes: 1 addition & 1 deletion src/scss/06_components/pages/_unit.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,7 +406,7 @@

.component--unit-contact-information {
.component__container {
background-color: $color-silver-light;
background-color: $color-black-5;
padding: $spacing-and-half $spacing $spacing-triple;

@include breakpoint($breakpoint-m) {
Expand Down
2 changes: 1 addition & 1 deletion src/scss/06_components/paragraphs/_content-cards.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ $-card-spacing: $spacing-and-half;
}

.component--content-cards-grey {
background: $color-silver-light;
background: $color-black-5;
display: grid;
grid-template-columns: [full-width-start] var(--component-gap, #{$spacing}) [content-start] 1fr [content-end] var(--component-gap, #{$spacing}) [full-width-end] ;
grid-template-rows: [header-start] auto [header-end] auto;
Expand Down
2 changes: 1 addition & 1 deletion src/scss/06_components/paragraphs/_hearings.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.component--hearings {
@include component-side-padding;
background: $color-silver-light;
background: $color-black-5;
}

.hearings__count-container {
Expand Down
4 changes: 2 additions & 2 deletions src/scss/06_components/paragraphs/_hero.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ $koro-height: 50px;

// Gray first block styles.
.hero-wrapper.has-first-gray-bg-block {
background-color: $color-silver-light;
background-color: $color-black-5;
margin-bottom: -$spacing-quadruple;
padding-bottom: $spacing-triple;

Expand All @@ -112,7 +112,7 @@ $koro-height: 50px;
}

.hero > .hds-koros {
color: $color-silver-light;
color: $color-black-5;
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/scss/06_components/paragraphs/_ploughing-schedule.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.component--hdbt-search--ploughing-schedule .component__container {
background-color: $color-silver-light;
background-color: $color-black-5;
}

.components--upper .component--hdbt-search--ploughing-schedule .component__container {
Expand Down
2 changes: 1 addition & 1 deletion src/scss/06_components/paragraphs/_popular-service-item.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ $-service-item-font: 'special.large_link';
$-service-item-padding: ($wcag-touch-target-size-aaa - get-line-height($-service-item-font, $unremify: true) ) * 0.5;

.popular-service-item {
background-color: $color-silver-light;
background-color: $color-black-5;
margin-bottom: $spacing-and-half;
padding-bottom: $spacing-double;
padding-left: $spacing-and-half;
Expand Down
2 changes: 1 addition & 1 deletion src/scss/06_components/paragraphs/_react-search.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.component--react-search {
background-color: $color-silver-light;
background-color: $color-black-5;
position: relative;
}

Expand Down
2 changes: 1 addition & 1 deletion src/scss/06_components/paragraphs/_service-list-search.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.component--service-list-search {
@include component-side-padding;
background-color: $color-silver-light;
background-color: $color-black-5;
}
2 changes: 1 addition & 1 deletion src/scss/06_components/paragraphs/_target-group-links.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ $-title-spacing: calc(0.5 * (var(--icon-size) - var(--title-line-height))); // T
--icon-size: #{$spacing-double};
--title-line-height: #{get-line-height('h4')};
grid-column-gap: $spacing-and-half;
background-color: $color-silver-light;
background-color: $color-black-5;
display: grid;
grid-template-areas:
'icon title'
Expand Down
2 changes: 1 addition & 1 deletion src/scss/06_components/paragraphs/_unit-contact-card.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.unit-contact-card {
background-color: $color-silver-light;
background-color: $color-black-5;
display: flex;
flex-direction: column;
gap: $spacing;
Expand Down
4 changes: 2 additions & 2 deletions src/scss/06_components/paragraphs/_unit-search.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.component--unit-search {
@include component-side-padding;
background-color: $color-silver-light;
background-color: $color-black-5;
}

.component--unit-search .hds-checkbox__input {
Expand All @@ -9,7 +9,7 @@

// Patch Siteimprove false positive color contrast issue to reduce noise
.component--unit-search .hds-checkbox__label {
background-color: $color-silver-light;
background-color: $color-black-5;
}

// Give the checkboxes white background color. The hds-styles have the checkboxes bg transparent for some reason.
Expand Down
Loading