diff --git a/.eslintrc b/.eslintrc deleted file mode 100644 index ceb9dfe..0000000 --- a/.eslintrc +++ /dev/null @@ -1,16 +0,0 @@ -{ - "extends": "google", - "env": { - "browser": true - }, - "parserOptions": { - "ecmaVersion": 6, - "sourceType": "script" - }, - "rules": { - "comma-dangle": ["error", "never"], - "max-len": ["error", 100], - "object-curly-spacing": ["error", "always"], - "require-jsdoc": ["off"] - } -} diff --git a/.sass-lint.yml b/.sass-lint.yml deleted file mode 100644 index 01809b0..0000000 --- a/.sass-lint.yml +++ /dev/null @@ -1,90 +0,0 @@ -options: - merge-default-rules: true - max-warnings: 50 - -files: - includes: - - 'src/scss/**/*.scss' - - 'src/scss-demo/**/*.scss' - ignore: - - 'node_modules/**/*.*' - -rules: - attribute-quotes: 2 - brace-style: '1tbs' - border-zero: 1 - class-name-format: - - 2 - - - underscore: false - convention: 'hyphenatedbem' - empty-args: 0 - empty-line-between-blocks: 2 - extends-before-mixins: 2 - extends-before-declarations: 2 - final-newline: 2 - force-attribute-nesting: 0 - force-element-nesting: 0 - force-pseudo-nesting: 0 - function-name-format: 0 - placeholder-in-extend: 2 - leading-zero: - - 2 - - - include: true - mixins-before-declarations: - - 2 - - - exclude: ['breakpoint', 'breakpointRange', 'mq', 'fz-loop', 'screen_only_breakpoint'] - mixin-name-format: - - 0 - nesting-depth: - - 2 - - - max-depth: 3 - no-color-literals: 0 - no-empty-rulesets: 2 - no-trailing-whitespace: 0 - no-debug: 2 - no-ids: 2 - no-important: 0 - no-qualifying-elements: 0 - no-url-domains: 0 - no-url-protocols: 0 - no-vendor-prefixes: 0 - no-warn: 0 - hex-notation: - - 2 - - - style: 'uppercase' - indentation: - - 2 - - - size: 2 - placeholder-name-format: 0 - property-sort-order: - - 2 - - - ignore-custom-properties: true - pseudo-element: 0 - quotes: 'single' - space-after-bang: - - 2 - - - include: false - space-after-comma: 2 - space-after-colon: - - 2 - - - include: true - trailing-semicolon: - - 2 - - - include: true - url-quotes: 2 - variable-name-format: 0 - variable-for-property: - - 0 - - - properties: ['margin', 'content'] - zero-unit: 2 diff --git a/README.md b/README.md index dc21770..307f87c 100644 --- a/README.md +++ b/README.md @@ -1,15 +1,24 @@ -## License +# 🏝️ Marynah 🏝️ -See [here](https://github.com/KonradRolof/DropLoad/blob/master/LICENSE) +A simple GULP setup -## Install +## Installation +Clone the repo into a folder, navigate into the folder and execute +``` yarn install +``` -## Start +## For development -### For building all files -yarn start - -### For developing +This command generates all files, opens the page in the browser and watches for changes +``` yarn dev +``` + +## For building + +This command generates all files +``` +yarn start +``` diff --git a/gulpfile.config.js b/gulpfile.config.js index 96dbb0d..81227f6 100644 --- a/gulpfile.config.js +++ b/gulpfile.config.js @@ -22,7 +22,7 @@ module.exports = { html: { src: 'src/*.html', dist: 'dist', - watch: 'src/*.html' + watch: 'src/**/*.html' }, images: { src: 'src/img/**/*.*', diff --git a/gulpfile.js b/gulpfile.js index ffa0643..8c7c013 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -16,6 +16,7 @@ const gulp = require('gulp'); const del = require('del'); const htmlmin = require('gulp-htmlmin'); const concat = require('gulp-concat'); +const injectPartials = require('gulp-inject-partials'); // load config const CONFIG = require('./gulpfile.config'); @@ -42,37 +43,42 @@ function browserSyncReload(done) { } // compile styles specific for DropLoad -function dlStyles() { - return gulp - .src(CONFIG.styles.src) - .pipe(plumber()) - // normal file - .pipe(sourceMaps.init()) - .pipe(gulpSass({ outputStyle: 'expanded' })) - .pipe(gulp.dest(CONFIG.styles.dist)) - // minified versions - .pipe(rename({ suffix: '.min' })) - .pipe(postCSS([autoprefixer(['last 2 versions']), cssNano()])) - .pipe(gulp.dest(CONFIG.styles.dist)) - // concatenated - .pipe(concat('app.css')) - .pipe(gulp.dest(CONFIG.styles.dist)) - .pipe(browserSync.stream()); +function compileStyles() { + return ( + gulp + .src(CONFIG.styles.src) + .pipe(plumber()) + // normal file + .pipe(sourceMaps.init()) + .pipe(gulpSass({ outputStyle: 'expanded' })) + .pipe(gulp.dest(CONFIG.styles.dist)) + // minified versions + .pipe(rename({ suffix: '.min' })) + .pipe(postCSS([autoprefixer(['last 2 versions']), cssNano()])) + .pipe(gulp.dest(CONFIG.styles.dist)) + // concatenated + .pipe(concat('app.css')) + .pipe(gulp.dest(CONFIG.styles.dist)) + .pipe(browserSync.stream()) + ); } // generate images function copyImages() { - return gulp.src(CONFIG.images.src) - .pipe(changed(CONFIG.images.dist)) - .pipe(gulp.dest(CONFIG.images.dist)) - .pipe(imagemin({ - optimizationLevel: 5, - progressive: true, - svgoPlugins: [{ removeViewBox: false }], - interlaced: true - })) - .pipe(rename({ suffix: '_minified' })) - .pipe(gulp.dest(CONFIG.images.dist)); + return ( + gulp.src(CONFIG.images.src) + .pipe(changed(CONFIG.images.dist)) + .pipe(gulp.dest(CONFIG.images.dist)) + .pipe(imagemin({ + optimizationLevel: 5, + progressive: true, + svgoPlugins: [{ removeViewBox: false }], + interlaced: true + })) + .pipe(rename({ suffix: '_minified' })) + .pipe(gulp.dest(CONFIG.images.dist)) + .pipe(browserSync.stream()) + ); } // generate scripts @@ -96,21 +102,12 @@ function scripts() { ); } - -// file watchers -function watchFiles() { - gulp.watch(CONFIG.styles.watch, gulp.parallel(dlStyles)); - gulp.watch(CONFIG.scripts.watch, gulp.parallel(scripts)); - gulp.watch(CONFIG.html.watch, html, browserSyncReload); - gulp.watch(CONFIG.fonts.watch, fonts, browserSyncReload); - gulp.watch(CONFIG.css.watch, copyCss, browserSyncReload); -} - // copy and minify html function copyHtml() { return ( gulp .src(CONFIG.html.src) + .pipe(injectPartials()) .pipe(gulp.dest(CONFIG.html.dist)) .pipe(htmlmin({ collapseWhitespace: true })) .pipe(rename({ suffix: '_min' })) @@ -135,11 +132,21 @@ function copyCss() { gulp .src(CONFIG.css.src) .pipe(gulp.dest(CONFIG.css.dist)) + .pipe(browserSync.stream()) ); } +// file watchers +function watchFiles() { + gulp.watch(CONFIG.styles.watch, compileStyles, browserSyncReload); + gulp.watch(CONFIG.scripts.watch, scripts, browserSyncReload); + gulp.watch(CONFIG.html.watch, html, browserSyncReload); + gulp.watch(CONFIG.fonts.watch, fonts, browserSyncReload); + gulp.watch(CONFIG.css.watch, styles, browserSyncReload); +} + const js = gulp.parallel(scripts); -const styles = gulp.parallel(dlStyles, copyCss); +const styles = gulp.parallel(compileStyles, copyCss); const images = gulp.parallel(copyImages); const html = gulp.parallel(copyHtml); const fonts = gulp.parallel(copyFonts); diff --git a/package.json b/package.json index 5e87e4a..036c591 100644 --- a/package.json +++ b/package.json @@ -24,6 +24,7 @@ "gulp-environments": "^0.1.2", "gulp-htmlmin": "^5.0.1", "gulp-imagemin": "^5.0.3", + "gulp-inject-partials": "^1.0.5", "gulp-plumber": "^1.2.1", "gulp-postcss": "^8.0.0", "gulp-rename": "^1.4.0", diff --git a/src/css/style.css b/src/css/style.css index 0404877..79fe68a 100644 --- a/src/css/style.css +++ b/src/css/style.css @@ -1,3 +1,3 @@ -* { - color: red; +.check-css-folder { + color: green; } diff --git a/src/html/_checks.html b/src/html/_checks.html new file mode 100644 index 0000000..d707e53 --- /dev/null +++ b/src/html/_checks.html @@ -0,0 +1,16 @@ +

