Skip to content

Commit 5164400

Browse files
committed
Merge branch 'release-0.3.4'
2 parents 1ac594a + 375db24 commit 5164400

23 files changed

+3085
-2640
lines changed

.github/workflows/lint.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ jobs:
1616
timeout-minutes: 10
1717

1818
steps:
19-
- uses: actions/checkout@v2
19+
- uses: actions/checkout@v3
2020

2121
- name: Setup Node.js
22-
uses: actions/setup-node@v1
22+
uses: actions/setup-node@v3
2323
with:
24-
node-version: '14'
24+
node-version: '16'
2525

2626
- name: Install Node.js package dependencies
2727
run: npm install

.github/workflows/npm-publish.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ jobs:
1212
timeout-minutes: 10
1313

1414
steps:
15-
- uses: actions/checkout@v2
15+
- uses: actions/checkout@v3
1616

1717
- name: Setup Node.js
18-
uses: actions/setup-node@v1
18+
uses: actions/setup-node@v3
1919
with:
20-
node-version: '14'
20+
node-version: '16'
2121
registry-url: 'https://registry.npmjs.org'
2222
always-auth : true
2323

README.md

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,23 @@ See Flexbox Grid Mixins documentation: [http://thingsym.github.io/flexbox-grid-m
235235
5. run ```$ npm run serve```
236236
6. Access URL http://localhost:3000
237237

238+
## Docker Development Environment
239+
240+
### Build and launch website
241+
242+
```
243+
docker-compose run --rm node npm install
244+
docker-compose run --rm -p 3000:3000 node npm run serve
245+
```
246+
247+
Access to URL http://localhost:3000
248+
249+
### listing tasks
250+
251+
```
252+
docker-compose run --rm node npm run
253+
```
254+
238255
## Contribution
239256

240257
### Patches and Bug Fixes
@@ -249,6 +266,15 @@ Small patches and bug reports can be submitted a issue tracker in Github. Forkin
249266

250267
## Changelog
251268

269+
* Version 0.3.4
270+
* fix npm script
271+
* fix Mixins Reference
272+
* add Docker Development Environment
273+
* gulpfile.js for docker
274+
* update package.json
275+
* update github actions, Node.js 12 actions are deprecated
276+
* fix layout margin
277+
* add Cards Layout example
252278
* Version 0.3.3
253279
* update README
254280
* update index.html

dart-sass/_flexbox-grid-mixins.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// ===================================================================
22
// Flexbox Grid Mixins (Dart Sass)
3-
// Version 0.3.3
3+
// Version 0.3.4
44
// Description: Sass Mixins to generate Flexbox grid
55
// Author: thingsym
66
// GitHub: https://github.com/thingsym/flexbox-grid-mixins

docker-compose.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
version: '3'
2+
3+
services:
4+
node:
5+
image: node:14-buster
6+
container_name: flexbox-grid-mixins
7+
volumes:
8+
- .:/flexbox-grid-mixins
9+
working_dir: /flexbox-grid-mixins
10+

docs/css-dart-sass/card.css

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
.cards {
2+
-webkit-box-sizing: border-box;
3+
box-sizing: border-box;
4+
display: -webkit-box;
5+
display: -ms-flexbox;
6+
display: flex;
7+
-ms-flex-wrap: wrap;
8+
flex-wrap: wrap;
9+
row-gap: 2rem;
10+
-webkit-column-gap: 1rem;
11+
-moz-column-gap: 1rem;
12+
column-gap: 1rem;
13+
}
14+
15+
.card {
16+
-webkit-box-sizing: border-box;
17+
box-sizing: border-box;
18+
-webkit-box-flex: 0;
19+
-ms-flex: 0 0 calc( 33.3333333333% - 1rem + 0.3333333333rem);
20+
flex: 0 0 calc( 33.3333333333% - 1rem + 0.3333333333rem);
21+
border: solid 3px #ddd;
22+
padding: 1rem;
23+
}
24+
25+
button {
26+
width: 100%;
27+
padding: 0.8rem;
28+
background: #ec9f10;
29+
border: solid 1px #ddd;
30+
}
31+
32+
.cards.with-button .card {
33+
-webkit-box-sizing: border-box;
34+
box-sizing: border-box;
35+
display: -webkit-box;
36+
display: -ms-flexbox;
37+
display: flex;
38+
-webkit-box-orient: vertical;
39+
-webkit-box-direction: normal;
40+
-ms-flex-direction: column;
41+
flex-direction: column;
42+
}
43+
44+
.column {
45+
-webkit-box-sizing: border-box;
46+
box-sizing: border-box;
47+
-webkit-box-flex: 1;
48+
-ms-flex: 1 1 0px;
49+
flex: 1 1 0;
50+
}

docs/css-dart-sass/default.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ body {
5757
}
5858

5959
.container {
60-
margin: 0 2rem;
60+
margin: 0 2rem 2rem 2rem;
6161
}
6262

6363
h2 {

docs/css-dart-sass/responsive.css

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ footer {
7979
.HolyGrail-container {
8080
width: 100%;
8181
}
82-
8382
.HolyGrail-body {
8483
-webkit-box-sizing: border-box;
8584
box-sizing: border-box;
@@ -94,16 +93,14 @@ footer {
9493
-ms-flex-pack: start;
9594
justify-content: flex-start;
9695
}
97-
9896
.HolyGrail-content,
99-
.HolyGrail-aside {
97+
.HolyGrail-aside {
10098
-webkit-box-sizing: border-box;
10199
box-sizing: border-box;
102100
-webkit-box-flex: 0;
103101
-ms-flex: 0 1 auto;
104102
flex: 0 1 auto;
105103
}
106-
107104
.HolyGrail-nav {
108105
-webkit-box-sizing: border-box;
109106
box-sizing: border-box;
@@ -119,7 +116,6 @@ footer {
119116
.HolyGrail-container {
120117
width: 100%;
121118
}
122-
123119
.HolyGrail-body {
124120
-webkit-box-sizing: border-box;
125121
box-sizing: border-box;
@@ -134,16 +130,14 @@ footer {
134130
-ms-flex-pack: start;
135131
justify-content: flex-start;
136132
}
137-
138133
.HolyGrail-content,
139-
.HolyGrail-aside {
134+
.HolyGrail-aside {
140135
-webkit-box-sizing: border-box;
141136
box-sizing: border-box;
142137
-webkit-box-flex: 0;
143138
-ms-flex: 0 1 auto;
144139
flex: 0 1 auto;
145140
}
146-
147141
.HolyGrail-nav {
148142
-webkit-box-sizing: border-box;
149143
box-sizing: border-box;

docs/css/card.css

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
.cards {
2+
-webkit-box-sizing: border-box;
3+
box-sizing: border-box;
4+
display: -webkit-box;
5+
display: -ms-flexbox;
6+
display: flex;
7+
-ms-flex-wrap: wrap;
8+
flex-wrap: wrap;
9+
row-gap: 2rem;
10+
-webkit-column-gap: 1rem;
11+
-moz-column-gap: 1rem;
12+
column-gap: 1rem;
13+
}
14+
15+
.card {
16+
-webkit-box-sizing: border-box;
17+
box-sizing: border-box;
18+
-webkit-box-flex: 0;
19+
-ms-flex: 0 0 calc( 33.3333333333% - 1rem + 0.3333333333rem);
20+
flex: 0 0 calc( 33.3333333333% - 1rem + 0.3333333333rem);
21+
border: solid 3px #ddd;
22+
padding: 1rem;
23+
}
24+
25+
button {
26+
width: 100%;
27+
padding: 0.8rem;
28+
background: #ec9f10;
29+
border: solid 1px #ddd;
30+
}
31+
32+
.cards.with-button .card {
33+
-webkit-box-sizing: border-box;
34+
box-sizing: border-box;
35+
display: -webkit-box;
36+
display: -ms-flexbox;
37+
display: flex;
38+
-webkit-box-orient: vertical;
39+
-webkit-box-direction: normal;
40+
-ms-flex-direction: column;
41+
flex-direction: column;
42+
}
43+
44+
.column {
45+
-webkit-box-sizing: border-box;
46+
box-sizing: border-box;
47+
-webkit-box-flex: 1;
48+
-ms-flex: 1 1 0px;
49+
flex: 1 1 0;
50+
}

docs/css/default.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ body {
5757
}
5858

5959
.container {
60-
margin: 0 2rem;
60+
margin: 0 2rem 2rem 2rem;
6161
}
6262

6363
h2 {

0 commit comments

Comments
 (0)