Skip to content

Commit

Permalink
Merge branch 'feature/fis-header-search' into 'release'
Browse files Browse the repository at this point in the history
FIS header changes - search

See merge request buckinghamshire-council/bc!693
  • Loading branch information
KIRA009 committed Jul 10, 2024
2 parents 5f3f426 + e10998a commit 94f0446
Show file tree
Hide file tree
Showing 7 changed files with 52 additions and 9 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Release History

## Unreleased

- Update FIS search in header - remove dropdown search and simplify to single text input, consistent with the standard homepage
- Add transparent border to search inputs to improve visibility of input boundary in high contrast mode

## 73.0 (2024-07-09)

Compare: <https://git.torchbox.com/buckinghamshire-council/bc/compare/72.01...73.0>
Expand Down
9 changes: 9 additions & 0 deletions bc/static_src/sass/abstracts/_mixins.scss
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,15 @@
background: darken($backgroundColor, 3%);
color: $textColor;
}

.icon {
fill: $textColor;

&--stroke {
fill: transparent;
stroke: $textColor;
}
}
}

@mixin focus() {
Expand Down
9 changes: 9 additions & 0 deletions bc/static_src/sass/components/_button.scss
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,15 @@
@include button($color--slate, $color--leaf, $color--leaf);
}

&--no-border {
border-bottom: 0;

&:focus,
&:active {
border-bottom: 0;
}
}

&--area-search {
display: flex;
min-height: 40px;
Expand Down
2 changes: 2 additions & 0 deletions bc/static_src/sass/components/_family-info.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
}

&__search {
// adds visible border around input field for high contrast mode
border: 1px solid transparent;
padding: 60px 0;

label {
Expand Down
2 changes: 1 addition & 1 deletion bc/static_src/sass/components/_form.scss
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@
margin-bottom: $grid;

input[type='text'] {
border: 0;
border: 1px solid transparent;

@include media-query(tablet-portrait) {
width: 100%;
Expand Down
2 changes: 2 additions & 0 deletions bc/static_src/sass/components/_search-header.scss
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@
}

&__search {
// adds visible border around input field for high contrast mode
border: 1px solid transparent;
margin-bottom: $grid;
}

Expand Down
32 changes: 24 additions & 8 deletions bc/static_src/sass/layout/_header.scss
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@
}

&__search {
// adds visible border around input field for high contrast mode
border: 1px solid transparent;
width: 100%;
margin-top: $grid--small;

Expand All @@ -34,9 +36,9 @@
}

.template-home-page &,
.template-fis-home &,
.template-jobs-home &,
.template-searchresults & {
.template-searchresults &,
.template-fis-home & {
display: none;
}

Expand All @@ -46,14 +48,19 @@
}

&--fis {
#{$root}__heading,
#{$root}__heading-title {
#{$root}__heading {
display: block;
margin-top: $grid--min;
}

#{$root}__search {
margin-top: 0;
width: auto;
margin-bottom: $grid--min;

@include media-query(tablet-portrait) {
margin-top: 0;
margin-bottom: 0;
width: auto;
}
}

#{$root}__search-button {
Expand Down Expand Up @@ -85,6 +92,13 @@
margin: 0 $grid--min;
}

@include media-query(px550) {
#{$root}__heading-title {
display: block;
margin-bottom: $grid--min;
}
}

@include media-query(tablet-portrait) {
#{$root}__heading {
display: flex;
Expand Down Expand Up @@ -218,6 +232,7 @@
}

@include media-query(px550) {
@include font-size(m);
flex: 0 1 50%;
line-height: 1.25;
margin-top: 0;
Expand Down Expand Up @@ -260,9 +275,10 @@
display: none;
}

@include media-query(tablet-landscape) {
@include media-query(tablet-portrait) {
&__heading {
display: block;
display: flex;
align-items: center;
}
}
}
Expand Down

0 comments on commit 94f0446

Please sign in to comment.