Skip to content

Commit 4552730

Browse files
johnojohno
authored
Merge pull request #28 from ptrikutam/tachyons-custom
Transpile from tachyons-custom
2 parents c507525 + 19fbb9e commit 4552730

28 files changed

+531
-541
lines changed

‎build.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,30 +5,30 @@ const glob = require('glob')
55
const cssScss = require('css-scss')
66
const stream = require('stream')
77

8-
glob('./node_modules/tachyons/src/**/*.css', (err, files) => {
8+
glob('./node_modules/tachyons-custom/src/**/*.css', (err, files) => {
99
if (err) {
1010
throw err
1111
}
1212

1313
files.forEach(file => {
1414
var css = fs.readFileSync(file, 'utf8')
15-
var fileName = file.replace(/(\.\/node_modules\/tachyons\/src\/|\.css)/g, '')
15+
var fileName = file.replace(/(\.\/node_modules\/tachyons-custom\/src\/|\.css)/g, '')
1616

17-
if (fileName !== 'tachyons' && fileName !== '_media-queries' && fileName !== '_colors' && fileName !== '_debug') {
17+
if (fileName !== 'tachyons' && fileName !== '_debug') {
1818
fs.writeFileSync('scss/' + fileName + '.scss', cssScss(css))
1919
}
2020
})
2121
})
2222

23-
const tachyonsCSS = fs.createReadStream('./node_modules/tachyons/src/tachyons.css')
23+
const tachyonsCSS = fs.createReadStream('./node_modules/tachyons-custom/src/tachyons.css')
2424
const tachyonsSCSS = fs.createWriteStream('./tachyons.scss')
2525
tachyonsCSS.on('data', (data) => {
2626
const sassStream = new stream.Readable()
2727
sassStream.push(
2828
data
2929
.toString('utf8')
3030
.replace(/\.\/_/g, 'scss/') // Update paths
31-
.replace(/^((.|\n)+)(\n\/\*\sModules(.|\n)+)(\n\/\*\sVariables(.|\n)+)/g, '$1$5$3') // Move import orders
31+
.replace(/^((.|\n)+)(\n \/\*\sModules(.|\n)+)(\n\/\*\sVariables(.|\n)+)/g, '$1$5$3') // Move import orders
3232
.replace(/\/\*(.*)\*\//g, '// $1') // Change single-line comments to //
3333
.replace(/\/\*|\s\*\/?/g, '//') // Change multi-line comments to //
3434
)

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "tachyons-sass",
33
"description": "Transpiled Sass partials for Tachyons",
44
"author": "John Otander",
5-
"version": "4.9.0",
5+
"version": "4.9.2",
66
"style": "tachyons.scss",
77
"scripts": {
88
"start": "node build.js",
@@ -19,7 +19,7 @@
1919
],
2020
"license": "MIT",
2121
"dependencies": {
22-
"tachyons": "^4.9.0"
22+
"tachyons-custom": "^4.9.2"
2323
},
2424
"devDependencies": {
2525
"ava": "^0.22.0",

‎scss/_border-radius.scss‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,13 @@
3131
3232
*/
3333

34-
.br0 { border-radius: 0; }
35-
.br1 { border-radius: .125rem; }
36-
.br2 { border-radius: .25rem; }
37-
.br3 { border-radius: .5rem; }
38-
.br4 { border-radius: 1rem; }
39-
.br-100 { border-radius: 100%; }
40-
.br-pill { border-radius: 9999px; }
34+
.br0 { border-radius: $border-radius-none }
35+
.br1 { border-radius: $border-radius-1; }
36+
.br2 { border-radius: $border-radius-2; }
37+
.br3 { border-radius: $border-radius-3; }
38+
.br4 { border-radius: $border-radius-4; }
39+
.br-100 { border-radius: $border-radius-circle; }
40+
.br-pill { border-radius: $border-radius-pill; }
4141
.br--bottom {
4242
border-top-left-radius: 0;
4343
border-top-right-radius: 0;
@@ -56,13 +56,13 @@
5656
}
5757

5858
@media #{$breakpoint-not-small} {
59-
.br0-ns { border-radius: 0; }
60-
.br1-ns { border-radius: .125rem; }
61-
.br2-ns { border-radius: .25rem; }
62-
.br3-ns { border-radius: .5rem; }
63-
.br4-ns { border-radius: 1rem; }
64-
.br-100-ns { border-radius: 100%; }
65-
.br-pill-ns { border-radius: 9999px; }
59+
.br0-ns { border-radius: $border-radius-none }
60+
.br1-ns { border-radius: $border-radius-1; }
61+
.br2-ns { border-radius: $border-radius-2; }
62+
.br3-ns { border-radius: $border-radius-3; }
63+
.br4-ns { border-radius: $border-radius-4; }
64+
.br-100-ns { border-radius: $border-radius-circle; }
65+
.br-pill-ns { border-radius: $border-radius-pill; }
6666
.br--bottom-ns {
6767
border-top-left-radius: 0;
6868
border-top-right-radius: 0;
@@ -82,13 +82,13 @@
8282
}
8383

8484
@media #{$breakpoint-medium} {
85-
.br0-m { border-radius: 0; }
86-
.br1-m { border-radius: .125rem; }
87-
.br2-m { border-radius: .25rem; }
88-
.br3-m { border-radius: .5rem; }
89-
.br4-m { border-radius: 1rem; }
90-
.br-100-m { border-radius: 100%; }
91-
.br-pill-m { border-radius: 9999px; }
85+
.br0-m { border-radius: $border-radius-none }
86+
.br1-m { border-radius: $border-radius-1; }
87+
.br2-m { border-radius: $border-radius-2; }
88+
.br3-m { border-radius: $border-radius-3; }
89+
.br4-m { border-radius: $border-radius-4; }
90+
.br-100-m { border-radius: $border-radius-circle; }
91+
.br-pill-m { border-radius: $border-radius-pill; }
9292
.br--bottom-m {
9393
border-top-left-radius: 0;
9494
border-top-right-radius: 0;
@@ -108,16 +108,16 @@
108108
}
109109

110110
@media #{$breakpoint-large} {
111-
.br0-l { border-radius: 0; }
112-
.br1-l { border-radius: .125rem; }
113-
.br2-l { border-radius: .25rem; }
114-
.br3-l { border-radius: .5rem; }
115-
.br4-l { border-radius: 1rem; }
116-
.br-100-l { border-radius: 100%; }
117-
.br-pill-l { border-radius: 9999px; }
111+
.br0-l { border-radius: $border-radius-none }
112+
.br1-l { border-radius: $border-radius-1; }
113+
.br2-l { border-radius: $border-radius-2; }
114+
.br3-l { border-radius: $border-radius-3; }
115+
.br4-l { border-radius: $border-radius-4; }
116+
.br-100-l { border-radius: $border-radius-circle; }
117+
.br-pill-l { border-radius: $border-radius-pill; }
118118
.br--bottom-l {
119-
border-top-left-radius: 0;
120-
border-top-right-radius: 0;
119+
border-radius-top-left: 0;
120+
border-radius-top-right: 0;
121121
}
122122
.br--top-l {
123123
border-bottom-left-radius: 0;

‎scss/_border-widths.scss‎

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -28,54 +28,54 @@
2828
2929
*/
3030

31-
.bw0 { border-width: 0; }
32-
.bw1 { border-width: .125rem; }
33-
.bw2 { border-width: .25rem; }
34-
.bw3 { border-width: .5rem; }
35-
.bw4 { border-width: 1rem; }
36-
.bw5 { border-width: 2rem; }
31+
.bw0 { border-width: $border-width-none; }
32+
.bw1 { border-width: $border-width-1; }
33+
.bw2 { border-width: $border-width-2; }
34+
.bw3 { border-width: $border-width-3; }
35+
.bw4 { border-width: $border-width-4; }
36+
.bw5 { border-width: $border-width-5; }
3737

3838
/* Resets */
39-
.bt-0 { border-top-width: 0; }
40-
.br-0 { border-right-width: 0; }
41-
.bb-0 { border-bottom-width: 0; }
42-
.bl-0 { border-left-width: 0; }
39+
.bt-0 { border-top-width: $border-width-none }
40+
.br-0 { border-right-width: $border-width-none }
41+
.bb-0 { border-bottom-width: $border-width-none }
42+
.bl-0 { border-left-width: $border-width-none }
4343

4444
@media #{$breakpoint-not-small} {
45-
.bw0-ns { border-width: 0; }
46-
.bw1-ns { border-width: .125rem; }
47-
.bw2-ns { border-width: .25rem; }
48-
.bw3-ns { border-width: .5rem; }
49-
.bw4-ns { border-width: 1rem; }
50-
.bw5-ns { border-width: 2rem; }
51-
.bt-0-ns { border-top-width: 0; }
52-
.br-0-ns { border-right-width: 0; }
53-
.bb-0-ns { border-bottom-width: 0; }
54-
.bl-0-ns { border-left-width: 0; }
45+
.bw0-ns { border-width: $border-width-none; }
46+
.bw1-ns { border-width: $border-width-1; }
47+
.bw2-ns { border-width: $border-width-2; }
48+
.bw3-ns { border-width: $border-width-3; }
49+
.bw4-ns { border-width: $border-width-4; }
50+
.bw5-ns { border-width: $border-width-5; }
51+
.bt-0-ns { border-top-width: $border-width-none }
52+
.br-0-ns { border-right-width: $border-width-none }
53+
.bb-0-ns { border-bottom-width: $border-width-none }
54+
.bl-0-ns { border-left-width: $border-width-none }
5555
}
5656

5757
@media #{$breakpoint-medium} {
58-
.bw0-m { border-width: 0; }
59-
.bw1-m { border-width: .125rem; }
60-
.bw2-m { border-width: .25rem; }
61-
.bw3-m { border-width: .5rem; }
62-
.bw4-m { border-width: 1rem; }
63-
.bw5-m { border-width: 2rem; }
64-
.bt-0-m { border-top-width: 0; }
65-
.br-0-m { border-right-width: 0; }
66-
.bb-0-m { border-bottom-width: 0; }
67-
.bl-0-m { border-left-width: 0; }
58+
.bw0-m { border-width: $border-width-none; }
59+
.bw1-m { border-width: $border-width-1; }
60+
.bw2-m { border-width: $border-width-2; }
61+
.bw3-m { border-width: $border-width-3; }
62+
.bw4-m { border-width: $border-width-4; }
63+
.bw5-m { border-width: $border-width-5; }
64+
.bt-0-m { border-top-width: $border-width-none }
65+
.br-0-m { border-right-width: $border-width-none }
66+
.bb-0-m { border-bottom-width: $border-width-none }
67+
.bl-0-m { border-left-width: $border-width-none }
6868
}
6969

7070
@media #{$breakpoint-large} {
71-
.bw0-l { border-width: 0; }
72-
.bw1-l { border-width: .125rem; }
73-
.bw2-l { border-width: .25rem; }
74-
.bw3-l { border-width: .5rem; }
75-
.bw4-l { border-width: 1rem; }
76-
.bw5-l { border-width: 2rem; }
77-
.bt-0-l { border-top-width: 0; }
78-
.br-0-l { border-right-width: 0; }
79-
.bb-0-l { border-bottom-width: 0; }
80-
.bl-0-l { border-left-width: 0; }
71+
.bw0-l { border-width: $border-width-none; }
72+
.bw1-l { border-width: $border-width-1; }
73+
.bw2-l { border-width: $border-width-2; }
74+
.bw3-l { border-width: $border-width-3; }
75+
.bw4-l { border-width: $border-width-4; }
76+
.bw5-l { border-width: $border-width-5; }
77+
.bt-0-l { border-top-width: $border-width-none }
78+
.br-0-l { border-right-width: $border-width-none }
79+
.bb-0-l { border-bottom-width: $border-width-none }
80+
.bl-0-l { border-left-width: $border-width-none }
8181
}

‎scss/_box-shadow.scss‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -17,32 +17,32 @@
1717
1818
*/
1919

20-
.shadow-1 { box-shadow: 0px 0px 4px 2px rgba( 0, 0, 0, 0.2 ); }
21-
.shadow-2 { box-shadow: 0px 0px 8px 2px rgba( 0, 0, 0, 0.2 ); }
22-
.shadow-3 { box-shadow: 2px 2px 4px 2px rgba( 0, 0, 0, 0.2 ); }
23-
.shadow-4 { box-shadow: 2px 2px 8px 0px rgba( 0, 0, 0, 0.2 ); }
24-
.shadow-5 { box-shadow: 4px 4px 8px 0px rgba( 0, 0, 0, 0.2 ); }
20+
.shadow-1 { box-shadow: $box-shadow-1; }
21+
.shadow-2 { box-shadow: $box-shadow-2; }
22+
.shadow-3 { box-shadow: $box-shadow-3; }
23+
.shadow-4 { box-shadow: $box-shadow-4; }
24+
.shadow-5 { box-shadow: $box-shadow-5; }
2525

2626
@media #{$breakpoint-not-small} {
27-
.shadow-1-ns { box-shadow: 0px 0px 4px 2px rgba( 0, 0, 0, 0.2 ); }
28-
.shadow-2-ns { box-shadow: 0px 0px 8px 2px rgba( 0, 0, 0, 0.2 ); }
29-
.shadow-3-ns { box-shadow: 2px 2px 4px 2px rgba( 0, 0, 0, 0.2 ); }
30-
.shadow-4-ns { box-shadow: 2px 2px 8px 0px rgba( 0, 0, 0, 0.2 ); }
31-
.shadow-5-ns { box-shadow: 4px 4px 8px 0px rgba( 0, 0, 0, 0.2 ); }
27+
.shadow-1-ns { box-shadow: $box-shadow-1; }
28+
.shadow-2-ns { box-shadow: $box-shadow-2; }
29+
.shadow-3-ns { box-shadow: $box-shadow-3; }
30+
.shadow-4-ns { box-shadow: $box-shadow-4; }
31+
.shadow-5-ns { box-shadow: $box-shadow-5; }
3232
}
3333

3434
@media #{$breakpoint-medium} {
35-
.shadow-1-m { box-shadow: 0px 0px 4px 2px rgba( 0, 0, 0, 0.2 ); }
36-
.shadow-2-m { box-shadow: 0px 0px 8px 2px rgba( 0, 0, 0, 0.2 ); }
37-
.shadow-3-m { box-shadow: 2px 2px 4px 2px rgba( 0, 0, 0, 0.2 ); }
38-
.shadow-4-m { box-shadow: 2px 2px 8px 0px rgba( 0, 0, 0, 0.2 ); }
39-
.shadow-5-m { box-shadow: 4px 4px 8px 0px rgba( 0, 0, 0, 0.2 ); }
35+
.shadow-1-m { box-shadow: $box-shadow-1; }
36+
.shadow-2-m { box-shadow: $box-shadow-2; }
37+
.shadow-3-m { box-shadow: $box-shadow-3; }
38+
.shadow-4-m { box-shadow: $box-shadow-4; }
39+
.shadow-5-m { box-shadow: $box-shadow-5; }
4040
}
4141

4242
@media #{$breakpoint-large} {
43-
.shadow-1-l { box-shadow: 0px 0px 4px 2px rgba( 0, 0, 0, 0.2 ); }
44-
.shadow-2-l { box-shadow: 0px 0px 8px 2px rgba( 0, 0, 0, 0.2 ); }
45-
.shadow-3-l { box-shadow: 2px 2px 4px 2px rgba( 0, 0, 0, 0.2 ); }
46-
.shadow-4-l { box-shadow: 2px 2px 8px 0px rgba( 0, 0, 0, 0.2 ); }
47-
.shadow-5-l { box-shadow: 4px 4px 8px 0px rgba( 0, 0, 0, 0.2 ); }
43+
.shadow-1-l { box-shadow: $box-shadow-1; }
44+
.shadow-2-l { box-shadow: $box-shadow-2; }
45+
.shadow-3-l { box-shadow: $box-shadow-3; }
46+
.shadow-4-l { box-shadow: $box-shadow-4; }
47+
.shadow-5-l { box-shadow: $box-shadow-5; }
4848
}

‎scss/_box-sizing.scss‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77

88
/*
9-
9+
1010
BOX SIZING
1111
1212
*/
@@ -34,7 +34,7 @@ dl,
3434
dt,
3535
dd,
3636
textarea,
37-
table,
37+
table,
3838
td,
3939
th,
4040
tr,
@@ -47,4 +47,3 @@ input[type="url"],
4747
.border-box {
4848
box-sizing: border-box;
4949
}
50-

‎scss/_colors.scss‎

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

0 commit comments

Comments
 (0)