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.

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

Develop #3399

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Develop #3399

Show file tree
Hide file tree
Changes from all commits
Commits
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: 3 additions & 1 deletion .stylelintrc.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
module.exports = {
extends: "@mate-academy/stylelint-config",
rules: {}
rules: {
"scss/comment-no-empty": null
}
};
7,042 changes: 3,395 additions & 3,647 deletions package-lock.json

Large diffs are not rendered by default.

50 changes: 30 additions & 20 deletions src/App.css
Original file line number Diff line number Diff line change
@@ -1,29 +1,36 @@
iframe {
display: none;
}

* {
box-sizing: border-box;
}

html {
font-size: 10pt;
font-size: 10pt;
line-height: 1.4;
line-height: 1.4;
font-weight: 400;
font-weight: 400;
font-family: "Source Sans Pro", "Open Sans", Roboto, Arial, sans-serif;
font-family: 'Source Sans Pro', 'Open Sans', Roboto, Arial, sans-serif;
}




body {
margin: 0;
background: #eee;
body {
margin: 0;
margin: 0;
background: #eee;
background: #eee;
}
}

.welcome {
height: 100vh;
background: coral;

.welcome { /*@media (min-width: 500px) {*/
height: 100vh; /* .header {*/
background: coral; /* text-align: left;*/
}

.welcome__text {
/* display: flex;*/

/* justify-content: space-between;*/
.welcome__text { /* }*/
margin: 0;
font-size: 400%;
text-align: center;
Expand All @@ -45,11 +52,12 @@ body {
text-align: center;
}

.header__title {
font-weight: 600;
display: inline;
margin: 0;
padding: 0;

.header__title { /* .article {*/
font-weight: 600; /* margin: 3.5em auto 0;*/
display: inline; /* padding: 2em;*/
margin: 0; /* }*/
padding: 0; /*}*/
font-size: inherit;
}

Expand All @@ -68,7 +76,8 @@ body {
opacity: 1;
}

.article {

.article { /*}*/
margin: 5em auto 0;
padding: 1em;
font-size: 140%;
Expand Down Expand Up @@ -104,3 +113,4 @@ body {
margin: 3.5em auto;
}
}

83 changes: 6 additions & 77 deletions src/App.jsx
Original file line number Diff line number Diff line change
@@ -1,86 +1,15 @@
import React from 'react';
import './App.css';
// Move each BEM block to a separate component (file) and import them here
import Header from './components/Header/Header';
import Welcome from './components/Welcome/Welcome';
import Article from './components/Article/Article';

function App() {
return (
<main className="app">
<section className="welcome">
<span className="welcome__text">Sticky Header!</span>
</section>
<header className="header">
<h1 className="header__title">Site Name</h1>
<nav className="navigation">
<a className="navigation__link" href="#about">
About
</a>
<a className="navigation__link" href="#services">
Services
</a>
<a className="navigation__link" href="#contact">
Contact
</a>
</nav>
</header>
<article className="article">
<h1 className="article__title">Headline</h1>
<p className="article__paragraph">
In elementum lorem eget est euismod ornare. Phasellus sit amet
pellentesque mauris. Aliquam quis malesuada ex. Nullam eu aliquam
nibh. Mauris molestie, urna accumsan ornare semper, augue nibh posuere
lorem, vitae feugiat sem magna eget massa. Vivamus quis tincidunt
dolor. Fusce efficitur, orci non vestibulum consequat, lectus turpis
bibendum odio, in efficitur leo felis sed justo. Fusce commodo iaculis
orci, quis imperdiet urna. Sed mollis facilisis lacus non condimentum.
Nunc efficitur massa non neque elementum semper. Vestibulum lorem
arcu, tincidunt in quam et, feugiat venenatis augue. Donec sed
tincidunt tellus, a facilisis magna. Proin sit amet viverra nibh,
bibendum gravida felis. Vivamus ut nunc id mauris posuere
pellentesque. Praesent tincidunt id odio id feugiat.
</p>
<p className="article__paragraph">
In ac nisi lacus. Fusce est dolor, tincidunt ut bibendum vitae,
fermentum ac quam. Aliquam pretium tristique nibh quis iaculis. In et
cursus ex, eu aliquet ex. Proin facilisis lacus sit amet sapien
ultrices, ut vehicula arcu lobortis. Vivamus mollis ipsum ut hendrerit
molestie. Morbi lacinia, sapien eu dictum dignissim, tellus tortor
congue magna, sit amet bibendum libero nisi id massa.
</p>
<p className="article__paragraph">
Donec arcu elit, euismod vel lobortis eu, fringilla sit amet dolor.
Cras congue, massa nec sagittis mollis, dui felis ultrices magna,
tincidunt finibus lorem quam in sem. Morbi odio turpis, pulvinar sit
amet vulputate quis, ultricies eu libero. Donec ac maximus neque, nec
maximus nibh. Morbi rhoncus convallis urna, accumsan porta lorem
hendrerit in. Cras eget nisl dui. Morbi faucibus nisi eget ipsum
semper vulputate. Mauris nec tincidunt lectus. Aenean ac mi consequat
velit dignissim consectetur. Fusce placerat ac ipsum ac eleifend.
Aenean quis faucibus ex.
</p>
<p className="article__paragraph">
Cras egestas tempor nibh, a fermentum lorem sollicitudin non. Nulla
facilisi. In at elit id leo tristique condimentum. Donec at est nulla.
Mauris egestas magna ut laoreet pretium. Sed ultrices suscipit
vestibulum. Lorem ipsum dolor sit amet, consectetur adipiscing elit.
Fusce id sapien eros. Vivamus viverra ultricies gravida. Nam urna
nibh, blandit a vulputate at, vehicula non nulla. Aenean ut nulla leo.
Praesent in ullamcorper est.
</p>
<p className="article__paragraph">
Pellentesque habitant morbi tristique senectus et netus et malesuada
fames ac turpis egestas. Phasellus bibendum nec arcu eu lobortis. Nam
convallis faucibus ante sed porta. Nullam ut convallis elit, quis
venenatis nunc. Curabitur sed sem eget velit condimentum rutrum in et
orci. Nunc non suscipit eros. Suspendisse porta sem vel justo commodo
dictum. Aliquam erat ligula, fringilla nec suscipit sed, porta vitae
turpis. Vestibulum rhoncus placerat nulla vitae suscipit. Curabitur
consectetur ex ut odio tristique vehicula. Ut ligula tortor, tincidunt
quis sodales vitae, ornare a turpis. Proin sit amet finibus enim.
Fusce tempus a neque vitae tempor. Aenean rutrum, libero iaculis
interdum vulputate, dui eros vehicula nisi, at interdum enim lacus eu
diam.
</p>
</article>
<Header />
<Welcome />
<Article />
</main>
);
}
Expand Down
30 changes: 29 additions & 1 deletion src/components/Article/Article.css
Original file line number Diff line number Diff line change
@@ -1 +1,29 @@
/* Put article styles here */
.article {
margin: 5em auto 0;
padding: 1em;
font-size: 140%;
max-width: 800px;
background: white;
box-shadow: rgba(0, 0, 0, 0.05) 0 3px 15px;
}

.article__paragraph {
margin: 0;
color: #333;
}

.article__paragraph:not(:first-child) {
margin-top: 0.7em;
}

@media (min-width: 500px) {
.article {
margin: 3.5em auto 0;
padding: 2em;
}
}
@media (min-width: 800px) {
.article {
margin: 3.5em auto;
}
}
64 changes: 61 additions & 3 deletions src/components/Article/Article.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,63 @@
// import a css file containig article styles
import './Article.css';
import React from 'react';

// Create an Article function returning the HTML of article block
const Article = () => (
<article className="article">
<h1 className="article__title">Headline</h1>
<p className="article__paragraph">
In elementum lorem eget est euismod ornare. Phasellus sit amet
pellentesque mauris. Aliquam quis malesuada ex. Nullam eu aliquam nibh.
Mauris molestie, urna accumsan ornare semper, augue nibh posuere lorem,
vitae feugiat sem magna eget massa. Vivamus quis tincidunt dolor. Fusce
efficitur, orci non vestibulum consequat, lectus turpis bibendum odio, in
efficitur leo felis sed justo. Fusce commodo iaculis orci, quis imperdiet
urna. Sed mollis facilisis lacus non condimentum. Nunc efficitur massa non
neque elementum semper. Vestibulum lorem arcu, tincidunt in quam et,
feugiat venenatis augue. Donec sed tincidunt tellus, a facilisis magna.
Proin sit amet viverra nibh, bibendum gravida felis. Vivamus ut nunc id
mauris posuere pellentesque. Praesent tincidunt id odio id feugiat.
</p>
<p className="article__paragraph">
In ac nisi lacus. Fusce est dolor, tincidunt ut bibendum vitae, fermentum
ac quam. Aliquam pretium tristique nibh quis iaculis. In et cursus ex, eu
aliquet ex. Proin facilisis lacus sit amet sapien ultrices, ut vehicula
arcu lobortis. Vivamus mollis ipsum ut hendrerit molestie. Morbi lacinia,
sapien eu dictum dignissim, tellus tortor congue magna, sit amet bibendum
libero nisi id massa.
</p>
<p className="article__paragraph">
Donec arcu elit, euismod vel lobortis eu, fringilla sit amet dolor. Cras
congue, massa nec sagittis mollis, dui felis ultrices magna, tincidunt
finibus lorem quam in sem. Morbi odio turpis, pulvinar sit amet vulputate
quis, ultricies eu libero. Donec ac maximus neque, nec maximus nibh. Morbi
rhoncus convallis urna, accumsan porta lorem hendrerit in. Cras eget nisl
dui. Morbi faucibus nisi eget ipsum semper vulputate. Mauris nec tincidunt
lectus. Aenean ac mi consequat velit dignissim consectetur. Fusce placerat
ac ipsum ac eleifend. Aenean quis faucibus ex.
</p>
<p className="article__paragraph">
Cras egestas tempor nibh, a fermentum lorem sollicitudin non. Nulla
facilisi. In at elit id leo tristique condimentum. Donec at est nulla.
Mauris egestas magna ut laoreet pretium. Sed ultrices suscipit vestibulum.
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Fusce id sapien
eros. Vivamus viverra ultricies gravida. Nam urna nibh, blandit a
vulputate at, vehicula non nulla. Aenean ut nulla leo. Praesent in
ullamcorper est.
</p>
<p className="article__paragraph">
Pellentesque habitant morbi tristique senectus et netus et malesuada fames
ac turpis egestas. Phasellus bibendum nec arcu eu lobortis. Nam convallis
faucibus ante sed porta. Nullam ut convallis elit, quis venenatis nunc.
Curabitur sed sem eget velit condimentum rutrum in et orci. Nunc non
suscipit eros. Suspendisse porta sem vel justo commodo dictum. Aliquam
erat ligula, fringilla nec suscipit sed, porta vitae turpis. Vestibulum
rhoncus placerat nulla vitae suscipit. Curabitur consectetur ex ut odio
tristique vehicula. Ut ligula tortor, tincidunt quis sodales vitae, ornare
a turpis. Proin sit amet finibus enim. Fusce tempus a neque vitae tempor.
Aenean rutrum, libero iaculis interdum vulputate, dui eros vehicula nisi,
at interdum enim lacus eu diam.
</p>
</article>
);

// Add a default export statement for Article component to use it in the other files
export default Article;
28 changes: 27 additions & 1 deletion src/components/Header/Header.css
Original file line number Diff line number Diff line change
@@ -1 +1,27 @@
/* Put header styles here */
.header {
width: 100%;
padding: 1em;
font-size: 140%;
position: sticky;
top: 0;
left: 0;
right: 0;
transition: opacity 0.2s ease-in-out;
text-align: center;
}

.header__title {
font-weight: 600;
display: inline;
margin: 0;
padding: 0;
font-size: inherit;
}

@media (min-width: 500px) {
.header {
text-align: left;
display: flex;
justify-content: space-between;
}
}
13 changes: 10 additions & 3 deletions src/components/Header/Header.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
// import a css file containig header styles
import './Header.css';
import React from 'react';
import Navigation from '../Navigation/Navigation';

// Create a Header function returning the HTML of header block
const Header = () => (
<header className="header">
<h1 className="header__title">Site Name</h1>
<Navigation />
</header>
);

// Add a default export statement for Header component to use it in the other files
export default Header;
14 changes: 14 additions & 0 deletions src/components/Navigation/Navigation.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
.navigation__link {
display: inline-block;
outline: none;
text-decoration: none;
opacity: 0.7;
padding: 0 0.5em;
color: black;
transition: opacity 0.2s ease-in-out;
}

.navigation__link:hover,
.navigation__link:focus {
opacity: 1;
}
18 changes: 18 additions & 0 deletions src/components/Navigation/Navigation.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
import './Navigation.css';
import React from 'react';

const Navigation = () => (
<nav className="navigation">
<a className="navigation__link" href="#about">
About
</a>
<a className="navigation__link" href="#services">
Services
</a>
<a className="navigation__link" href="#contact">
Contact
</a>
</nav>
);

export default Navigation;
15 changes: 14 additions & 1 deletion src/components/Welcome/Welcome.css
Original file line number Diff line number Diff line change
@@ -1 +1,14 @@
/* Put welcome styles here */
.welcome {
height: 100vh;
background: coral;
}

.welcome__text {
margin: 0;
font-size: 400%;
text-align: center;
line-height: 1;
padding-top: calc(50vh - 20pt);
display: block;
font-weight: 700;
}
11 changes: 8 additions & 3 deletions src/components/Welcome/Welcome.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
// import a css file containig welcome styles
import './Welcome.css';
import React from 'react';

// Create a Welcome function returning the HTML of welcome block
const Welcome = () => (
<section className="welcome">
<span className="welcome__text">Sticky Header!</span>
</section>
);

// Add a default export statement for Welcome component to use it in the other files
export default Welcome;
Loading