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

Initial form block #168

Closed
wants to merge 56 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
302a0d5
lots of little changes to test blocks for phase 1b
DanCollinz Sep 26, 2023
d8e0265
expanding hero
DanCollinz Sep 26, 2023
2b0c697
fixing icons
DanCollinz Sep 26, 2023
7572960
Updating sections and cards
DanCollinz Sep 27, 2023
931b627
latest changes adding toc, and changing card styles
DanCollinz Oct 18, 2023
8e9c204
form demo set up
DanCollinz Oct 18, 2023
71757a2
Update README.md
DanCollinz Oct 18, 2023
8a01265
updates from display changes for phase 1b
DanCollinz Oct 30, 2023
3651ed4
lots of lint changes
DanCollinz Nov 6, 2023
47a48e3
matching designs for these images to the designs
DanCollinz Dec 1, 2023
e5bb5da
adding Sagar's changes
DanCollinz Jan 19, 2024
b2697ab
updating footer and align section headings center
DanCollinz Jan 19, 2024
b93a7be
removing whitespace in padding
DanCollinz Jan 19, 2024
6ad12d1
Update styles.css
DanCollinz Jan 19, 2024
6b15ed4
resize heros, temp
DanCollinz Jan 19, 2024
34d4b2c
adding space between sections
DanCollinz Jan 19, 2024
b17219c
center align content section titles
DanCollinz Jan 22, 2024
4f26d1e
for free trial cards added a border
DanCollinz Jan 22, 2024
849e370
Update cards.css
DanCollinz Jan 22, 2024
0c698ca
issue 155 update style for floating image block
DanCollinz Jan 23, 2024
41e0bc3
Floating image tune up and such
DanCollinz Jan 24, 2024
0967b78
fixed few lint issues and adjusted disclaimer postion
rrrragas Jan 25, 2024
5dabf2d
added adoibe launch library for testing
DanCollinz Jan 29, 2024
f84d5b2
Merge branch 'phase-two-redo' of https://github.com/hlxsites/takeda-i…
DanCollinz Jan 29, 2024
879b147
changing launch link
DanCollinz Jan 29, 2024
62ac9d4
updated styles for product card
rrrragas Jan 30, 2024
7d93de7
Merge branch 'phase-two-redo' of https://github.com/hlxsites/takeda-i…
rrrragas Jan 30, 2024
70eaf4d
adding launch link for new environment
DanCollinz Jan 30, 2024
3fb2eb1
removing script tag
DanCollinz Jan 30, 2024
21933c0
Initial form block
jalagari Feb 6, 2024
e3662d8
updated code for header block as per new design
rrrragas Feb 6, 2024
883fb3d
fixes for eslint errors
rrrragas Feb 6, 2024
519931e
fix for few eslint issues
rrrragas Feb 6, 2024
47be512
updated styles for footer new design
rrrragas Feb 7, 2024
b1abe8f
updated background
rrrragas Feb 7, 2024
d996857
icon card tweaks
DanCollinz Feb 7, 2024
308dae1
Merge branch 'phase-two-redo' of https://github.com/hlxsites/takeda-i…
DanCollinz Feb 7, 2024
74b8547
adding new launch env
DanCollinz Feb 7, 2024
437f70f
added new launch env
DanCollinz Feb 7, 2024
e8979c5
updating launch code and adding assets library
DanCollinz Feb 7, 2024
84faf87
https://github.com/hlxsites/takeda-ihs/issues/169
DanCollinz Feb 8, 2024
6924d1f
bunch of floating image content container tweaks
DanCollinz Feb 8, 2024
7adcc90
updated styles for footer links alignment
rrrragas Feb 8, 2024
ac7406a
removing GA
DanCollinz Feb 9, 2024
f8e48cb
remove gtm
DanCollinz Feb 9, 2024
4e740d7
remove const GTM
DanCollinz Feb 9, 2024
f5f274b
more gtm errors
DanCollinz Feb 9, 2024
1a092a2
nav tune up, space above and space between lis
DanCollinz Feb 9, 2024
638d44c
form action added for documentbasedform
gargadobe Feb 12, 2024
fc24f94
input id fix
gargadobe Feb 12, 2024
6f8dd91
form submit handler
gargadobe Feb 12, 2024
aacc81a
validation added
gargadobe Feb 13, 2024
b266954
top nav style changes as per new designs
rrrragas Feb 13, 2024
407c631
form styling
gargadobe Feb 13, 2024
e837e53
Merge branch 'phase-two-redo' of https://github.com/hlxsites/takeda-i…
gargadobe Feb 13, 2024
b29f49c
hero block changes
gargadobe Feb 13, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ Takeda Integrated Health Systems

