Skip to content

Commit

Permalink
Merge pull request hlxsites#1193 from hlxsites/1192-ux-process-steps-…
Browse files Browse the repository at this point in the history
…rebrand

1192 [UX] Process Steps and Blog/News Rebrand
  • Loading branch information
davenichols-DHLS authored Jun 28, 2024
2 parents e7f962f + 71a5229 commit 28b6f7b
Show file tree
Hide file tree
Showing 6 changed files with 27 additions and 10 deletions.
15 changes: 12 additions & 3 deletions blocks/card-list/card-list.css
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,10 @@
gap: 1.5rem
}

.card-list-wrapper :is(.gap-y-0) {
row-gap: 0px
}

.card-list-wrapper :is(.overflow-hidden) {
overflow: hidden
}
Expand Down Expand Up @@ -294,9 +298,14 @@
padding-right: 1.5rem
}

.card-list-wrapper :is(.py-1) {
padding-top: 0.25rem;
padding-bottom: 0.25rem
.card-list-wrapper :is(.py-0) {
padding-top: 0px;
padding-bottom: 0px
}

.card-list-wrapper :is(.py-0\.5) {
padding-top: 0.125rem;
padding-bottom: 0.125rem
}

.card-list-wrapper :is(.py-4) {
Expand Down
8 changes: 4 additions & 4 deletions blocks/card-list/card-list.js
Original file line number Diff line number Diff line change
Expand Up @@ -95,16 +95,16 @@ export function createFilters(articles, viewAll = false) {
newUrl.pathname = window.location.pathname.substring(0, window.location.pathname.indexOf('/topics/'));
}
const tags = viewAll ? div(
{ class: 'flex flex-wrap gap-2 mb-4' },
{ class: 'flex flex-wrap gap-2 gap-y-0 mb-4' },
a(
{
class:
'text-center my-2 inline-block rounded-full px-4 py-1 font-semibold text-danaherpurple-500 bg-danaherpurple-50 hover:text-white hover:bg-danaherpurple-500',
'text-center my-2 inline-block rounded-full px-4 py-0.5 font-semibold text-danaherpurple-500 bg-danaherpurple-50 hover:text-white hover:bg-danaherpurple-500',
href: makePublicUrl(newUrl.toString()),
},
'View All',
),
) : div({ class: 'flex flex-wrap gap-2 mb-4' });
) : div({ class: 'flex flex-wrap gap-2 gap-y-0 mb-4' });

[...keywords].sort().forEach((keyword) => {
let currentUrl;
Expand All @@ -119,7 +119,7 @@ export function createFilters(articles, viewAll = false) {
const tagAnchor = a(
{
class:
'text-center my-2 inline-block rounded-full px-4 py-1 font-semibold text-danaherpurple-500 bg-danaherpurple-50 hover:text-white hover:bg-danaherpurple-500',
'text-center my-2 inline-block rounded-full px-4 py-0.5 font-semibold text-danaherpurple-500 bg-danaherpurple-50 hover:text-white hover:bg-danaherpurple-500',
href: makePublicUrl(newUrl.toString()),
},
keyword,
Expand Down
8 changes: 8 additions & 0 deletions blocks/side-nav/side-nav.css
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,14 @@
padding-bottom: 1rem
}

.side-nav-wrapper :is(.pl-2) {
padding-left: 0.5rem
}

.side-nav-wrapper :is(.pl-2\.5) {
padding-left: 0.625rem
}

.side-nav-wrapper :is(.pr-2) {
padding-right: 0.5rem
}
Expand Down
2 changes: 1 addition & 1 deletion blocks/side-nav/side-nav.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ function renderSideNav(sideNavItems) {
class: 'flex gap-3',
},
a({
class: 'py-4 pr-2 text-base',
class: 'py-4 pr-2 pl-2.5 text-base',
href: makePublicUrl(sideNavItem.path),
}, sideNavItem.title),
),
Expand Down
2 changes: 1 addition & 1 deletion styles/styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -1019,7 +1019,7 @@ header {

@media (min-width: 1024px) {
header {
height: 179px;
height: 170px;
}
}

Expand Down
2 changes: 1 addition & 1 deletion styles/tailwind.css
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@
}

header {
@apply h-[52px] md:h-[80px] lg:h-[179px] bg-white print:hidden;
@apply h-[52px] md:h-[80px] lg:h-[170px] bg-white print:hidden;
}

.topic main, .topichub main {
Expand Down

0 comments on commit 28b6f7b

Please sign in to comment.