Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Border width doesnt apply #50

Merged
merged 7 commits into from
May 28, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .eslintignore

This file was deleted.

5 changes: 0 additions & 5 deletions .eslintrc.js

This file was deleted.

18 changes: 0 additions & 18 deletions .sass-lint.yml

This file was deleted.

106 changes: 106 additions & 0 deletions gulpfile.babel.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,106 @@
import { series, parallel } from 'gulp'
import { sass } from '@coldfrontlabs/gulp-templates'

const paths = {
source: {
src: 'scss',
dest: 'scss',
},
test: {
src: 'test',
dest: 'test'
},
selector: '**/*.scss'
}

/**
* Lints all source Sass files.
*
* @returns {Object} - Gulp stream.
*/
export const lintSource = () => sass.lint(`${paths.source.src}/${paths.selector}`)
lintSource.description = 'Lints all source Sass files.'

/**
* Lints and fixes all source Sass files.
*
* @returns {Object} - Gulp stream.
*/
export const fixSource = () => sass.fix(`${paths.source.src}/${paths.selector}`)
fixSource.description = 'Lints and fixes all source Sass files.'

/**
* Lints all test Sass files.
*
* @returns {Object} - Gulp stream.
*/
export const lintTests = () => sass.lint(`${paths.test.src}/${paths.selector}`)
lintTests.description = 'Lints all test Sass files.'


/**
* Lints and fixes all test Sass files.
*
* @returns {Object} - Gulp stream.
*/
export const fixTests = () => sass.fix(`${paths.test.src}/${paths.selector}`)
fixTests.description = 'Lints and fixes all test Sass files.'

/**
* Compiles all class test Sass files.
*
* @returns {Object} - Gulp stream.
*/
export const compileClass = () => sass.compile(`${paths.test.src}/classes/${paths.selector}`, `${paths.test.src}/classes/results`)
compileClass.description = 'Compiles all class test Sass files.'

/**
* Compiles all mixin test Sass files.
*
* @returns {Object} - Gulp stream.
*/
export const compileMixin = () => sass.compile(`${paths.test.src}/mixins/${paths.selector}`, `${paths.test.src}/mixins/results`)
compileMixin.description = 'Compiles all mixin test Sass files.'

/**
* Compiles all other test Sass files.
*
* @returns {Object} - Gulp stream.
*/
export const compileOther = () => sass.compile(`${paths.test.src}/other/${paths.selector}`, `${paths.test.src}/other/results`)
compileOther.description = 'Compiles all other test Sass files.'

/**
* Lints all Sass files.
*
* @returns {Object} - Gulp stream.
*/
export const lint = parallel(lintSource, lintTests)
lint.description = 'Lints all Sass files.'

/**
* Lints and fixes all Sass files.
*
* @returns {Object} - Gulp stream.
*/
export const fix = parallel(fixSource, fixTests)
fix.description = 'Lints and fixes all Sass files.'

/**
* Compiles all test Sass files.
*
* @returns {Object} - Gulp stream.
*/
export const compile = parallel(compileClass, compileMixin, compileOther)
compile.description = 'Compiles all test Sass files.'

/**
* Lints and compiles all Sass files.
*
* @returns {Object} - Gulp stream.
*/
export const test = series(lint, compile)
test.description = 'Lints and compiles all Sass files.'

// Create default task.
export default test
105 changes: 0 additions & 105 deletions gulpfile.js

This file was deleted.

57 changes: 51 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,15 @@
"name": "bootstrap-scss-plugins",
"version": "1.1.2",
"description": "A suite of SCSS plugins used for developing Bootstrap 4 themes and sites.",
"eslintConfig": "./.eslintrc.js",
"scripts": {
"lint": "sass-lint -v -c .sass-lint.yml",
"eslint": "eslint ./**/*.js",
"pre-commit": "npm run lint && npm run test",
"lint": "npm run lint:styles && npm run lint:scripts",
"lint:styles": "npx gulp lint",
"lint:styles:fix": "npx gulp fix",
"lint:scripts": "npx eslint --ext .js .",
"lint:scripts:fix": "npx eslint --ext .js . --fix",
"test": "npm run test:compile",
"test:compile": "npx gulp compile",
"commit": "npx git cz"
},
"repository": {
Expand All @@ -25,14 +30,20 @@
"homepage": "https://github.com/coldfrontlabs/bootstrap-scss-plugins#readme",
"dependencies": {},
"devDependencies": {
"@babel/core": "^7.4.5",
"@babel/preset-env": "^7.4.5",
"@babel/register": "^7.4.4",
"@coldfrontlabs/gulp-templates": "^1.1.0",
"@commitlint/cli": "^7.6.1",
"@commitlint/config-conventional": "^7.6.0",
"bootstrap": "^4.2.1",
"commitizen": "^3.0.5",
"cz-conventional-changelog": "^2.1.0",
"eslint": "^5.12.1",
"gulp": "^4.0.0",
"gulp-sass": "^4.0.2",
"gulp-sass-lint": "^1.4.0",
"sass-lint": "^1.12.1"
"husky": "^2.3.0",
"stylelint": "^10.0.1",
"stylelint-config-coldfront": "^1.0.0"
},
"peerDependencies": {
"bootstrap": "^4.2.0"
Expand All @@ -41,5 +52,39 @@
"commitizen": {
"path": "./node_modules/cz-conventional-changelog"
}
},
"babel": {
"presets": [
"@babel/preset-env"
]
},
"eslintConfig": {
"extends": [
"eslint:recommended"
],
"env": {
"es6": "true",
"node": "true"
},
"parserOptions": {
"sourceType": "module"
}
},
"stylelint": {
"root": "true",
"extends": [
"stylelint-config-coldfront"
]
},
"commitlint": {
"extends": [
"@commitlint/config-conventional"
]
},
"husky": {
"hooks": {
"commit-msg": "commitlint -E HUSKY_GIT_PARAMS",
"pre-commit": "echo committing as $(git config user.name) && npm run pre-commit"
}
}
}
6 changes: 3 additions & 3 deletions scss/border-widths.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// ----------
// border-width class plugin.
// ----------
/**
* border-width class plugin.
*/

@import './mixins/border-widths';
@import './utilities/border-widths';
6 changes: 3 additions & 3 deletions scss/button-rounded.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// ----------
// btn-rounded class plugin.
// ----------
/**
* btn-rounded class plugin.
*/

@import './utilities/button-rounded';
6 changes: 3 additions & 3 deletions scss/button-squared.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// ----------
// btn-squared class plugin.
// ----------
/**
* btn-squared class plugin.
*/

@import './utilities/button-squared';
6 changes: 3 additions & 3 deletions scss/column-count.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// ----------
// column-count class plugin.
// ----------
/**
* column-count class plugin.
*/

@import './mixins/column-count';
@import './utilities/column-count';
6 changes: 3 additions & 3 deletions scss/font-sizes.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// ----------
// font-size class plugin.
// ----------
/**
* font-size class plugin.
*/

@import './mixins/font-sizes';
@import './utilities/font-sizes';
6 changes: 3 additions & 3 deletions scss/media-ie.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// ----------
// media-ie mixin plugin.
// ----------
/**
* media-ie mixin plugin.
*/

@import './mixins/media-ie';
10 changes: 5 additions & 5 deletions scss/mixins/border-widths.scss
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// ----------
// Mixin to add border-width classes.
//
// Creates a selector using the $parent provided and the $value given.
// ----------
/**
* Mixin to add border-width classes.
*
* Creates a selector using the $parent provided and the $value given.
*/

@mixin border-width-variant($parent, $value) {
#{$parent} {
Expand Down
Loading