Skip to content

Commit

Permalink
Merge pull request #257 from hlxsites/bug/uat-issues
Browse files Browse the repository at this point in the history
Updated the minor issues in the buttons and grey-background
  • Loading branch information
pardeepgera23 authored Dec 13, 2023
2 parents ae3b36a + 98e3969 commit 884e189
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 6 deletions.
3 changes: 2 additions & 1 deletion blocks/rte/rte.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
.rte {
padding: 16px 0;
padding-top: 16px;
padding-bottom: 16px;
}
2 changes: 1 addition & 1 deletion blocks/showcards/showcards.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.custom-bg {
background-image: url('https://www.aldevron.com/hs-fs/hubfs/aldevron-solid-orange-background.png?width=1800&name=aldevron-solid-orange-background.png');
background-image: url('../../icons/aldevron-solid-orange-background.webp');
}

.lists {
Expand Down
Binary file added icons/aldevron-solid-orange-background.webp
Binary file not shown.
8 changes: 8 additions & 0 deletions scripts/aem.js
Original file line number Diff line number Diff line change
Expand Up @@ -486,11 +486,18 @@ function decorateButtons(element) {
if (a.href !== a.textContent) {
const up = a.parentElement;
const twoup = a.parentElement.parentElement;
const threeup = twoup.parentElement;
if (!a.querySelector('img')) {
if (up.childNodes.length === 1 && (up.tagName === 'P' || up.tagName === 'DIV')) {
a.className = 'button'; // default
up.classList.add('button-container');
}
if (a.children[0]) {
if (a.children[0].tagName === 'STRONG') {
a.setAttribute('target', '_blank');
a.children[0].classList.add('text-normal');
}
}
if (
up.childNodes.length === 1
&& up.tagName === 'STRONG'
Expand Down Expand Up @@ -531,6 +538,7 @@ function decorateButtons(element) {
&& up.tagName === 'EM'
&& twoup.childNodes.length === 1
&& twoup.tagName === 'STRONG'
&& threeup.tagName === 'DIV'
) {
a.setAttribute('target', '_blank');
a.classList.add('style-normal');
Expand Down
2 changes: 2 additions & 0 deletions styles/Typo.css
Original file line number Diff line number Diff line change
Expand Up @@ -1068,6 +1068,8 @@ body.mrna input[type="submit"]:hover {

.bg-grey {
background-color: #ededed!important;
padding-left: 20px;
padding-right: 20px;
}

.bg-white {
Expand Down
4 changes: 1 addition & 3 deletions styles/styles_2020.css
Original file line number Diff line number Diff line change
Expand Up @@ -578,8 +578,7 @@
}

.blog.anniversary-25 .blog-bottom {
background: url('https://www.aldevron.com/hubfs/aldevron_template/anniversary-btm-bg.webp') 50% 50% no-repeat;
background-size: cover
background-size: cover;
}

.blog.anniversary-25 .blog-bottom h3 {
Expand All @@ -605,7 +604,6 @@
}

.linkedin-bottom a::before {
background: url('https://www.aldevron.com/hubfs/aldevron_template/blog-linkedin-bg.webp') no-repeat 50% 50%;
background-size: cover;
content: "";
height: 100%;
Expand Down
1 change: 0 additions & 1 deletion styles/template.css
Original file line number Diff line number Diff line change
Expand Up @@ -880,7 +880,6 @@ body.purple .mmg-collapsible.open>.module-title,body.purple .mmg-collapsible>.mo
}

#careers .location-selector select {
background: url("https://www.aldevron.com/hubfs/aldevron_template/select-arrow-down.svg") 97% 50% no-repeat;
background-size: 12px 6px;
border-radius: 4px;
padding-right: 24px
Expand Down

0 comments on commit 884e189

Please sign in to comment.