Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
d087227
landing redesign wip
brigittaforrai May 7, 2019
aa69914
convertible comp, styles
brigittaforrai May 7, 2019
8093250
homepage content + styles
brigittaforrai May 13, 2019
3e40c1d
mobile styles
brigittaforrai May 14, 2019
8db3dbf
footer
brigittaforrai May 14, 2019
7b88d7a
styles
brigittaforrai May 15, 2019
8209e6e
btns, features section
brigittaforrai May 15, 2019
ce135ba
styles
brigittaforrai May 15, 2019
d8d86c6
Merge branch 'staging' into landingRedesign
brigittaforrai May 16, 2019
68bed16
ghost btns
brigittaforrai May 17, 2019
e39ca10
styles import order
brigittaforrai May 17, 2019
e6ae882
remove header comp from landing page
brigittaforrai May 17, 2019
012daa3
orange ghost
brigittaforrai May 17, 2019
7bce48d
landing grid and styles
brigittaforrai May 17, 2019
999f77f
breaks, ghost btn style
brigittaforrai May 20, 2019
4b93ae2
new logo
brigittaforrai May 20, 2019
3288085
augmint logo srcset + styles
brigittaforrai May 20, 2019
098f97c
lock text
brigittaforrai May 20, 2019
c9b59fb
fix mobile sizes
brigittaforrai May 20, 2019
99fec1f
mobile and tablet styles
brigittaforrai May 20, 2019
93dc5ff
mobile + tablet styles
brigittaforrai May 20, 2019
a4f58f6
Merge branch 'staging' into landingRedesign
brigittaforrai May 20, 2019
f9ea316
iphone plus sizes fix
brigittaforrai May 20, 2019
d28ee63
update landing text
phraktle May 20, 2019
03741a5
footer
brigittaforrai May 20, 2019
57c5307
breaks
brigittaforrai May 20, 2019
92bd849
show connection guide if no web3connect
brigittaforrai May 21, 2019
80bf18e
concept link, delete not used
brigittaforrai May 21, 2019
13f767d
clean up helper.js
brigittaforrai May 22, 2019
52cd5d8
remove video
brigittaforrai May 22, 2019
35f6035
remove unused var
brigittaforrai May 22, 2019
79fa90e
Update HowToConnect.js
phraktle May 22, 2019
db2c273
Merge branch 'staging' into landingRedesign
phraktle May 22, 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
4 changes: 4 additions & 0 deletions src/assets/images/list-arrow.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 14 additions & 2 deletions src/components/augmint-ui/button/styles.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ export const BaseButton = styledComponent => styledComponent`
background-color: ${theme.colors.secondary};

&.fullwidth {
width: 100%;
width: 100%;
height: 50px;
}

Expand All @@ -66,7 +66,7 @@ export const BaseButton = styledComponent => styledComponent`
text-transform: none;
background-color: ${theme.colors.primary};
color: ${theme.colors.white};

${media.tabletMin`
padding: 20px 30px;
font-size: ${remCalc(16)};
Expand Down Expand Up @@ -105,13 +105,25 @@ export const BaseButton = styledComponent => styledComponent`
border: 1px solid ${theme.colors.primary};
color: ${theme.colors.primary};

&.orange {
color: ${theme.colors.secondary};
background: none;
border: 1px solid ${theme.colors.secondary};
}

&:hover,
&:focus {
background: transparent;
background-color: ${theme.colors.primary};
color: ${theme.colors.white};
box-shadow: none;
}

&.orange:hover, &.orange:focus {
border: 1px solid ${theme.colors.secondaryDark};
background-color: transparent;
color: ${theme.colors.secondaryDark};
}
}

&.naked {
Expand Down
15 changes: 0 additions & 15 deletions src/components/navigation/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,13 @@ import {
StyleNavLink,
StyleNavItem,
StyleNavList,
StyledLogoContainer,
StyledNavContainer,
StyledNavLeftSide,
StyledNavRightSide,
StyledLogo,
HamburgerMenu
} from "./styles";

import { AugmintIcon } from "components/Icons";

import augmintLogo from "assets/images/logo/logo.png";
import augmintLogo2x from "assets/images/logo/logo@2x.png";
import augmintLogo3x from "assets/images/logo/logo@3x.png";
import hamburgerMenu from "assets/images/menu.svg";
import close from "assets/images/close.svg";
import { toggleScroll } from "utils/bodyHelper";
Expand Down Expand Up @@ -120,15 +114,6 @@ export default class SiteMenu extends React.Component {

{showConnection && !isConnected && <div>Not connected</div>}
</StyledNavContainer>
<StyledLogoContainer>
{!showConnection && (
<StyledLogo
src={augmintLogo}
srcSet={`${augmintLogo2x} 2x, ${augmintLogo3x} 3x,`}
alt="Augmint logo"
/>
)}
</StyledLogoContainer>
</div>
);
}
Expand Down
4 changes: 4 additions & 0 deletions src/components/navigation/styles.js
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,9 @@ export const StyledLogoContainer = styled.div`
display: flex;
justify-content: center;
min-height: 80px;
${breakpoint`
max-height: 200px;
`};
`;

