Skip to content

Commit

Permalink
Style fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@eebbi
eebbi committed Jan 20, 2025
1 parent bd9a871 commit 06649da
Show file tree
Hide file tree
Showing 7 changed files with 84 additions and 38 deletions.
7 changes: 3 additions & 4 deletions assets/styles/ui-components/_button.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,14 +69,13 @@ $button-secondary-border-color: $button-primary-border-color;

&.is-primary.is-inverted,
&.is-primary-invert {
border-color: $color-savel-button !important;
background-color: $primary-invert !important;
color: $color-savel-button !important;

&,
&:hover,
&:focus {
background-color: $color-savel-button !important;
border-color: $color-savel-button !important;
background-color: $primary-invert !important;
color: $color-savel-button !important;
}

&:active {
Expand Down
20 changes: 0 additions & 20 deletions assets/styles/ui-components/_forms.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,6 @@ select {
border-color: $color-savel-button !important;
color: $white !important;

&:after {
content: "";
width: 0.7rem;
height: 1rem;
display: block;
margin-left: 1rem;
background-color: $white;
}

&:hover,
&.is-hovered,
&:focus,
Expand All @@ -68,17 +59,6 @@ select {

}

.gfield_checkbox {
label {
&::before {
// margin-top: 0.25rem;
// checked bg blue
// ^^ sama radioille ja myös pienemmäks valkonen keskipalkki?
// dropdown tekstin color väärä
}
}
}

.gfield_label {
font-weight: 400 !important;
}
Expand Down
6 changes: 4 additions & 2 deletions assets/styles/ui-components/_modal.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
&:focus {
outline: 0.125rem dotted $white !important;
outline-offset: 0.25rem !important;
color: $white !important; // sass-lint:disable-line no-important
color: $black !important; // sass-lint:disable-line no-important
.icon {
fill: $white !important; // sass-lint:disable-line no-important
fill: $black !important; // sass-lint:disable-line no-important
}
}

Expand All @@ -38,12 +38,14 @@
.icon {
fill: $white !important; // sass-lint:disable-line no-important
}

&:hover {
background-color: $white;
.icon {
fill: $black !important; // sass-lint:disable-line no-important
}
}

&:focus {
outline: 0.125rem dotted $white !important;
outline-offset: 0.25rem !important;
Expand Down
4 changes: 4 additions & 0 deletions assets/styles/ui-components/header/_header-top.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,10 @@
}

> a {
img {
min-width: 180px;
}

&:focus {
outline-offset: .2rem;
outline: .125rem dotted $white !important;
Expand Down
16 changes: 5 additions & 11 deletions assets/styles/ui-components/header/_language-nav.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,20 +72,14 @@
a {
border-color: $white !important;

&.has-text-primary {
color: $color-savel-darkgreen !important;
}

&.has-text-primary-invert {
&:hover {
color: $primary-invert !important;
&.has-background-primary {
&:hover,
&:focus,
&:active {
background-color: $primary !important;
}
}

&:hover {
background-color: $primary-invert !important;
}

&:focus {
outline-offset: .2rem;
outline: .125rem dotted $white !important;
Expand Down
2 changes: 1 addition & 1 deletion lib/ThemeCustomizationController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ public function hooks() : void {
public function header( $colors ) : array {
$colors['nav']['container'] = '';
$colors['search_popup_container'] = 'has-text-primary-invert';
$colors['lang_nav']['link__default'] = 'has-text-primary';
$colors['lang_nav']['link__default'] = 'has-text-primary-invert';
$colors['lang_nav']['link__active'] = 'has-background-primary has-text-primary-invert';
$colors['lang_nav']['dropdown_toggle'] = 'is-small';
$colors['fly_out_nav']['inner'] = 'has-text-primary-invert';
Expand Down
67 changes: 67 additions & 0 deletions partials/views/page-events-search/form.dust
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
<form class="is-relative" action="{form.action|attr}">
<div class="section pt-8 pb-8 {template_classes.search_form|attr}">
<div class="container">
<div class="event-search-form columns is-flex is-multiline is-variable is-3-tablet is-6-desktop">
<div class="column is-12-mobile is-3-tablet is-4-widescreen">
<div class="h6 mb-2">
{form.seach_term_label|html}
</div>
<label for="search-input">
<span class="is-sr-only">{form.seach_term_label|html}</span>
</label>
<input type="text" name="event_search_text" id="search-input" value="{form.search_term|attr}"
class="has-width-100"
autocomplete="off">
</div>

<div class="column is-12-mobile is-7-tablet is-5-widescreen">
<div class="h6 mb-2">
{form.time_frame_label|html}
</div>
<div class="columns is-12-mobile is-mobile is-variable is-1">
<div class="column">
<label for="start-date" class="is-sr-only">
{form.start_date_label|html}
</label>
<span class="is-block">
<duet-date-picker
identifier="start-date"
name="event_search_start_date"
value="{form.form_start_date|attr}"
data-locale="{Header.site_locale|attr}"></duet-date-picker>
</span>
</div>
<div class="column is-narrow">
<span class="line"></span>
</div>
<div class="column">
<label for="end-date" class="is-sr-only">
{form.end_date_label|html}
</label>
<span class="is-block">
<duet-date-picker
identifier="end-date"
name="event_search_end_date"
value="{form.form_end_date|attr}"
data-locale="{Header.site_locale|attr}"></duet-date-picker>
</span>
</div>
</div>
</div>

<div class="column is-align-self-flex-start is-flex order-4">
<a href="{form.action|url}" class="button button-clear-inputs is-primary">
{Strings.s.search.clear|html}
</a>
</div>

<div class="column is-12-mobile is-2-tablet is-3-widescreen is-align-self-flex-end is-flex order-3">
<button type="submit" class="button button--icon is-primary ml-auto-desktop">
{Strings.s.header.search|html}
{>"ui/icon" icon="search" class="icon--medium" /}
</button>
</div>
</div>
</div>
</div>
</form>

0 comments on commit 06649da

Please sign in to comment.