## Environments

-Preview: https://main--takeda-ihs--hlxsites.hlx.page/
-Preview: https://phase-two-redo--takeda-ihs--hlxsites.hlx.page/

-Live: https://main--takeda-ihs--hlxsites.hlx.live/
-Live: https://phase-two-redo--takeda-ihs--hlxsites.hlx.live/

## Installation

Expand Down
3 changes: 3 additions & 0 deletions arrow-right.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 5 additions & 1 deletion blocks/cards/cards.css
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,11 @@
gap: 1.75em;
}


.cards.default.block > div {
padding: 20px 16px;
border-radius: 10px;
border-radius: 8px;
box-shadow: 0 4px 10px 0 rgba(0 0 0 / 20%);
background-color: rgba(255 255 255 / 66%);
}

Expand Down Expand Up @@ -49,6 +51,8 @@
@media screen and (min-width: 600px) {
.cards.default.block > div {
padding: 20px 32px;
border-radius: 8px;
box-shadow: 0 4px 10px 0 rgba(0 0 0 / 20%);
}
}

Expand Down
59 changes: 52 additions & 7 deletions blocks/cards/cta.css
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,48 @@
}

.cards.cta.block > ul > li div {
padding-top: 30px;
padding-top: 0;
border-top: 3px solid white;
}

.cards.cta.block > ul > li.onepath div {
border-color: var(--onepath);
/* border-color: var(--onepath); */
}

.cards.cta.block > ul > li.myigsource div {
border-color: var(--myigsource);
/* border-color: var(--myigsource); */
}

.cards.cta.block > ul > li.hello-programs div {
border-color: var(--hello-programs);
/* border-color: var(--hello-programs); */
}

.cards.cta.block button.primary.top-link {
display: inline-block;
padding: 0;
font-weight: bold;
line-height: var(--line-height-l);
text-decoration: none;
border: 0;
}

.cards.cta.block .card-body .top-section {
position: relative;
margin-left:12px;
}

.cards.cta.block .card-body p.link-container span.icon svg {
position: relative;
height: 25px;
width: 25px;
}

.cards.cta.block .card-body p.link-container span.icon {
display: block;
width: 100%;
position: absolute;
left: 96%;
top: -5px;
}

