Skip to content

Commit c83f02c

Browse files
Maksim Kostromindaggerok
Maksim Kostromin
authored andcommitted
BEMdraft.
1 parent 90638cc commit c83f02c

File tree

6 files changed

+65
-22
lines changed

6 files changed

+65
-22
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
if: branch = "master" AND type NOT IN (pull_request)
4141
before_deploy:
4242
- cd $TRAVIS_BUILD_DIR && npm i
43-
- cd $TRAVIS_BUILD_DIR && npm run gh
43+
- cd $TRAVIS_BUILD_DIR && npm run predeploy
4444
env:
4545
secure: "if+OearRkg7JuP7WhYhfQloxRDKmz9FTiqjnA4Ex7G0ODHFL3RkxZNJUwSsE2q7D8bjk00iTXaFHMmn2/o80Pb54aj2uAGfHQzKqQ/q9RMmOKptW3Q11uSKyJCNTcVBxnDxgI5xDIpXXICngQxORqmaS1Lx/YGZKJvcie6aMwDLZtJ0E0yzgtcko1OdQnEYTz23BqWlgKAv8++oMSNiQye+wrDQ2IfEdVegRrQQXqp2XZS7WS3q5JDrWsluGHQ5ms3YnTMekpGG8yVXIhbXu5xST25oT9iXnVi57BemaUYDJb7KAWubB+CxjF4VGXrNty5SmyJXwBVCvpHAGj8/9WOpM90Bfw49CQfzCMo988o1/LWwrWrKvU7KnsAoIFzK3f2P7I2v9gN9OX55QKcSPSkgHeYIQVVk4v6KHRKy2fUMCcl0lF5Ya37sa5Og9pcaJ+vciNJqhYfjSxetEBuBdAdRAfGRB2qyYkVZ810ZX2zEZoDgkspWTK5HRlEVcn4tUca1gGCFPcPoHrl+KBu/TIz/ni+9V9l0p7eeFjzKCRZppLEHG8dSQJ8FrI2Jj3FURi9LRaI0za3EG9rgV9hWkIbqd/kXaxPn+AgIA9UALpYjaqPyH8rO+37a1vBerLWwZhnyBYPEHWowMiQdQky1G0DP7c/IxoTyWPt/m2pghQJ4="
4646
deploy:
@@ -50,7 +50,7 @@ jobs:
5050
keep-history: true
5151
on:
5252
branch: master
53-
local-dir: $TRAVIS_BUILD_DIR
53+
local-dir: $TRAVIS_BUILD_DIR/dist
5454
target_branch: gh-pages
5555
cache:
5656
npm: true

2020-01-grid-areas-numbers/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
<meta name="viewport"
66
content="width=device-width, initial-scale=1.0">
77
<meta http-equiv="X-UA-Compatible" content="ie=edge">
8-
<title>2020 Grid Areas</title>
98
<link rel="shortcut icon" href="../favicon.ico" type="image/x-icon">
109
<link rel="stylesheet" href="./main.css">
10+
<title>2020 Grid Areas</title>
1111
</head>
1212
<body>
1313
<div class="container">

2020-02-bem/index.html

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
<!doctype html>
2+
<html lang="en">
3+
<head>
4+
<meta charset="UTF-8">
5+
<meta name="viewport"
6+
content="width=device-width, initial-scale=1.0">
7+
<meta http-equiv="X-UA-Compatible" content="ie=edge">
8+
<link rel="shortcut icon" href="../favicon.ico" type="image/x-icon">
9+
<title>BEM</title>
10+
</head>
11+
<body>
12+
<div class="card">
13+
<span class="card__picture"></span>
14+
<div class="card__content">
15+
<ul class="card__list">
16+
<li class="card__item card__item--active">Figma</li>
17+
<li class="card__item">Adobe XD</li>
18+
<li class="card__item">Sketch</li>
19+
</ul>
20+
<p class="card__description">
21+
Lorem ipsum dolor sit amet, consectetur adipisicing elit. Accusamus animi aperiam delectus dicta dolore
22+
error, est maiores molestias neque perferendis, perspiciatis porro quos recusandae tempore ullam unde
23+
veritatis voluptas voluptates?
24+
</p>
25+
<a class="card__action" href="#">Visit our Site</a>
26+
</div>
27+
</div>
28+
</body>
29+
</html>

