Skip to content

Commit 1eab640

Browse files
author
Maksim Kostromin
committed
oO
1 parent c83f02c commit 1eab640

File tree

21 files changed

+78
-16
lines changed

21 files changed

+78
-16
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
*.ipr
77
*.iws
88
*.log*
9+
.cache/
910
node_modules/
1011
package-lock.json
1112
target/

‎.nojekyll

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ jobs:
2828
name: test
2929
before_script:
3030
- cd $TRAVIS_BUILD_DIR && npm i -E
31+
- cd $TRAVIS_BUILD_DIR && npm run build
3132
- cd $TRAVIS_BUILD_DIR && npm run forever
3233
- cd $TRAVIS_BUILD_DIR && npm run logs &
3334
- wait_for 5000

‎2020-02-bem/main.css

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
"scripts": {
1414
"predeploy": "npm-run-all predeploy:*",
1515
"predeploy:build": "npm run build -- --public-url='/css-grid/'",
16-
"predeploy:gh": "ncp dist/index.html dist/404.html",
16+
"predeploy:404": "ncp dist/index.html dist/404.html",
1717
"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",
18+
"start": "parcel --no-cache -p 5000 src/index.html",
19+
"build": "parcel build --no-cache src/index.html",
2020
"serve": "serve dist",
2121
"forever": "forever start ./node_modules/.bin/serve dist",
2222
"logs": "forever -f logs 0",

‎2020-01-grid-areas-names/index.html renamed to ‎src/2020-01-grid-areas-names/index.html

File renamed without changes.

‎2020-01-grid-areas-names/main.css renamed to ‎src/2020-01-grid-areas-names/main.css

File renamed without changes.

‎2020-01-grid-areas-numbers/index.html renamed to ‎src/2020-01-grid-areas-numbers/index.html

File renamed without changes.

‎2020-01-grid-areas-numbers/main.css renamed to ‎src/2020-01-grid-areas-numbers/main.css

File renamed without changes.

‎2020-02-bem/index.html renamed to ‎src/2020-02-bem/index.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
content="width=device-width, initial-scale=1.0">
77
<meta http-equiv="X-UA-Compatible" content="ie=edge">
88
<link rel="shortcut icon" href="../favicon.ico" type="image/x-icon">
9+
<link rel="stylesheet" href="./main.css">
910
<title>BEM</title>
1011
</head>
1112
<body>

‎src/2020-02-bem/main.css

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
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', sans-serif, Consolas, "Courier New";
12+
background: antiquewhite;
13+
}
14+
15+
.card {
16+
padding: 0 5em;
17+
}
18+
19+
.card__picture {
20+
display: block;
21+
height: 10em;
22+
width: 100%;
23+
background: brown;
24+
}
25+
26+
.card__content {
27+
padding: 1.5em;
28+
background: whitesmoke;
29+
}
30+
31+
.card__list {
32+
list-style-type: none;
33+
display: flex;
34+
padding: 0;
35+
margin: 0;
36+
}
37+
38+
.card__item {
39+
padding: .5em;
40+
margin-right: .5em;
41+
background: #dfdfdf;
42+
border-radius: .3em;
43+
font-size: .7em;
44+
font-weight: bold;
45+
}
46+
47+
.card__item:hover {
48+
background: #dd44dd;
49+
color: antiquewhite;
50+
}
51+
52+
.card__item--active {
53+
background: #dd44dd;
54+
}
55+
56+
.card__description {
57+
}
58+
59+
.card__action {
60+
background: #72bec0;
61+
color: white;
62+
text-decoration: none;
63+
padding: .5em 1em;
64+
display: inline-block;
65+
margin-top: .5em;
66+
border-radius: .5em;
67+
}
68+
69+
.card__action:hover {
70+
background: #8ee2e5;
71+
color: gray;
72+
}

‎add-grid/index.html renamed to ‎src/add-grid/index.html

File renamed without changes.

‎favicon.ico renamed to ‎src/favicon.ico

File renamed without changes.

‎grid-column/index.html renamed to ‎src/grid-column/index.html

File renamed without changes.

‎grid-gap/index.html renamed to ‎src/grid-gap/index.html

File renamed without changes.

‎grid-template-areas/index.html renamed to ‎src/grid-template-areas/index.html

File renamed without changes.

‎grid-template-columns-auto/index.html renamed to ‎src/grid-template-columns-auto/index.html

File renamed without changes.

‎grid-template-columns-fractions/index.html renamed to ‎src/grid-template-columns-fractions/index.html

File renamed without changes.

‎grid-template-columns-minmax/index.html renamed to ‎src/grid-template-columns-minmax/index.html

File renamed without changes.

‎grid-template-columns/index.html renamed to ‎src/grid-template-columns/index.html

File renamed without changes.

‎index.html renamed to ‎src/index.html

File renamed without changes.

0 commit comments

Comments
 (0)