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.

Sign up for GitHub

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

update additional info block #47

Merged
merged 2 commits into from
Jul 28, 2020
Merged

update additional info block #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cb29f92
fix: delete extra padding in hello-there block
julieg18 Jul 28, 2020
bf8efbd
fix: fix additional-info link design and href
julieg18 Jul 28, 2020
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
3 changes: 3 additions & 0 deletions src/blocks/additional-info/__link-text/additional-info__link-text.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
.additional-info__link-text {
margin: 0;
}
13 changes: 13 additions & 0 deletions src/blocks/additional-info/__link/additional-info__link.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,18 @@
font-size: 19px;
line-height: 19px;
font-weight: 500;
display: flex;
align-items: flex-end;
justify-content: space-between;
}

.additional-info__link:hover {
color: #000;
text-decoration: underline #ffc124;
}

.additional-info__link:hover .arrow-icon {
background: url('../../arrow-icon/yellow-arrow.svg') center right no-repeat;
}

@media only screen and (max-width: 320px) {
Expand All @@ -15,6 +27,7 @@
.additional-info__link {
font-size: 24px;
line-height: 34px;
align-items: center;
}
}

Expand Down
7 changes: 1 addition & 6 deletions src/blocks/additional-info/__list-item/additional-info__list-item.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
.additional-info__list-item {
margin-bottom: 16px;
display: flex;
justify-content: space-between;
align-items: center;

}

.additional-info__list-item:last-of-type {
Expand All @@ -17,8 +13,7 @@
}

@media only screen and (max-width: 424px) {
.additional-info__list-item {
.additional-info__list-item {
margin-bottom: 18px;
align-items: flex-end;
}
}
6 changes: 2 additions & 4 deletions src/blocks/additional-info/additional-info.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
@import url(./__list/additional-info__list.css);
@import url(./__list-item/additional-info__list-item.css);
@import url(./__link/additional-info__link.css);
@import url(./__link-text/additional-info__link-text.css);

.additional-info {
border-bottom: 1.7px solid #223d46;
Expand Down Expand Up @@ -32,9 +33,6 @@

@media only screen and (min-width: 1280px) {
.additional-info {
margin: 0 auto;
margin: 0 auto;
}
}



39 changes: 17 additions & 22 deletions src/blocks/arrow-icon/arrow-icon.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,40 +1,35 @@
.arrow-icon {
width: 43px;
height: 19px;
background: url('./blue-arrow.png') center right no-repeat;
background-size: 11px 11px;
background-image: url('./blue-arrow.svg');
width: 26px;
height: 22px;
background-repeat: no-repeat;
background-size: 10px;
background-position: center right;
}

.arrow-icon:hover {
background: url('./yellow-arrow.png') center right no-repeat;
background-size: 11px 11px;
background-image: url('./yellow-arrow.svg');
}

@media only screen and (max-width: 320px) {
@media only screen and (min-width: 768px) {
.arrow-icon {
width: 26px;
height: 22px;
background-size: 8px 8px;
}

.arrow-icon:hover {
width: 26px;
height: 22px;
background-size: 8px 8px;
width: 43px;
height: 19px;
background-size: 12px;
}
}

@media only screen and (min-width: 1280px) {
@media only screen and (min-width: 1024px) {
.arrow-icon {
width: 61px;
height: 39px;
background-size: 16px 16px;
height: 34px;
background-size: 14px;
}
}

.arrow-icon:hover {
width: 61px;
@media only screen and (min-width: 1280px) {
.arrow-icon {
height: 39px;
background-size: 16px 16px;
}
}

Binary file removed src/blocks/arrow-icon/blue-arrow.png
View file
Open in desktop
Binary file not shown.
3 changes: 3 additions & 0 deletions src/blocks/arrow-icon/blue-arrow.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed src/blocks/arrow-icon/yellow-arrow.png
View file
Open in desktop
Binary file not shown.
3 changes: 3 additions & 0 deletions src/blocks/arrow-icon/yellow-arrow.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/blocks/hello-there/hello-there.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

@media (min-width: 1024px) {
.hello-there {
padding: 84px 40px;
padding: 84px 40px 0;
column-gap: 40px;
grid-template-rows: auto 257px auto;
}
Expand Down
30 changes: 12 additions & 18 deletions src/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,34 +238,28 @@ <h2 class="content-title">we know a lot</h2>
<li class="additional-info__list-item">
<a
class="link additional-info__link"
href="https://nrccfi.camden.rutgers.edu/files/nrccfi-fact-sheet-2014.pdf?fbclid=IwAR3CXF7swyM7VQjr7qcnMJ59I0BKTyapSVuHJ5GH9KYWxYv63t4fnZhgYsk"
target="_blank"
>
Children and Families of The Incarcerated Fact Sheet,
<cite>NCJRS, 2017</cite>
</a>
<a
class="link additional-info__link"
href="https://nrccfi.camden.rutgers.edu/files/nrccfi-fact-sheet-2014.pdf?fbclid=IwAR3CXF7swyM7VQjr7qcnMJ59I0BKTyapSVuHJ5GH9KYWxYv63t4fnZhgYsk"
href="https://www.ncjrs.gov/pdffiles1/nij/250349.pdf?fbclid=IwAR2nscfCxNjtE6amLFRblq2Zum1RtGViz1pVVUt-MsrcI616YmxOWxz1ILw"
target="_blank"
>
<p class="additional-info__link-text">
Children and Families of The Incarcerated Fact Sheet,<cite
>NCJRS, 2017</cite
>
</p>
<div class="arrow-icon"></div>
</a>
</li>
<li class="additional-info__list-item">
<a
class="link additional-info__link"
href="https://www.ncjrs.gov/pdffiles1/nij/250349.pdf?fbclid=IwAR2nscfCxNjtE6amLFRblq2Zum1RtGViz1pVVUt-MsrcI616YmxOWxz1ILw"
target="_blank"
>
The Impact of Incarceration on Dependent Children,
<cite>NRCCFI, 2014</cite></a
>
<a
class="link additional-info__link"
href="https://www.ncjrs.gov/pdffiles1/nij/250349.pdf?fbclid=IwAR2nscfCxNjtE6amLFRblq2Zum1RtGViz1pVVUt-MsrcI616YmxOWxz1ILw"
href="https://nrccfi.camden.rutgers.edu/files/nrccfi-fact-sheet-2014.pdf?fbclid=IwAR3CXF7swyM7VQjr7qcnMJ59I0BKTyapSVuHJ5GH9KYWxYv63t4fnZhgYsk"
target="_blank"
>
<p class="additional-info__link-text">
The Impact of Incarceration on Dependent Children,<cite
>NRCCFI, 2014</cite
>
</p>
<div class="arrow-icon"></div>
</a>
</li>
Expand Down