export const StyledNavLeftSide = styled.div`
Expand Down Expand Up @@ -97,6 +100,7 @@ export const StyledNavRightSide = styled.div`

export const StyledLogo = styled.img`
margin-top: 80px;
object-fit: contain;
`;

export const HamburgerMenu = styled.img`
Expand Down
6 changes: 3 additions & 3 deletions src/containers/app/AppFooter.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export function AppFooter(props) {
<p className="description">{description}</p>
<Segment className="chat-container">
<a
className="join-discord"
className="join-discord join"
href="https://discord.gg/PwDmsnu"
rel="noopener noreferrer"
target="_blank"
Expand All @@ -45,7 +45,7 @@ export function AppFooter(props) {
Talk to us on Discord
</a>
<a
className="join-telegram"
className="join-telegram join"
href="https://t.me/augmint"
rel="noopener noreferrer"
target="_blank"
Expand All @@ -56,7 +56,7 @@ export function AppFooter(props) {
</a>
</Segment>

<List className="contact-list" style={{ marginTop: 40 }}>
<List className="contact-list">
<List.Item>
<Icon name="github" style={{ marginRight: 5 }} />
<a href="https://github.com/Augmint" target="_blank" rel="noopener noreferrer">
Expand Down
19 changes: 3 additions & 16 deletions src/containers/app/EthereumState.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,13 @@ import React from "react";
import { connect } from "react-redux";
import Container from "components/augmint-ui/container";
import { StyledP } from "components/augmint-ui/paragraph/styles";
import Header from "components/augmint-ui/header";
import { Link } from "react-router-dom";
import { ErrorDetails, ErrorPanel, WarningPanel, LoadingPanel } from "components/MsgPanels";
import { Tsegment } from "components/TextContent";
import { DiscordButton } from "components/LinkButtons";

import { HowToConnect } from "containers/home/tryIt/HowToConnect.js";

export class EthereumState extends React.Component {
render() {
let msg = null;
Expand All @@ -26,21 +27,7 @@ export class EthereumState extends React.Component {
if (isConnecting) {
msg = <LoadingPanel header="Connecting to Ethereum network..." />;
} else if (!web3Connect.isConnected && !web3Connect.isLoading) {
msg = (
<WarningPanel header="Can't connect Ethereum network">
<Header as="h4" className={_className}>
See our{" "}
<strong>
<Link to="/tryit">Connection Guide</Link>
</strong>{" "}
on how to connect to Ethereum.
</Header>

{web3Connect.error && (
<ErrorDetails header="Web3 connection error details:" details={web3Connect.error} />
)}
</WarningPanel>
);
msg = <HowToConnect />;
} else if (
web3Connect.isConnected &&
!contracts.isLoaded &&
Expand Down
32 changes: 31 additions & 1 deletion src/containers/app/custom_footer_style.css
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
padding: 0;
position: absolute;
width: 100%;
margin-left: 0;
margin-right: 0;
}

.Site-footer .footer > div {
Expand Down Expand Up @@ -162,17 +164,45 @@
font-weight: 400;
}

.Site-footer .footer .contact-list {
margin-top: 40px;
}

@media (max-width: 1200px) {
.Site-footer .footer > div {
margin-top: 200px;
}
}

@media (max-width: 768px) {
.Site-footer .footer .contact-list {
flex-direction: column;
}
.Site-footer .footer .description {
padding: 0 20px;
}
.Site-footer .footer .contact-list {
margin-top: 30px;
}
.Site-footer .footer .contact-list.list > .item {
margin: 0;
}
.Site-footer .footer > div {
margin-top: 150px;
margin-top: 200px;
}
.Site-footer .footer .subscribe {
margin-top: 20px;
}
.Site-footer .footer .chat-container a.join {
margin: 5px;
justify-content: center;
}
.Site-footer .footer .chat-container .join img {
margin-right: 10px;
max-width: 30px;
}
.Site-footer .footer .chat-container {
justify-content: center;
padding: 0 20px;
}
}
1 change: 1 addition & 0 deletions src/containers/app/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,7 @@ class App extends React.Component {
/>
{!showConnection && (
<SiteMenu
className="site-menu"
web3Connect={this.props.web3Connect}
location={this.props.location}
showMenu={this.state.showMobileMenu}
Expand Down
10 changes: 9 additions & 1 deletion src/containers/app/subscribeStyles.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,17 @@ import { remCalc } from "styles/theme";

export const StyledField = styled(Field)`
color: ${theme.colors.opacLightGrey};
font-size: ${remCalc(12)} !important;
font-size: ${remCalc(16)} !important;
font-weight: 200 !important;
letter-spacing: 2.4px;
line-height: ${remCalc(21)};
min-width: 246px;
height: 50px;
max-width: 400px;
margin: 0 auto;
::placeholder {
color: gray !important;
font-size: ${remCalc(16)} !important;
font-weight: 200 !important;
}
`;
Loading