Checks

+
+

If this text is green, the css folder was loaded correctly.

+
+
+

If this text is green, the scss folder was loaded correctly.

+
+
+

If this text is green, the js folder was loaded correctly.

+
+
+

Original Image

+ The image was not loaded correctly or the image was not found. +

Minified Image

+ The minified image was not loaded correctly or the image was not found. +
diff --git a/src/html/_hero.html b/src/html/_hero.html new file mode 100644 index 0000000..88147e1 --- /dev/null +++ b/src/html/_hero.html @@ -0,0 +1,4 @@ +
+

🏝️ Marynah 🏝️

+

A simple GULP setup

+
diff --git a/src/img/screen.jpeg b/src/img/screen.jpeg deleted file mode 100644 index 847d14a..0000000 Binary files a/src/img/screen.jpeg and /dev/null differ diff --git a/src/img/test.png b/src/img/test.png new file mode 100644 index 0000000..594c72b Binary files /dev/null and b/src/img/test.png differ diff --git a/src/index.html b/src/index.html index a44896c..9cc7622 100644 --- a/src/index.html +++ b/src/index.html @@ -1,31 +1,15 @@ - + - - DropLoad + Marynah -
-
-

DropLoad

-

Create a drop element for easy file upload.

- -
-
-
-
-
-
-
- - -
-
-
-
-
- + + + + + diff --git a/src/js/main.js b/src/js/main.js index 2650df5..e4b50ad 100644 --- a/src/js/main.js +++ b/src/js/main.js @@ -1 +1 @@ -document.write('Hello'); +document.write(''); diff --git a/src/scss/main.scss b/src/scss/main.scss index ccd1ca7..3aefccb 100644 --- a/src/scss/main.scss +++ b/src/scss/main.scss @@ -1,52 +1,2 @@ -@import 'partials/dl-functions'; -@import 'partials/dl-settings'; -@import 'partials/dl-element'; -@import 'partials/dl-error-message'; -@import 'partials/dl-default-message'; -@import 'partials/dl-select-button'; -@import 'partials/dl-file-list'; -@import 'partials/dl-file-list__item'; -@import 'partials/dl-file-item'; -@import 'partials/dl-file-name'; -@import 'partials/dl-file-size'; -@import 'partials/dl-remove'; - -.#{$dl-master-selector} { - @include dl-element; - - .dl-error-message { - @include dl-error-message; - } - - .dl-default-message { - @include dl-default-message; - } - - .dl-select-button { - @include dl-select-button; - } - - .dl-file-list { - @include dl-file-list; - } - - .dl-file-list__item { - @include dl-file-list__item; - } - - .dl-file-item { - @include dl-file-item; - } - - .dl-file-name { - @include dl-file-name; - } - - .dl-file-size { - @include dl-file-size; - } - - .dl-remove { - @include dl-remove; - } -} +@import 'partials/page'; +@import 'partials/check'; diff --git a/src/scss/partials/_check.scss b/src/scss/partials/_check.scss new file mode 100644 index 0000000..1039b12 --- /dev/null +++ b/src/scss/partials/_check.scss @@ -0,0 +1,3 @@ +.check-scss-folder { + color: green; +} diff --git a/src/scss/partials/_dl-default-message.scss b/src/scss/partials/_dl-default-message.scss deleted file mode 100644 index f706fd5..0000000 --- a/src/scss/partials/_dl-default-message.scss +++ /dev/null @@ -1,9 +0,0 @@ -@mixin dl-default-message { - color: $dl-dm-color; - font-size: $dl-dm-font-size; - font-weight: $dl-dm-font-weight; - margin: $dl-dm-outer-spacing; - text-align: $dl-dm-text-align; - text-shadow: $dl-dm-text-shadow; - width: $dl-dm-width; -} diff --git a/src/scss/partials/_dl-element.scss b/src/scss/partials/_dl-element.scss deleted file mode 100644 index 0eb5a48..0000000 --- a/src/scss/partials/_dl-element.scss +++ /dev/null @@ -1,45 +0,0 @@ -@mixin dl-element { - align-items: center; - background-color: $dl-elm-background-color; - border: $dl-elm-border; - border-radius: $dl-elm-border-radius; - box-sizing: border-box; - color: $dl-elm-color; - display: flex; - flex-direction: column; - height: $dl-elm-height; - justify-content: center; - margin: $dl-elm-outer-spacing; - padding: $dl-elm-inner-spacing; - transition: $dl-elm-transition; - width: $dl-elm-width; - - &.dl-dragged { - background-color: $dl-elm-dragged-background; - } - - &.dl-error { - background-color: $dl-elm-error-background; - border: $dl-elm-error-border; - } - - *, - *::before, - *::after { - box-sizing: border-box; - } - - &.dl-initialized { - .dl-fallback { - height: 0; - overflow: hidden; - position: absolute; - visibility: hidden; - width: 0; - } - } - - .dl-file-input { - display: none; - } -} diff --git a/src/scss/partials/_dl-error-message.scss b/src/scss/partials/_dl-error-message.scss deleted file mode 100644 index 5b8b84c..0000000 --- a/src/scss/partials/_dl-error-message.scss +++ /dev/null @@ -1,9 +0,0 @@ -@mixin dl-error-message { - color: $dl-err-color; - font-size: $dl-err-font-size; - font-weight: $dl-err-font-weight; - margin: $dl-err-outer-spacing; - padding: $dl-err-inner-spacing; - text-align: $dl-err-text-align; - width: $dl-err-width; -} diff --git a/src/scss/partials/_dl-file-item.scss b/src/scss/partials/_dl-file-item.scss deleted file mode 100644 index 5ca35ff..0000000 --- a/src/scss/partials/_dl-file-item.scss +++ /dev/null @@ -1,9 +0,0 @@ -@mixin dl-file-item { - align-items: $dl-file-item-alignment; - display: flex; - flex-direction: $dl-file-item-direction; - justify-content: $dl-file-item-justify; - margin: $dl-file-item-outer-spacing; - padding: $dl-file-item-inner-spacing; - width: $dl-file-item-width; -} diff --git a/src/scss/partials/_dl-file-list.scss b/src/scss/partials/_dl-file-list.scss deleted file mode 100644 index 7822c5f..0000000 --- a/src/scss/partials/_dl-file-list.scss +++ /dev/null @@ -1,6 +0,0 @@ -@mixin dl-file-list { - list-style: $dl-file-ul-list-style; - margin: $dl-file-ul-outer-spacing; - padding: $dl-file-ul-inner-spacing; - width: $dl-file-ul-width; -} diff --git a/src/scss/partials/_dl-file-list__item.scss b/src/scss/partials/_dl-file-list__item.scss deleted file mode 100644 index 5afe864..0000000 --- a/src/scss/partials/_dl-file-list__item.scss +++ /dev/null @@ -1,11 +0,0 @@ -@mixin dl-file-list__item { - background: $dl-file-li-background; - border-bottom: $dl-file-li-border-bottom; - list-style: $dl-file-li-list-style; - margin: $dl-file-li-outer-spacing; - padding: $dl-file-li-inner-spacing; - - &:last-child { - border-bottom: $dl-file-li-border-last; - } -} diff --git a/src/scss/partials/_dl-file-name.scss b/src/scss/partials/_dl-file-name.scss deleted file mode 100644 index 2fc62c1..0000000 --- a/src/scss/partials/_dl-file-name.scss +++ /dev/null @@ -1,8 +0,0 @@ -@mixin dl-file-name { - color: $dl-fi-name-color; - font-size: $dl-fi-name-font-size; - font-weight: $dl-fi-name-font-weight; - margin-left: 0; - margin-right: auto; - padding: $dl-fi-name-inner-spacing; -} diff --git a/src/scss/partials/_dl-file-size.scss b/src/scss/partials/_dl-file-size.scss deleted file mode 100644 index 512e26a..0000000 --- a/src/scss/partials/_dl-file-size.scss +++ /dev/null @@ -1,6 +0,0 @@ -@mixin dl-file-size { - color: $dl-fi-size-color; - font-size: $dl-fi-size-font-size; - font-weight: $dl-fi-size-font-weight; - padding: $dl-fi-size-inner-padding; -} diff --git a/src/scss/partials/_dl-functions.scss b/src/scss/partials/_dl-functions.scss deleted file mode 100644 index b545222..0000000 --- a/src/scss/partials/_dl-functions.scss +++ /dev/null @@ -1,7 +0,0 @@ -@function get-active-color($color) { - @return darken($color, 7%); -} - -@function get-hover-color($color) { - @return lighten($color, 10%); -} diff --git a/src/scss/partials/_dl-remove.scss b/src/scss/partials/_dl-remove.scss deleted file mode 100644 index 27ed7f8..0000000 --- a/src/scss/partials/_dl-remove.scss +++ /dev/null @@ -1,32 +0,0 @@ -@mixin dl-remove { - -webkit-appearance: none; - align-items: center; - background: $fl-rbt-background; - border: $dl-rbt-border$dl-rbt-border; - border-radius: $dl-rbt-border-radius; - color: $dl-rbt-color; - cursor: pointer; - display: inline-flex; - font-size: $dl-rbt-font-size; - font-weight: $dl-rbt-font-weight; - height: $dl-rbt-height; - justify-content: center; - line-height: $dl-rbt-line-height; - margin: $dl-rbt-outer-spacing; - padding: $dl-rbt-inner-spacing; - text-transform: $dl-rbt-text-transform; - - &:active { - background-color: $dl-rbt-active-background; - border: $dl-rbt-active-border; - color: $dl-rbt-active-color; - } - - &:hover, - &:focus { - background-color: $dl-rbt-hover-background; - border: $dl-rbt-hover-border; - color: $dl-rbt-hover-color; - outline: 0; - } -} diff --git a/src/scss/partials/_dl-select-button.scss b/src/scss/partials/_dl-select-button.scss deleted file mode 100644 index c6cac0c..0000000 --- a/src/scss/partials/_dl-select-button.scss +++ /dev/null @@ -1,28 +0,0 @@ -@mixin dl-select-button { - background: $dl-sbt-background; - border: $dl-sbt-border; - border-radius: $dl-sbt-border-radius; - box-shadow: $dl-sbt-box-shadow; - color: $dl-sbt-color; - cursor: pointer; - display: inline-flex; - font-size: $dl-sbt-font-size; - margin: $dl-sbt-outer-spacing; - padding: $dl-sbt-inner-spacing; - text-transform: $dl-sbt-text-transform; - transition: $dl-sbt-transition; - - &:active { - background-color: $dl-sbt-active-background; - border: $dl-sbt-active-border; - color: $dl-sbt-active-color; - } - - &:hover, - &:focus { - background-color: $dl-sbt-hover-background; - border: $dl-sbt-hover-border; - color: $dl-sbt-hover-color; - outline: 0; - } -} diff --git a/src/scss/partials/_dl-settings.scss b/src/scss/partials/_dl-settings.scss deleted file mode 100644 index caf895a..0000000 --- a/src/scss/partials/_dl-settings.scss +++ /dev/null @@ -1,115 +0,0 @@ -// colors -$dl-gray-0: #FFF; -$dl-gray-1: #ECEFF1; -$dl-gray-2: #78909C; -$dl-gray-3: #455A64; -$dl-gray-4: #37474F; -$dl-black: #000; - -// general -$dl-master-selector: dropload; -$dl-transition-speed: 0.2s !default; -$dl-transition-ease: linear !default; - -// drop element -$dl-elm-background-color: $dl-gray-2 !default; -$dl-elm-border: 2px dashed $dl-gray-3 !default; -$dl-elm-border-radius: 10px !default; -$dl-elm-color: $dl-gray-0 !default; -$dl-elm-height: 150px !default; -$dl-elm-outer-spacing: 1rem 0; -$dl-elm-inner-spacing: 15px !default; -$dl-elm-transition: background-color $dl-transition-speed $dl-transition-ease !default; -$dl-elm-width: 100% !default; -$dl-elm-dragged-background: get-hover-color($dl-elm-background-color) !default; -$dl-elm-error-background: $dl-elm-background-color !default; -$dl-elm-error-border: 2px dashed #E53935 !default; - -// error messages -$dl-err-color: #FFCDD2 !default; -$dl-err-font-size: 0.9em !default; -$dl-err-font-weight: 400 !default; -$dl-err-outer-spacing: 0 0 0.3em !default; -$dl-err-inner-spacing: 0 !default; -$dl-err-text-align: center !default; -$dl-err-width: 100% !default; - -// default message -$dl-dm-color: $dl-gray-0 !default; -$dl-dm-font-size: 1em !default; -$dl-dm-font-weight: 400 !default; -$dl-dm-outer-spacing: 0 0 0.3em !default; -$dl-dm-text-align: center !default; -$dl-dm-text-shadow: 0 0 3px rgba($dl-black, 0.4) !default; -$dl-dm-width: 100% !default; - -// select button -$dl-sbt-background: $dl-gray-1 !default; -$dl-sbt-border: 0 !default; -$dl-sbt-border-radius: 3px !default; -$dl-sbt-box-shadow: 0 1px 3px rgba($dl-black, 0.2) !default; -$dl-sbt-color: $dl-gray-4 !default; -$dl-sbt-font-size: 0.85em !default; -$dl-sbt-outer-spacing: 0 auto 0.3em !default; -$dl-sbt-inner-spacing: 0.5em 0.8em !default; -$dl-sbt-text-transform: uppercase !default; -$dl-sbt-transition: background-color $dl-transition-speed $dl-transition-speed !default; -$dl-sbt-active-background: get-active-color($dl-sbt-background) !default; -$dl-sbt-active-border: 0 !default; -$dl-sbt-active-color: $dl-sbt-color !default; -$dl-sbt-hover-background: get-hover-color($dl-sbt-background) !default; -$dl-sbt-hover-border: 0 !default; -$dl-sbt-hover-color: $dl-sbt-color !default; - -// file list -$dl-file-ul-list-style: none !default; -$dl-file-ul-outer-spacing: 0 0 0 0.3em !default; -$dl-file-ul-inner-spacing: 0 !default; -$dl-file-ul-width: 100% !default; - -// file list item -$dl-file-li-background: none !default; -$dl-file-li-border-bottom: 1px solid $dl-gray-1 !default; -$dl-file-li-list-style: $dl-file-ul-list-style !default; -$dl-file-li-outer-spacing: 0 !default; -$dl-file-li-inner-spacing: 0 !default; -$dl-file-li-border-last: 0 !default; - -// file item -$dl-file-item-alignment: center !default; -$dl-file-item-direction: row !default; -$dl-file-item-justify: flex-end !default; -$dl-file-item-outer-spacing: 0 !default; -$dl-file-item-inner-spacing: 5px 8px !default; -$dl-file-item-width: 100% !default; - -// file item name -$dl-fi-name-color: inherit !default; -$dl-fi-name-font-size: inherit !default; -$dl-fi-name-font-weight: inherit !default; -$dl-fi-name-inner-spacing: 0 !default; - -// file item size -$dl-fi-size-color: inherit !default; -$dl-fi-size-font-size: inherit !default; -$dl-fi-size-font-weight: inherit !default; -$dl-fi-size-inner-padding: 0 1rem 0 0 !default; - -// file item remove button -$fl-rbt-background: $dl-gray-3 !default; -$dl-rbt-border: 0 !default; -$dl-rbt-border-radius: 3px !default; -$dl-rbt-color: $dl-gray-0 !default; -$dl-rbt-font-size: 0.8em !default; -$dl-rbt-font-weight: 400 !default; -$dl-rbt-height: 1.8em !default; -$dl-rbt-line-height: $dl-rbt-height !default; -$dl-rbt-outer-spacing: 0 !default; -$dl-rbt-inner-spacing: 0 0.8em !default; -$dl-rbt-text-transform: uppercase !default; -$dl-rbt-active-background: get-active-color($fl-rbt-background) !default; -$dl-rbt-active-border: $dl-rbt-border !default; -$dl-rbt-active-color: $dl-rbt-color !default; -$dl-rbt-hover-background: get-hover-color($fl-rbt-background) !default; -$dl-rbt-hover-border: $dl-rbt-border !default; -$dl-rbt-hover-color: $dl-rbt-color !default; diff --git a/src/scss/partials/_page.scss b/src/scss/partials/_page.scss new file mode 100644 index 0000000..0c92020 --- /dev/null +++ b/src/scss/partials/_page.scss @@ -0,0 +1,10 @@ +body { + margin: 25px auto; + background: #EEE; + max-width: 50em; + line-height: 1.5; + font-size: 20px; + color: #444; + font-family: sans-serif; + padding: 0 10px; +} diff --git a/yarn.lock b/yarn.lock index 65a5d6b..29f6e46 100644 --- a/yarn.lock +++ b/yarn.lock @@ -120,6 +120,11 @@ ansi-colors@^1.0.1: dependencies: ansi-wrap "^0.1.0" +ansi-colors@~3.2.4: + version "3.2.4" + resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.4.tgz#e3a3da4bfbae6c86a9c285625de124a234026fbf" + integrity sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA== + ansi-cyan@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/ansi-cyan/-/ansi-cyan-0.1.1.tgz#538ae528af8982f28ae30d86f2f17456d2609873" @@ -1732,6 +1737,11 @@ duplexer3@^0.1.4: resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2" integrity sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI= +duplexer@^0.1.1, duplexer@~0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1" + integrity sha1-rOb/gIwc5mtX0ev5eXessCM0z8E= + duplexify@^3.5.0, duplexify@^3.6.0: version "3.7.1" resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.7.1.tgz#2a4df5317f6ccfd91f86d6fd25d8d8a103b88309" @@ -2051,6 +2061,19 @@ event-emitter@^0.3.5: d "1" es5-ext "~0.10.14" +event-stream@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/event-stream/-/event-stream-4.0.1.tgz#4092808ec995d0dd75ea4580c1df6a74db2cde65" + integrity sha512-qACXdu/9VHPBzcyhdOWR5/IahhGMf0roTeZJfzz077GwylcDd90yOHLouhmv7GJ5XzPi6ekaQWd8AvPP2nOvpA== + dependencies: + duplexer "^0.1.1" + from "^0.1.7" + map-stream "0.0.7" + pause-stream "^0.0.11" + split "^1.0.1" + stream-combiner "^0.2.2" + through "^2.3.8" + eventemitter3@1.x.x: version "1.2.0" resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-1.2.0.tgz#1c86991d816ad1e504750e73874224ecf3bec508" @@ -2216,7 +2239,7 @@ extsprintf@^1.2.0: resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f" integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8= -fancy-log@^1.3.2: +fancy-log@^1.3.2, fancy-log@~1.3.3: version "1.3.3" resolved "https://registry.yarnpkg.com/fancy-log/-/fancy-log-1.3.3.tgz#dbc19154f558690150a23953a0adbd035be45fc7" integrity sha512-k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw== @@ -2501,6 +2524,11 @@ from2@^2.1.1: inherits "^2.0.1" readable-stream "^2.0.0" +from@^0.1.7: + version "0.1.7" + resolved "https://registry.yarnpkg.com/from/-/from-0.1.7.tgz#83c60afc58b9c56997007ed1a768b3ab303a44fe" + integrity sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4= + fs-constants@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad" @@ -2923,6 +2951,20 @@ gulp-imagemin@^5.0.3: imagemin-optipng "^6.0.0" imagemin-svgo "^7.0.0" +gulp-inject-partials@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/gulp-inject-partials/-/gulp-inject-partials-1.0.5.tgz#2a2fe5086585bd0fa6293d0470b43c8b4d01f9da" + integrity sha512-CdhVc1OnPrrsiiV7ldKT5ytBBQQ0EJw2Ob5IFJt81WLPNdSs5+NvEKm2v0o1medGD5FetLh2BLgZtfCqusy/Yg== + dependencies: + ansi-colors "~3.2.4" + escape-string-regexp "^1.0.5" + event-stream "^4.0.1" + fancy-log "~1.3.3" + plugin-error "^0.1.2" + strip-bom-buf "1.0.0" + through2 "^3.0.1" + vinyl "^2.2.0" + gulp-match@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/gulp-match/-/gulp-match-1.0.3.tgz#91c7c0d7f29becd6606d57d80a7f8776a87aba8e" @@ -4181,6 +4223,11 @@ map-obj@^1.0.0, map-obj@^1.0.1: resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d" integrity sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0= +map-stream@0.0.7: + version "0.0.7" + resolved "https://registry.yarnpkg.com/map-stream/-/map-stream-0.0.7.tgz#8a1f07896d82b10926bd3744a2420009f88974a8" + integrity sha1-ih8HiW2CsQkmvTdEokIACfiJdKg= + map-visit@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f" @@ -5108,6 +5155,13 @@ path-type@^3.0.0: dependencies: pify "^3.0.0" +pause-stream@^0.0.11: + version "0.0.11" + resolved "https://registry.yarnpkg.com/pause-stream/-/pause-stream-0.0.11.tgz#fe5a34b0cbce12b5aa6a2b403ee2e73b602f1445" + integrity sha1-/lo0sMvOErWqaitAPuLnO2AvFEU= + dependencies: + through "~2.3" + pend@~1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50" @@ -5644,6 +5698,15 @@ read-pkg@^1.0.0: normalize-package-data "^2.3.2" path-type "^1.0.0" +"readable-stream@2 || 3": + version "3.2.0" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.2.0.tgz#de17f229864c120a9f56945756e4f32c4045245d" + integrity sha512-RV20kLjdmpZuTF1INEb9IA3L68Nmi+Ri7ppZqo78wj//Pn62fCoJyV9zalccNzDD/OuJpMG4f+pfMl8+L6QdGw== + dependencies: + inherits "^2.0.3" + string_decoder "^1.1.1" + util-deprecate "^1.0.1" + readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.0, readable-stream@^2.3.3, readable-stream@^2.3.5, readable-stream@^2.3.6, readable-stream@~2.3.6: version "2.3.6" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf" @@ -6306,6 +6369,13 @@ split-string@^3.0.1, split-string@^3.0.2: dependencies: extend-shallow "^3.0.0" +split@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/split/-/split-1.0.1.tgz#605bd9be303aa59fb35f9229fbea0ddec9ea07d9" + integrity sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg== + dependencies: + through "2" + sprintf-js@~1.0.2: version "1.0.3" resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" @@ -6375,6 +6445,14 @@ stdout-stream@^1.4.0: dependencies: readable-stream "^2.0.1" +stream-combiner@^0.2.2: + version "0.2.2" + resolved "https://registry.yarnpkg.com/stream-combiner/-/stream-combiner-0.2.2.tgz#aec8cbac177b56b6f4fa479ced8c1912cee52858" + integrity sha1-rsjLrBd7Vrb0+kec7YwZEs7lKFg= + dependencies: + duplexer "~0.1.1" + through "~2.3.4" + stream-exhaust@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/stream-exhaust/-/stream-exhaust-1.0.2.tgz#acdac8da59ef2bc1e17a2c0ccf6c320d120e555d" @@ -6424,6 +6502,13 @@ string-width@^3.0.0: is-fullwidth-code-point "^2.0.0" strip-ansi "^5.0.0" +string_decoder@^1.1.1: + version "1.2.0" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.2.0.tgz#fe86e738b19544afe70469243b2a1ee9240eae8d" + integrity sha512-6YqyX6ZWEYguAxgZzHGL7SsCeGx3V2TtOTqZz1xSTSWnqsbWwbptafNyvf/ACquZUXV3DANr5BDIwNYe1mN42w== + dependencies: + safe-buffer "~5.1.0" + string_decoder@~1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" @@ -6452,6 +6537,13 @@ strip-ansi@^5.0.0: dependencies: ansi-regex "^4.0.0" +strip-bom-buf@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/strip-bom-buf/-/strip-bom-buf-1.0.0.tgz#1cb45aaf57530f4caf86c7f75179d2c9a51dd572" + integrity sha1-HLRar1dTD0yvhsf3UXnSyaUd1XI= + dependencies: + is-utf8 "^0.2.1" + strip-bom-string@1.X: version "1.0.0" resolved "https://registry.yarnpkg.com/strip-bom-string/-/strip-bom-string-1.0.0.tgz#e5211e9224369fbb81d633a2f00044dc8cedad92" @@ -6660,7 +6752,14 @@ through2@2.X, through2@^2.0.0, through2@^2.0.1, through2@^2.0.3, through2@~2.0.0 readable-stream "~2.3.6" xtend "~4.0.1" -through@^2.3.6, through@^2.3.8: +through2@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/through2/-/through2-3.0.1.tgz#39276e713c3302edf9e388dd9c812dd3b825bd5a" + integrity sha512-M96dvTalPT3YbYLaKaCuwu+j06D/8Jfib0o/PxbVt6Amhv3dUAtW6rTV1jPgJSBG83I/e04Y6xkVdVhSRhi0ww== + dependencies: + readable-stream "2 || 3" + +through@2, through@^2.3.6, through@^2.3.8, through@~2.3, through@~2.3.4: version "2.3.8" resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU= @@ -6964,7 +7063,7 @@ use@^3.1.0: resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f" integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ== -util-deprecate@~1.0.1: +util-deprecate@^1.0.1, util-deprecate@~1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= @@ -7064,7 +7163,7 @@ vinyl-sourcemaps-apply@^0.2.0, vinyl-sourcemaps-apply@^0.2.1: dependencies: source-map "^0.5.1" -vinyl@^2.0.0: +vinyl@^2.0.0, vinyl@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-2.2.0.tgz#d85b07da96e458d25b2ffe19fece9f2caa13ed86" integrity sha512-MBH+yP0kC/GQ5GwBqrTPTzEfiiLjta7hTtvQtbxBgTeSXsmKQRQecjibMbxIXzVT3Y9KJK+drOz1/k+vsu8Nkg==