Skip to content

Commit

Permalink
remove bower dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
kbariotis committed Feb 21, 2018
1 parent 5b1a747 commit 8ff2e69
Show file tree
Hide file tree
Showing 13 changed files with 27 additions and 24 deletions.
1 change: 0 additions & 1 deletion Gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ gulp.task('sass', function() {
.pipe(customPlumber())
.pipe(sass({
includePaths: [
'./bower_components/',
'./node_modules/',
'./'
],
Expand Down
7 changes: 6 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,10 @@
"url": "https://github.com/zellwk/typi"
},
"author": "Zell Liew <[email protected]>",
"license": "MIT"
"license": "MIT",
"dependencies": {
"breakpoint-sass": "^2.7.1",
"mappy-breakpoints": "^0.2.3",
"modularscale-sass": "^2.1.1"
}
}
8 changes: 4 additions & 4 deletions test/automated/_typefaces.scss
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ $typi-ms: (
@include test-module('vr-ms with typefaces') {
@include test('write one property') {
@include assert('') {
@include input {
@include output {
@include vr-ms(margin-top, 2, 'vr-ms-test', 'secondary');
}
@include expect {
Expand All @@ -187,7 +187,7 @@ $typi-ms: (
@include test-module('Typeface output:') {
@include test('should produce right font-size values') {
@include assert('') {
@include input {
@include output {
@include typi('secondary', $typeface: 'secondary');
}

Expand All @@ -203,7 +203,7 @@ $typi-ms: (
@include test('should produce right rhythm values') {
@include assert('') {
$font-size: nth(map-fetch($typi, secondary null), 1);
@include input {
@include output {
margin-top: vr(3, $font-size, 'secondary');
}
@include expect {
Expand All @@ -213,4 +213,4 @@ $typi-ms: (
}
}
}
}
}
2 changes: 1 addition & 1 deletion test/automated/_typi-ms.scss
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ $typi-ms: (
@include test-module('Writing Typi MS props') {
@include test('should output font-size and line-height') {
@include assert('') {
@include input {
@include output {
@include _ty-output-props((
target: 'h1',
target-map: map-get($typi, 'h1'),
Expand Down
10 changes: 5 additions & 5 deletions test/automated/_write-props.scss
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ $basemap: map-get($typi, base);
@include test-module('Write properties') {
@include test('font-size only') {
@include assert('h1 null breakpoint') {
@include input {
@include output {
@include _ty-output-props((
target: 'h1',
target-map: map-get($typi, 'h1'),
Expand All @@ -44,7 +44,7 @@ $basemap: map-get($typi, base);

@include test('font-size and line-height') {
@include assert('h1 med breakpoint') {
@include input {
@include output {
@include _ty-output-props((
target: 'h1',
target-map: map-get($typi, 'h1'),
Expand All @@ -64,7 +64,7 @@ $basemap: map-get($typi, base);

@include test('list type for font-size in map') {
@include assert('h1 large breakpoint') {
@include input {
@include output {
@include _ty-output-props((
target: 'h1',
target-map: map-get($typi, 'h1'),
Expand All @@ -84,7 +84,7 @@ $basemap: map-get($typi, base);

@include test('write base font-size') {
@include assert('base') {
@include input() {
@include output() {
@include _ty-output-props((
target: 'base',
target-map: map-get($typi, 'base'),
Expand All @@ -100,4 +100,4 @@ $basemap: map-get($typi, base);
}
}
}
}
}
4 changes: 2 additions & 2 deletions test/automated/extender.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import 'true';
@import 'modular-scale/stylesheets/_modular-scale';
@import 'node_modules/modularscale-sass/stylesheets/_modular-scale';
@import 'scss/typi';

// Test individual extension of maps
Expand Down Expand Up @@ -70,4 +70,4 @@ $typi-ms: (
);
@include assert-equal($test2, $result2, 'for h1')
}
}
}
2 changes: 1 addition & 1 deletion test/automated/test.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import 'true';
@import 'bower_components/modular-scale/stylesheets/_modular-scale';
@import 'node_modules/modularscale-sass/stylesheets/_modular-scale';
@import 'scss/typi';

@import 'breakpoints';
Expand Down
2 changes: 1 addition & 1 deletion test/manual/baseline.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@import 'scss/typi';
@import 'mappy-breakpoints/mappy-breakpoints';
@import 'compass-breakpoint/stylesheets/breakpoint';
@import 'node_modules/breakpoint-sass/stylesheets/breakpoint';

$breakpoints: (
small: 400px,
Expand Down
4 changes: 2 additions & 2 deletions test/manual/bp.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@import 'scss/typi';
@import 'mappy-breakpoints/mappy-breakpoints';
@import 'compass-breakpoint/stylesheets/breakpoint';
@import 'node_modules/breakpoint-sass/stylesheets/breakpoint';

$breakpoints: (
small: 400px,
Expand Down Expand Up @@ -37,4 +37,4 @@ $typi-breakpoint: mappy-bp;
$typi-breakpoint: breakpoint;
.h1 {
@include typi(h1);
}
}
2 changes: 1 addition & 1 deletion test/manual/create-class.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import 'scss/typi';
@import 'modular-scale/stylesheets/_modular-scale';
@import 'node_modules/modularscale-sass/stylesheets/_modular-scale';

$typi: (
base: (
Expand Down
4 changes: 2 additions & 2 deletions test/manual/typi-ms-vr.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import 'modular-scale/stylesheets/_modular-scale';
@import 'node_modules/modularscale-sass/stylesheets/_modular-scale';
@import 'scss/typi';

$typi: (
Expand Down Expand Up @@ -26,4 +26,4 @@ $typi-ms: (

.testing {
@include vr-ms(margin-top, 2, $target: 'h1');
}
}
4 changes: 2 additions & 2 deletions test/manual/typi-ms.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import 'bower_components/modular-scale/stylesheets/_modular-scale';
@import 'node_modules/modularscale-sass/stylesheets/_modular-scale';
@import 'scss/typi';

$breakpoints: (
Expand Down Expand Up @@ -63,4 +63,4 @@ h2 {

h2 {
@include typi('h2', $rem: false);
}
}
1 change: 0 additions & 1 deletion test/test_sass.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ testFiles.forEach(basename => {
sassTrue.runSass({
file: testFile,
includePaths: [
'./bower_components',
'./node_modules'
]
}, describe, it)
Expand Down

0 comments on commit 8ff2e69

Please sign in to comment.