.cards.cta.block > ul > li div p.image {
Expand All @@ -51,17 +79,22 @@

.cards.cta.block > ul > li h3 {
font-size: var(--heading-font-size-xs);
text-align: center;
text-align: left;
color: var(--gray);
margin: 12px auto;
margin: 12px;
}

.cards.cta.block > ul > li p {
text-align: center;
}

.cards.cta.block > ul > li p.link-container {
text-align: left;
}

.cards.cta.block > ul > li p.button-container {
margin: 18px auto;
margin: 12px;
text-align: left;
}

@media screen and (min-width: 900px) {
Expand All @@ -87,6 +120,18 @@
.cards.cta.block > ul > li div p.image {
width: 100%;
}

.cards.cta.block .card-body {
margin-right:20px;
}

.cards.cta.block .card-body p.link-container span.icon {
display: block;
width: 100%;
position: absolute;
left: 96%;
top: -5px;
}
}

@media screen and (min-width: 1200px) {
Expand Down
15 changes: 13 additions & 2 deletions blocks/cards/cta.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,27 @@ import { decorateIcons } from '../../scripts/lib-franklin.js';
*/
export default async function decorate(block) {
const cards = [...block.children];
const anchor = block.querySelector('a');
anchor.classList.remove('button', 'primary');
anchor.classList.add('top-link');
const ul = document.createElement('ul');
ul.classList.add(`cards-${cards.length}`);
cards.forEach((card) => {
const topSection = document.createElement('div');
topSection.classList.add('top-section');
const cardBody = (card.children[1]);
cardBody.classList.add('card-body');
const ButtonContainer = card.querySelector('p.button-container');
ButtonContainer.classList.remove('button-container');
ButtonContainer.classList.add('link-container');
cardBody.prepend(topSection);
const topLink = card.querySelector('p.link-container');
topSection.append(topLink);
const li = document.createElement('li');
li.classList.add('cta', card.children[0].textContent);
li.append(card.children[1]);

const picture = li.querySelector('picture');
picture.closest('p').classList.add('image');

const img = picture.querySelector('img');
const ratio = (parseInt(img.height, 10) / parseInt(img.width, 10)) * 100;
picture.style.paddingBottom = `${ratio}%`;
Expand Down
48 changes: 42 additions & 6 deletions blocks/cards/icon.css
Original file line number Diff line number Diff line change
@@ -1,27 +1,42 @@

.cards.icon.block {
display: grid;
gap: 24px;
}

.cards-wrapper {
max-width: var(--normal-page-width);
}

.cards.icon.block .row {
display: grid;
gap: 24px;
}


.cards.icon.block .card {
display: flex;
padding: 20px 30px;
padding-right:20px;
margin:20px 0;
flex-direction: column;
background-color: white;
box-shadow: 0 4px 10px 0 rgba(0 0 0 / 20%);
border-radius: 10px;
text-align: center;
border-bottom: 1px solid grey;
}

.cards.icon.block .card span.icon {
display: inline-block;
height: 43px;
width: 43px;
height: 70px;
width: 70px;
margin-bottom:1em;
}

.cards.icon.block .card .button-container span.icon {
position: relative;
top: 8px;
left: 10px;
display: inline-block;
height: 25px;
width: 25px;
}

.cards.icon.block .card span.icon svg {
Expand All @@ -30,18 +45,38 @@
width: 100%;
}

.cards.icon.block .card:last-of-type {
border:0;
}

.cards.icon.block .card h3 {
margin-bottom: 1em;
font-size: var(--heading-font-size-xs);
font-weight: var(--font-weight-bold);
line-height: var(--line-height-s);
}

.cards.icon.block .card p {
margin-bottom:0;

}
@media screen and (min-width: 600px) {
.cards.icon.block .card {

}
}

@media screen and (min-width: 900px) {
.cards.icon.block .row {
grid-template-columns: repeat(2, 1fr);
}

.cards.icon.block .card {
border-right: 1px solid grey;
border-bottom:0;

}

main .section[data-layout] .cards.icon.block .row {
grid-template-columns: 1fr;
}
Expand All @@ -52,4 +87,5 @@
main .section[data-layout] .cards.icon.block .row {
grid-template-columns: repeat(3, 1fr);
}

}
88 changes: 26 additions & 62 deletions blocks/cards/product.css
Original file line number Diff line number Diff line change
@@ -1,87 +1,51 @@
.cards.product.block > ul {
.cards.product.block {
display: grid;
grid-template-columns: 1fr;
gap: 1em;
}

.cards.product.block > ul > li > a {
display: block;
padding: 20px 20px 10px;
text-decoration: none;
border-radius: 10px;
.cards.product.block > .card {
display: grid;
grid-template-columns: 25% 75%;
padding: 1em;
gap: 1em;
box-shadow: 0 4px 10px 0 rgba(0 0 0 / 20%);
background-color: var(--white);
}

.cards.product.block > ul > li hr {
border-top: 3px solid white;
}

.cards.product.block > ul > li .logo {
padding-top: 10px;
max-width: 240px;
border-radius: 8px;
}

.cards.product.block > ul > li picture {
display: block;
position: relative;
.cards.product.block .card img {
width: 100%;
height: 100%;
}

.cards.product.block > ul > li.gammagard-liquid hr {
border-color: var(--gammagard-liq);
}

.cards.product.block > ul > li.gammagard-sd hr {
border-color: var(--gammagard-sd);
}

.cards.product.block > ul > li.hyqvia hr {
border-color: var(--hyqvia);
object-fit: contain;
}

.cards.product.block > ul > li.cuvitru hr {
border-color: var(--cuvitru);
.cards.product.block .card .details {
display: flex;
flex-direction: column;
justify-content: center;
padding: 10px;
}

.cards.product.block > ul > li.flexbumin hr {
border-color: var(--flexbumin);
.cards.product.block .card .details .button-container{
align-self: flex-end;
}

.cards.product.block > ul > li.glassia hr {
border-color: var(--glassia);
.cards.product.block .card .details .button-container > a {
background-color: unset;
}

.cards.product.block > ul > li.aralast hr {
border-color: var(--aralast);
.cards.product.block .card .details .icon.icon-download-button {
display: block;
width: 35px;
height: 35px;
}

.cards.product.block > ul > li .logo picture img {
position: absolute;
top: 0;
left: 0;
.cards.product.block .card .details .icon.icon-download-button > svg {
width: 100%;
height: 100%;
object-position: center center;
object-fit: contain;
}

.cards.product.block > ul > li > a p {
margin-top: 10px;
margin-bottom: 0;
font-size: var(--body-font-size-s);
text-align: right;
}

@media screen and (min-width: 600px) {
.cards.product.block > ul > li .logo {
margin-left: 45px;
}
}

@media screen and (min-width: 900px) {
main .section[data-layout] .cards.product.block > ul > li .logo {
margin-left: 1em;
.cards.product.block {
grid-template-columns: 1fr 1fr;
}
}
}
Loading
Loading