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.

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

refactor: header styles to align with current design #899

Merged
merged 12 commits into from
Aug 6, 2024
30 changes: 30 additions & 0 deletions source/_data/enterprise/mainnavigation.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,36 @@
"href": "#",
"value": "Sub 01 Sub 03",
"rel": "news"
},
{
"href": "#",
"value": "Sub 01 Sub 04",
"rel": "index"
},
{
"href": "#",
"value": "Sub 01 Sub 05",
"rel": "offers"
},
{
"href": "#",
"value": "Sub 01 Sub 06",
"rel": "news"
},
{
"href": "#",
"value": "Sub 01 Sub 07",
"rel": "index"
},
{
"href": "#",
"value": "Sub 01 Sub 08",
"rel": "offers"
},
{
"href": "#",
"value": "Sub 01 Sub 09",
"rel": "news"
}
]
},
Expand Down
10 changes: 1 addition & 9 deletions source/_patterns/01-elements/image/image.scss
Original file line number Diff line number Diff line change
@@ -1,13 +1,5 @@
@import "image.variables";

.elm-image {
&.is-logo {
height: auto;
margin: 0.2rem #{to-rem($pxValue: 16)} 0.2rem 0;
max-width: $image-logo--maxwidth;

.cmp-brand & {
width: $brand-image--width; // * TODO: possibly rework variable naming
}
}
// We removed logo styles here
}
39 changes: 11 additions & 28 deletions source/_patterns/02-components/brand/brand.scss
Original file line number Diff line number Diff line change
@@ -1,39 +1,22 @@
@import "brand.variables";

.cmp-brand {
.elm-image {
&.is-logo {
float: left;
margin-top: -#{to-rem($pxValue: 2)};
}
font-weight: bold;
display: flex;
align-items: center;
gap: 1rem;

a, img {
height: 1.5rem;
}

img {
width: auto;
}

a {
color: inherit;
// Deactivate underline on site name being made clickable by added to the link as well
text-decoration: none;
}

.rea-header & {
padding-top: to-rem($pxValue: 18);
@media screen and (width > $db-break-the-header-max-width) {
padding-top: $rea-header-cmp-brand-padding-top; // * TODO: possibly rework variable naming

.is-site-name {
&::before {
// * TODO: introduce is-icon as a mixin and change the following declarations afterwards
content: none !important;
}
}
}
}
@media screen and (max-width: $db-break-the-header-max-width) {
.cmp-mainnavigation ~ & {
.rea-header & {
.is-site-name {
display: none;
}
}
}
}
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@import "../../../css/helpers/functions";
@import "../../00-base/icons/icons.helpers";
@import "../../00-base/icons/icons.variables";

$db-language-switcher---direction: var(--db-language-switcher---direction, 1);
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
@import "../../../css/partials.meta";
@import "language-switcher.variables";

@mixin set-top($step: 1) {
top: calc(
#{$db-language-switcher---direction} * (100% * #{$step} + 1rem - 2px)
);
}

.cmp-language-switcher {
list-style: none;

Expand Down Expand Up @@ -29,41 +35,41 @@
top: to-rem($pxValue: 26);

.rea-header & {
top: to-rem($pxValue: 55);
@include set-top(1);

z-index: $z-index-rea-header-cmp-language-switcher-li; // * TODO: possibly rework variable naming

// TODO: This is an enhancement for more languages, but obviously doesn't scale that nicely and would need some rework
&:not([aria-current="page"], [aria-selected="true"])
~ li:not([aria-current="page"], [aria-selected="true"]) {
top: to-rem($pxValue: 54 * 2);
@include set-top(2);

& ~ li:not([aria-current="page"], [aria-selected="true"]) {
top: to-rem($pxValue: 54 * 3);
@include set-top(3);

& ~ li:not([aria-current="page"], [aria-selected="true"]) {
top: to-rem($pxValue: 54 * 4);
@include set-top(4);

&
~ li:not(
[aria-current="page"],
[aria-selected="true"]
) {
top: to-rem($pxValue: 54 * 5);
@include set-top(5);

&
~ li:not(
[aria-current="page"],
[aria-selected="true"]
) {
top: to-rem($pxValue: 54 * 6);
@include set-top(6);
}
}
}
}
}
@media screen and (width > $db-break-the-header-max-width) {
top: to-rem($pxValue: 56);
top: 100%;
}
}

Expand All @@ -78,9 +84,8 @@

.elm-link,
.elm-button {
padding-bottom: to-rem($pxValue: 15);
padding-block: 1rem;
padding-right: to-rem($pxValue: 34);
padding-top: to-rem($pxValue: 15);

&:hover,
&:focus {
Expand All @@ -95,8 +100,6 @@

.elm-link,
.elm-button {
padding-bottom: to-rem($pxValue: 22);

& {
@include icon(
glyph(expand-more),
Expand Down
Loading
Loading