darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-26 09:13:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove rounded corners from map controls

Browse Source 
Also includes a quick fix for high contrast mode.
The buttons are separated by a horizontal line by
default, styled as a border above the 2nd button.

Both buttons use the border when focused in high
contrast mode to provide a form of outline.
This takes away the line dividing them, because
you can only have one border.

The buttons are still separated by a 1px margin so
this just sets a background colour on the
container to simulate the divider.
This commit is contained in:
Tom Byers
2021-08-11 16:39:58 +01:00
parent 388edeef5d
commit f70dcc8329
1 changed files with 78 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

136
app/assets/stylesheets/map.scss
View File

@@ -51,72 +51,92 @@ $zoom-button-hover-colour: govuk-shade($zoom-button-colour, 10%);
// //
// Also introduces a black divider between the buttons, made with a pseudo element, appearing on // Also introduces a black divider between the buttons, made with a pseudo element, appearing on
// focus to mimic the 2-colour style GOVUK Frontend buttons and links have // focus to mimic the 2-colour style GOVUK Frontend buttons and links have
.leaflet-bar a { .leaflet-bar {
border-radius: 0; // Remove rounded corners
// Allow it to contain the absolutely positioned divider bar we show between buttons @media (forced-colors: active) {
// when one is focused background: canvasText;
&:last-child {
position: relative;
} }
// Hover style is darker background a {
&:hover {
background-color: $zoom-button-hover-colour;
}
// Styles that apply if focused with or without the :hover or :active state &:first-child {
&:focus { // Remove rounded corners
// When colours are overridden, for example when users have a dark mode, border-top-left-radius: 0;
// backgrounds and box-shadows disappear, so we need to ensure there's a border-top-right-radius: 0;
// transparent outline which will be set to a visible colour by the OS. }
border: solid 2px transparent;
box-sizing: border-box; // make sure height includes the border
line-height: 26px; // subtract the border from the height (normally 30px)
// The inline display box for the button text overlaps the button edge. &:last-child {
// This is only visible in high contrast mode because of the background colour being set. // Allow it to contain the absolutely positioned divider bar we show between buttons
@media (forced-colors: active) { // when one is focused
overflow: hidden; position: relative;
// Remove rounded corners
border-bottom-left-radius: 0;
border-bottom-right-radius: 0;
}
// Hover style is darker background
&:hover {
background-color: $zoom-button-hover-colour;
}
// Styles that apply if focused with or without the :hover or :active state
&:focus {
// When colours are overridden, for example when users have a dark mode,
// backgrounds and box-shadows disappear, so we need to ensure there's a
// outline so it can be set to a visible colour by the OS.
border: solid 2px $govuk-focus-colour;
box-sizing: border-box; // make sure height includes the border
line-height: 26px; // subtract the border from the height (normally 30px)
// The inline display box for the button text overlaps the button edge.
// This is only visible in high contrast mode because of the background colour being set.
@media (forced-colors: active) {
overflow: hidden;
}
}
// Focused style sets the button to the focus colour
&:focus:not(:active):not(:hover) {
color: $govuk-focus-text-colour;
background-color: $govuk-focus-colour;
}
// Retain the space between buttons now we're using the border in the focus style
&:first-child:focus {
margin-bottom: 1px;
}
// 3px divider between buttons as a version of the underline from the GOVUK focus style
&:last-child:focus:not(:active):not(:hover):before,
&:first-child:focus:not(:active):not(:hover) + a:before {
content: "";
position: absolute;
height: 2px;
background: $govuk-focus-text-colour;
// hide for focus:hover state
@media (forced-colors: active) {
display: none;
}
}
// Styles for the divider, specifc to the second button being focused
&:last-child:focus:not(:active):not(:hover):before {
left: -2px; // Subtract 2px left border
top: -3px; // Subtract 2px top border and position so it overlaps space above button
width: calc(100% + 4px); // Subtract borders
}
// Styles for the divider, specifc to the first button being focused
&:first-child:focus:not(:active):not(:hover) + a:before {
left: 0px; // No borders on parent of :before when not focused
top: -1px; // No borders so just overlap space above parent button
width: 100%;
} }
} }
// Focused style sets the button to the focus colour
&:focus:not(:active):not(:hover) {
color: $govuk-focus-text-colour;
background-color: $govuk-focus-colour;
}
// Retain the space between buttons now we're using the border in the focus style
&:first-child:focus {
margin-bottom: 1px;
}
// 3px divider between buttons as a version of the underline from the GOVUK focus style
&:last-child:focus:not(:active):not(:hover):before,
&:first-child:focus:not(:active):not(:hover) + a:before {
content: "";
position: absolute;
height: 2px;
background: $govuk-focus-text-colour;
@media (forced-colors: active) {
background: canvasText;
}
}
// Styles for the divider, specifc to the second button being focused
&:last-child:focus:not(:active):not(:hover):before {
left: -2px; // Subtract 2px left border
top: -3px; // Subtract 2px top border and position so it overlaps space above button
width: calc(100% + 4px); // Subtract borders
}
// Styles for the divider, specifc to the first button being focused
&:first-child:focus:not(:active):not(:hover) + a:before {
left: 0px; // No borders on parent of :before when not focused
top: -1px; // No borders so just overlap space above parent button
width: 100%;
}
} }
// Extra block to override specific LeafletJS rounded-corners when buttons are focused // Extra block to override specific LeafletJS rounded-corners when buttons are focused