Skip to content

Commit

Permalink
Merge pull request #75 from JincorTech/feature/issue-71
Browse files Browse the repository at this point in the history
Fix alt dash lil screens bug
  • Loading branch information
01dr authored Nov 20, 2017
2 parents f9adce9 + ebd2a3a commit c756d54
Show file tree
Hide file tree
Showing 4 changed files with 46 additions and 0 deletions.
13 changes: 13 additions & 0 deletions src/assets/images/icons/faq.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions src/components/app/Topbar/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ import Pagename from '../Pagename';
const Topbar = ({ pathname, openSidebar }) => (
<div className={s.topbar}>
<div className={s.title}><Pagename pathname={pathname}/></div>
<div className={s.faq}>
<a href="https://s3.eu-west-2.amazonaws.com/jincor-ico/docs/jincor_contributor_account_faq.pdf" target="_blank">
<img src={require('../../../assets/images/icons/faq.svg')}/> FAQ
</a>
</div>
<div className={s.button}>
<button onClick={() => openSidebar()}>
<img src={require('../../../assets/images/icons/burger.svg')}/>
Expand Down
24 changes: 24 additions & 0 deletions src/components/app/Topbar/styles.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
.topbar {
position: relative;
display: block;
padding: 40px 0 30px;
border-bottom: 1px solid #e6e8eb;
Expand All @@ -19,6 +20,29 @@
}
}

.faq {
position: absolute;
bottom: 30px;
right: 0;

& img {
display: inline-block;
vertical-align: middle;
margin-right: 7px;
}

& a {
display: inline-block;
vertical-align: middle;
font: normal 18px Roboto;
color: #6e7987;
}

@media only screen and (max-width: 480px) {
display: none;
}
}

.button {
display: none;

Expand Down
4 changes: 4 additions & 0 deletions src/containers/dashboard/AlternativeDasboard/styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@
color: #6e7987;
margin-top: 15px;

@media only screen and (max-width: 1366px) {
width: 90%;
}

@media only screen and (max-width: 480px) {
width: 100%;
}
Expand Down

0 comments on commit c756d54

Please sign in to comment.