From e63d09ada09b08be3bafb71ddffddf105f969b79 Mon Sep 17 00:00:00 2001 From: drupalastic Date: Tue, 18 Jun 2019 08:46:53 +0530 Subject: [PATCH 1/2] base theme fine tuned and updated --- .eslintrc | 11 ++ .eslintrc.js | 10 -- .nvmrc | 1 + css/.gitkeep | 0 css/global.css | 4 + css/reset.css | 410 ++++++++++++++++++++++++++++++++++++++++++ gulp-tasks/_config.js | 18 +- gulp-tasks/_utils.js | 0 gulp-tasks/default.js | 0 gulp-tasks/lint.js | 6 +- gulp-tasks/scripts.js | 0 gulp-tasks/styles.js | 2 +- gulp-tasks/svg.js | 0 gulp-tasks/watch.js | 8 +- kashmir.info.yml | 1 + kashmir.libraries.yml | 6 +- sass/global.scss | 10 +- ts/.gitkeep | 0 18 files changed, 453 insertions(+), 34 deletions(-) create mode 100644 .eslintrc delete mode 100644 .eslintrc.js create mode 100644 .nvmrc create mode 100644 css/.gitkeep create mode 100644 css/global.css create mode 100644 css/reset.css mode change 100644 => 100755 gulp-tasks/_config.js mode change 100644 => 100755 gulp-tasks/_utils.js mode change 100644 => 100755 gulp-tasks/default.js mode change 100644 => 100755 gulp-tasks/lint.js mode change 100644 => 100755 gulp-tasks/scripts.js mode change 100644 => 100755 gulp-tasks/styles.js mode change 100644 => 100755 gulp-tasks/svg.js mode change 100644 => 100755 gulp-tasks/watch.js create mode 100644 ts/.gitkeep diff --git a/.eslintrc b/.eslintrc new file mode 100644 index 0000000..b0162c3 --- /dev/null +++ b/.eslintrc @@ -0,0 +1,11 @@ +{ + "root": true, + "parser": "@typescript-eslint/parser", + "plugins": ["prettier", "@typescript-eslint"], + "extends": ["prettier", "plugin:@typescript-eslint/recommended"], + "rules": { + "prettier/prettier": ["error"], + "@typescript-eslint/indent": "off", + "@typescript-eslint/explicit-function-return-type": "off" + } +} diff --git a/.eslintrc.js b/.eslintrc.js deleted file mode 100644 index 13ff7f4..0000000 --- a/.eslintrc.js +++ /dev/null @@ -1,10 +0,0 @@ -module.exports = { - parser: '@typescript-eslint/parser', - plugins: ['prettier', '@typescript-eslint'], - extends: ['prettier', 'plugin:@typescript-eslint/recommended'], - rules: { - 'prettier/prettier': ['error'], - '@typescript-eslint/indent': 'off', - '@typescript-eslint/explicit-function-return-type': 'off' - } -}; diff --git a/.nvmrc b/.nvmrc new file mode 100644 index 0000000..5007551 --- /dev/null +++ b/.nvmrc @@ -0,0 +1 @@ +10.16.0 diff --git a/css/.gitkeep b/css/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/css/global.css b/css/global.css new file mode 100644 index 0000000..0c214b8 --- /dev/null +++ b/css/global.css @@ -0,0 +1,4 @@ +h2 { + color: red; + background-color: blue; +} diff --git a/css/reset.css b/css/reset.css new file mode 100644 index 0000000..01bc7a9 --- /dev/null +++ b/css/reset.css @@ -0,0 +1,410 @@ +/*! normalize.scss v0.1.0 | MIT License | based on git.io/normalize */ +/** + * 1. Set default font family to sans-serif. + * 2. Prevent iOS text size adjust after orientation change, without disabling + * user zoom. + */ +html { + font-family: sans-serif; + /* 1 */ + -ms-text-size-adjust: 100%; + /* 2 */ + -webkit-text-size-adjust: 100%; + /* 2 */ +} + +/** + * Remove default margin. + */ +body { + margin: 0; +} + +/* HTML5 display definitions + ========================================================================== */ +/** + * Correct `block` display not defined for any HTML5 element in IE 8/9. + * Correct `block` display not defined for `details` or `summary` in IE 10/11 + * and Firefox. + * Correct `block` display not defined for `main` in IE 11. + */ +article, +aside, +details, +figcaption, +figure, +footer, +header, +hgroup, +main, +menu, +nav, +section, +summary { + display: block; +} + +/** + * 1. Correct `inline-block` display not defined in IE 8/9. + * 2. Normalize vertical alignment of `progress` in Chrome, Firefox, and Opera. + */ +audio, +canvas, +progress, +video { + display: inline-block; + /* 1 */ + vertical-align: baseline; + /* 2 */ +} + +/** + * Prevent modern browsers from displaying `audio` without controls. + * Remove excess height in iOS 5 devices. + */ +audio:not([controls]) { + display: none; + height: 0; +} + +/** + * Address `[hidden]` styling not present in IE 8/9/10. + * Hide the `template` element in IE 8/9/11, Safari, and Firefox < 22. + */ +[hidden], +template { + display: none; +} + +/* Links + ========================================================================== */ +/** + * Remove the gray background color from active links in IE 10. + */ +a { + background-color: transparent; +} + +/** + * Improve readability when focused and also mouse hovered in all browsers. + */ +a:active, +a:hover { + outline: 0; +} + +/* Text-level semantics + ========================================================================== */ +/** + * Address styling not present in IE 8/9/10/11, Safari, and Chrome. + */ +abbr[title] { + border-bottom: 1px dotted; +} + +/** + * Address style set to `bolder` in Firefox 4+, Safari, and Chrome. + */ +b, +strong { + font-weight: bold; +} + +/** + * Address styling not present in Safari and Chrome. + */ +dfn { + font-style: italic; +} + +/** + * Address variable `h1` font-size and margin within `section` and `article` + * contexts in Firefox 4+, Safari, and Chrome. + */ +h1 { + font-size: 2em; + margin: 0.67em 0; +} + +/** + * Address styling not present in IE 8/9. + */ +mark { + background: #ff0; + color: #000; +} + +/** + * Address inconsistent and variable font size in all browsers. + */ +small { + font-size: 80%; +} + +/** + * Prevent `sub` and `sup` affecting `line-height` in all browsers. + */ +sub, +sup { + font-size: 75%; + line-height: 0; + position: relative; + vertical-align: baseline; +} + +sup { + top: -0.5em; +} + +sub { + bottom: -0.25em; +} + +/* Embedded content + ========================================================================== */ +/** + * Remove border when inside `a` element in IE 8/9/10. + */ +img { + border: 0; +} + +/** + * Correct overflow not hidden in IE 9/10/11. + */ +svg:not(:root) { + overflow: hidden; +} + +/* Grouping content + ========================================================================== */ +/** + * Address margin not present in IE 8/9 and Safari. + */ +figure { + margin: 1em 40px; +} + +/** + * Address differences between Firefox and other browsers. + */ +hr { + box-sizing: content-box; + height: 0; +} + +/** + * Contain overflow in all browsers. + */ +pre { + overflow: auto; +} + +/** + * Address odd `em`-unit font size rendering in all browsers. + */ +code, +kbd, +pre, +samp { + font-family: monospace, monospace; + font-size: 1em; +} + +/* Forms + ========================================================================== */ +/** + * Known limitation: by default, Chrome and Safari on OS X allow very limited + * styling of `select`, unless a `border` property is set. + */ +/** + * 1. Correct color not being inherited. + * Known issue: affects color of disabled elements. + * 2. Correct font properties not being inherited. + * 3. Address margins set differently in Firefox 4+, Safari, and Chrome. + */ +button, +input, +optgroup, +select, +textarea { + color: inherit; + /* 1 */ + font: inherit; + /* 2 */ + margin: 0; + /* 3 */ +} + +/** + * Address `overflow` set to `hidden` in IE 8/9/10/11. + */ +button { + overflow: visible; +} + +/** + * Address inconsistent `text-transform` inheritance for `button` and `select`. + * All other form control elements do not inherit `text-transform` values. + * Correct `button` style inheritance in Firefox, IE 8/9/10/11, and Opera. + * Correct `select` style inheritance in Firefox. + */ +button, +select { + text-transform: none; +} + +/** + * 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio` + * and `video` controls. + * 2. Correct inability to style clickable `input` types in iOS. + * 3. Improve usability and consistency of cursor style between image-type + * `input` and others. + */ +button, +html input[type="button"], +input[type="reset"], +input[type="submit"] { + -webkit-appearance: button; + /* 2 */ + cursor: pointer; + /* 3 */ +} + +/** + * Re-set default cursor for disabled elements. + */ +button[disabled], +html input[disabled] { + cursor: default; +} + +/** + * Remove inner padding and border in Firefox 4+. + */ +button::-moz-focus-inner, +input::-moz-focus-inner { + border: 0; + padding: 0; +} + +/** + * Address Firefox 4+ setting `line-height` on `input` using `!important` in + * the UA stylesheet. + */ +input { + line-height: normal; +} + +/** + * It's recommended that you don't attempt to style these elements. + * Firefox's implementation doesn't respect box-sizing, padding, or width. + * + * 1. Address box sizing set to `content-box` in IE 8/9/10. + * 2. Remove excess padding in IE 8/9/10. + */ +input[type="checkbox"], +input[type="radio"] { + box-sizing: border-box; + /* 1 */ + padding: 0; + /* 2 */ +} + +/** + * Fix the cursor style for Chrome's increment/decrement buttons. For certain + * `font-size` values of the `input`, it causes the cursor style of the + * decrement button to change from `default` to `text`. + */ +input[type="number"]::-webkit-inner-spin-button, +input[type="number"]::-webkit-outer-spin-button { + height: auto; +} + +/** + * 1. Address `appearance` set to `searchfield` in Safari and Chrome. + * 2. Address `box-sizing` set to `border-box` in Safari and Chrome + * (include `-moz` to future-proof). + */ +input[type="search"] { + -webkit-appearance: textfield; + /* 1 */ + /* 2 */ + box-sizing: content-box; +} + +/** + * Remove inner padding and search cancel button in Safari and Chrome on OS X. + * Safari (but not Chrome) clips the cancel button when the search input has + * padding (and `textfield` appearance). + */ +input[type="search"]::-webkit-search-cancel-button, +input[type="search"]::-webkit-search-decoration { + -webkit-appearance: none; +} + +/** + * Define consistent border, margin, and padding. + */ +fieldset { + border: 1px solid #c0c0c0; + margin: 0 2px; + padding: 0.35em 0.625em 0.75em; +} + +/** + * 1. Correct `color` not being inherited in IE 8/9/10/11. + * 2. Remove padding so people aren't caught out if they zero out fieldsets. + */ +legend { + border: 0; + /* 1 */ + padding: 0; + /* 2 */ +} + +/** + * Remove default vertical scrollbar in IE 8/9/10/11. + */ +textarea { + overflow: auto; +} + +/** + * Don't inherit the `font-weight` (applied by a rule above). + * NOTE: the default cannot safely be changed in Chrome and Safari on OS X. + */ +optgroup { + font-weight: bold; +} + +/* Tables + ========================================================================== */ +/** + * Remove most spacing between table cells. + */ +table { + border-collapse: collapse; + border-spacing: 0; +} + +td, +th { + padding: 0; +} + +html { + box-sizing: border-box; +} + +*, *:before, *:after { + box-sizing: inherit; +} + +embed, +img, +object, +video { + max-width: 100%; + height: auto; +} diff --git a/gulp-tasks/_config.js b/gulp-tasks/_config.js old mode 100644 new mode 100755 index 82caf57..aae150f --- a/gulp-tasks/_config.js +++ b/gulp-tasks/_config.js @@ -1,20 +1,21 @@ module.exports = { - rtl: true, styles: { - source: ['sass/**/*.scss'], - destination: 'dist/css/', + watch: ['sass/**/*.scss'], + source: ['sass/*.scss'], + destination: 'css/', options: { outputStyle: 'expanded', includePaths: ['./node_modules'] } }, scripts: { - source: ['js/**/*.ts'], - destination: 'dist/js/' + watch: ['ts/*.ts'], + source: ['ts/*.ts'], + destination: 'js/' }, svg: { source: 'images/svg/**/*.svg', - destination: 'dist/images/svg/' + destination: 'images/svg/' }, stylelint: { options: { @@ -37,11 +38,12 @@ module.exports = { }, eslint: { options: { - fix: false + fix: false, + configFilePath:'./.eslintrc' } }, browserSync: { - proxy: null, + proxy: 'http://local.lofi.com/', open: true, xip: false, logConnections: false diff --git a/gulp-tasks/_utils.js b/gulp-tasks/_utils.js old mode 100644 new mode 100755 diff --git a/gulp-tasks/default.js b/gulp-tasks/default.js old mode 100644 new mode 100755 diff --git a/gulp-tasks/lint.js b/gulp-tasks/lint.js old mode 100644 new mode 100755 index 62c60ae..d9a9a25 --- a/gulp-tasks/lint.js +++ b/gulp-tasks/lint.js @@ -21,9 +21,9 @@ module.exports = function lint(gulp, config) { gulp .src(config.scripts.source) .pipe(utils.onDev(plumber())) - .pipe(eslint(config.eslint.options)) - .pipe(eslint.format()) - .pipe(eslint.failAfterError()) + .pipe(eslint()) + // .pipe(eslint.format()) + // .pipe(eslint.failAfterError()) .pipe(utils.onDev(plumber.stop())) ); diff --git a/gulp-tasks/scripts.js b/gulp-tasks/scripts.js old mode 100644 new mode 100755 diff --git a/gulp-tasks/styles.js b/gulp-tasks/styles.js old mode 100644 new mode 100755 index 54cdc16..389b56b --- a/gulp-tasks/styles.js +++ b/gulp-tasks/styles.js @@ -6,7 +6,7 @@ const plumber = require('gulp-plumber'); const autoprefixer = require('autoprefixer'); module.exports = function styles(gulp, config, bs) { - const processors = [autoprefixer(config.autoprefixer)]; + const processors = [autoprefixer()]; gulp.task('styles', () => gulp diff --git a/gulp-tasks/svg.js b/gulp-tasks/svg.js old mode 100644 new mode 100755 diff --git a/gulp-tasks/watch.js b/gulp-tasks/watch.js old mode 100644 new mode 100755 index 58e6b99..8579032 --- a/gulp-tasks/watch.js +++ b/gulp-tasks/watch.js @@ -1,9 +1,8 @@ -module.exports = function watch(gulp, config, bs) { +module.exports = function watch(gulp, config) { gulp.task('watch', () => { - bs.init(config.browserSync); - + // bs.init(config.browserSync); gulp.watch( - [config.styles.source, config.scripts.source], + [...config.styles.watch, ...config.scripts.watch], gulp.series( gulp.parallel('styles:lint', 'scripts:lint'), gulp.parallel('styles', 'scripts') @@ -11,3 +10,4 @@ module.exports = function watch(gulp, config, bs) { ); }); }; + diff --git a/kashmir.info.yml b/kashmir.info.yml index 6b60524..2c387e5 100644 --- a/kashmir.info.yml +++ b/kashmir.info.yml @@ -12,6 +12,7 @@ regions: libraries: - kashmir/reset + - kashmir/global # component-libraries: # atoms: # paths: diff --git a/kashmir.libraries.yml b/kashmir.libraries.yml index 1daa095..c6f20bc 100644 --- a/kashmir.libraries.yml +++ b/kashmir.libraries.yml @@ -2,12 +2,12 @@ reset: version: VERSION css: base: - dist/css/reset.css: {} + css/reset.css: {} global: version: VERSION css: theme: - dist/css/global.css: {} + css/global.css: {} js: - dist/global.js: {} + js/global.js: {} diff --git a/sass/global.scss b/sass/global.scss index 9ec8f55..b15fd94 100644 --- a/sass/global.scss +++ b/sass/global.scss @@ -2,8 +2,8 @@ @import 'config/**/*'; // Theme components based on Atomic Design. -@import '00-atom/**/*'; -@import '01-molecules/**/*'; -@import '02-organisms/**/*'; -@import '03-templates/**/*'; -@import '04-pages/**/*'; +@import '0-atom/**/*'; +@import '1-molecules/**/*'; +@import '2-organisms/**/*'; +@import '3-templates/**/*'; +@import '4-pages/**/*'; diff --git a/ts/.gitkeep b/ts/.gitkeep new file mode 100644 index 0000000..e69de29 From ae114f9c48ecf1829ddd06b26561968bea278bc3 Mon Sep 17 00:00:00 2001 From: drupalastic Date: Tue, 18 Jun 2019 08:50:30 +0530 Subject: [PATCH 2/2] chore cleanup css file --- css/global.css | 4 ---- 1 file changed, 4 deletions(-) diff --git a/css/global.css b/css/global.css index 0c214b8..e69de29 100644 --- a/css/global.css +++ b/css/global.css @@ -1,4 +0,0 @@ -h2 { - color: red; - background-color: blue; -}