Skip to content
This repository was archived by the owner on Feb 22, 2024. It is now read-only.

dev to beta #1400

Merged
merged 6 commits into from
Apr 4, 2019
Merged

dev to beta #1400

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
cb79177
syncing with dev
Apr 3, 2019
4264c4e
added underage restrictin sign to footer (only EU)
Apr 3, 2019
6f254e9
fixed footer EU/non-EU loading issue
Apr 3, 2019
5a36e0a
phone responsive
Apr 4, 2019
dd1d132
Merge branch 'dev' into underage
Apr 4, 2019
200a41d
Merge pull request #1390 from Khalidxx/underage
Apr 4, 2019
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
6 changes: 3 additions & 3 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion src/indexPage/react-components/footer.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const SocialIcons = ({ networks }) => (
const Footer = () => (
<div id="footer-container">
<div id='footer-regulatory' className='primary-bg-color-dark gr-padding-10"'>
<div className='container eu-hide'>
<div className='container eu-hide invisible'>
<div className='gr-row'>
<div className='gr-12'>
<div className='icon-row flex-row gr-child'>
Expand Down Expand Up @@ -79,6 +79,9 @@ const Footer = () => (
<img className='responsive' src={'image/footer/mga-logo-footer.svg'} />
</a>
</div>
<div className='age-restriction'>
<img className='responsive' src={'image/footer/18+.svg'} />
</div>
</div>
<SocialIcons
networks={[
Expand Down
27 changes: 26 additions & 1 deletion static/css/_footer.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
text-decoration: underline;
}
#footer-regulatory {
padding-bottom: 30px;
padding-bottom: 0px;

a, p, .fld-risk-warning legend {
font-size: 13px !important;
Expand All @@ -40,6 +40,7 @@
margin: 0 0 10px;
}
.fld-risk-warning {
margin-bottom: 30px;
border-color: $COLOR_DARK_GRAY;

legend {
Expand All @@ -57,6 +58,7 @@
}
}
.risk-warning {
margin-bottom: 30px;
p {
font-size: 16px;
}
Expand Down Expand Up @@ -96,6 +98,9 @@
align-items: flex-start;
flex-direction: column-reverse;
}
.age-restriction {
width: 50px;
}
.social-icons {
margin-left: auto;

Expand Down Expand Up @@ -180,4 +185,24 @@
margin-left: 0;
}
}
@media screen and (max-width: 400px) {
.regulation-logos {


.vanuatu-icon {
width: 120px;
margin-left: -30px;
margin-right: 0;
}
.bvi-icon {
width: 100px;
margin-left: -30px;
margin-right: 0;
}
.labuan-icon {
width: 110px;
margin: 0px;
}
}
}
}
1 change: 1 addition & 0 deletions static/image/footer/18+.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 templates/index.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<div class="half-width bottom-image">
<img src="image/binarylogo-puzzle.svg" alt="">
</div>
</div>
</div>
<div class="clear">
<p class="cta"><a class="button" href="bot.html"><span data-i18n-text="Begin Building a Bot Now"></span></a></p>
<p class="center"><span data-i18n-text="Need further assistance?"></span> <a href="mailto:affiliates@binary.com" data-i18n-text="Contact us"></a>.</p>
Expand Down