Skip to content

Commit

Permalink
basic configuration
Browse files Browse the repository at this point in the history
  • Loading branch information
masaka222 committed Sep 6, 2018
1 parent 3e8ce25 commit f8fee32
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 29 deletions.
5 changes: 3 additions & 2 deletions public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
-->
<link rel="manifest" href="%PUBLIC_URL%/manifest.json">
<link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico">
<link href="https://fonts.googleapis.com/css?family=Josefin+Sans:300,400,400i|Nunito:300,300i" rel="stylesheet">
<!--
Notice the use of %PUBLIC_URL% in the tags above.
It will be replaced with the URL of the `public` folder during the build.
Expand All @@ -19,9 +20,9 @@
work correctly both with client-side routing and a non-root public URL.
Learn how to configure a non-root public URL by running `npm run build`.
-->
<title>React App</title>
<title>nexter &mdash; your home, your freedom</title>
</head>
<body>
<body class="container">
<noscript>
You need to enable JavaScript to run this app.
</noscript>
Expand Down
48 changes: 28 additions & 20 deletions src/App.css
Original file line number Diff line number Diff line change
@@ -1,28 +1,36 @@
.App {
text-align: center;
}
:root{
--color-primary: #c69963;
--color-primary-dark: #B28451;

.App-logo {
animation: App-logo-spin infinite 20s linear;
height: 80px;
}
--color-secondary: #101d2c;

.App-header {
background-color: #222;
height: 150px;
padding: 20px;
color: white;
}
--color-grey-light-1: #f9f7f6;
--color-grey-light-2: #aaa;

--color-grey-dark-1: #54483A;
--color-grey-dark-2: #6D5D4B;

--font-primary: 'Nunito', sans-serif;
--font-secondary: 'Josefin Sans', sans-serif;

--shadow-dark: 0 2rem 6rem rgba(0, 0, 0, .3);

.App-title {
font-size: 1.5em;
}

.App-intro {
font-size: large;
* {
margin: 0;
padding: 0;
box-sizing: inherit;
}

@keyframes App-logo-spin {
from { transform: rotate(0deg); }
to { transform: rotate(360deg); }
html{
box-sizing: border-box;
font-size: 62.5%; /* So that 1rem = 10px (10px/16px (browsers default) = 62.5% -> 1rem = 10px */
}

body{
font-family: var(--font-primary);
font-weight: 300;
color: var(--color-grey-dark-2);

}
8 changes: 1 addition & 7 deletions src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,7 @@ class App extends Component {
render() {
return (
<div className="App">
<header className="App-header">
<img src={logo} className="App-logo" alt="logo" />
<h1 className="App-title">Welcome to React</h1>
</header>
<p className="App-intro">
To get started, edit <code>src/App.js</code> and save to reload.
</p>

</div>
);
}
Expand Down

0 comments on commit f8fee32

Please sign in to comment.