2020-02-bem/main.css

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
html,
2+
body {
3+
margin: 0;
4+
height: 100vh;
5+
}
6+
7+
body {
8+
display: grid;
9+
place-content: center;
10+
height: 100vh;
11+
font-family: 'Nunito', "Nirmala UI", Consolas, "Courier New", sans-serif, Arial;
12+
}

index.html

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,17 @@
1313
<body class="container">
1414
<p>css grid examples:</p>
1515
<ul>
16-
<li><a href="./add-grid/">add grid</a></li>
17-
<li><a href="./grid-template-columns/">grid-template-columns usage</a></li>
18-
<li><a href="./grid-gap/">grid-gap usage</a></li>
19-
<li><a href="./grid-template-columns-fractions/">grid-template-columns fractions usage</a></li>
20-
<li><a href="./grid-template-columns-minmax/">grid-template-columns minmax together with fractions usage</a></li>
21-
<li><a href="./grid-template-columns-auto/">grid-template-columns auto usage</a></li>
22-
<li><a href="./grid-template-areas/">easy core site elements positioning with grid-template-areas</a></li>
23-
<li><a href="./grid-column/">alternative way to grid-template-areas by using grid-column</a></li>
24-
<li><a href="./2020-01-grid-areas-numbers/">2020-01: grid numbers</a></li>
25-
<li><a href="./2020-01-grid-areas-names/">2020-01: grid names</a></li>
16+
<li><a href="./add-grid/index.html">add grid</a></li>
17+
<li><a href="./grid-template-columns/index.html">grid-template-columns usage</a></li>
18+
<li><a href="./grid-gap/index.html">grid-gap usage</a></li>
19+
<li><a href="./grid-template-columns-fractions/index.html">grid-template-columns fractions usage</a></li>
20+
<li><a href="./grid-template-columns-minmax/index.html">grid-template-columns minmax together with fractions usage</a></li>
21+
<li><a href="./grid-template-columns-auto/index.html">grid-template-columns auto usage</a></li>
22+
<li><a href="./grid-template-areas/index.html">easy core site elements positioning with grid-template-areas</a></li>
23+
<li><a href="./grid-column/index.html">alternative way to grid-template-areas by using grid-column</a></li>
24+
<li><a href="./2020-01-grid-areas-numbers/index.html">2020-01: grid numbers</a></li>
25+
<li><a href="./2020-01-grid-areas-names/index.html">2020-01: grid names</a></li>
26+
<li><a href="./2020-02-bem/index.html">2020-01: BEM (block element modifier)</a></li>
2627
</ul>
2728
</body>
2829
</html>

package.json

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,29 +3,30 @@
33
"version": "1.0.1",
44
"description": "CSS Grid playground",
55
"main": "index.js",
6-
"dependencies": {},
76
"devDependencies": {
87
"forever": "2.0.0",
9-
"livereload": "0.8.2",
108
"ncp": "2.0.0",
119
"npm-run-all": "4.1.5",
10+
"parcel-bundler": "1.12.4",
1211
"serve": "11.3.0"
1312
},
1413
"scripts": {
15-
"gh": "ncp index.html 404.html",
16-
"start": "npm-run-all -p serve livereload",
17-
"livereload": "livereload .",
18-
"serve": "serve .",
19-
"forever": "forever start ./node_modules/.bin/serve .",
14+
"predeploy": "npm-run-all predeploy:*",
15+
"predeploy:build": "npm run build -- --public-url='/css-grid/'",
16+
"predeploy:gh": "ncp dist/index.html dist/404.html",
17+
"predeploy:nojekyll": "ncp dist/index.html dist/.nojekyll",
18+
"start": "parcel serve -p 5000 --no-cache index.html",
19+
"build": "parcel build --no-cache index.html",
20+
"serve": "serve dist",
21+
"forever": "forever start ./node_modules/.bin/serve dist",
2022
"logs": "forever -f logs 0",
2123
"stop": "forever stopall --killTree"
2224
},
2325
"keywords": [
2426
"css",
2527
"grid",
2628
"serve",
27-
"npm-run-all",
28-
"livereload"
29+
"npm-run-all"
2930
],
3031
"author": "Maksim Kostromin aka daggerok",
3132
"license": "MIT"

0 commit comments

Comments
 (0)