From 5a06191793a5615e79b0e1b3b4beac92df83aebf Mon Sep 17 00:00:00 2001 From: Rachel Date: Wed, 22 May 2019 13:41:43 -0400 Subject: [PATCH 01/43] Installed Rivet stylelint package and incorporated appropriate gulp tasks --- .stylelintrc | 15 +--- gulpfile.js | 33 ++++++--- package-lock.json | 177 ++++++++++++++++++++++++++++++++++++---------- package.json | 4 +- 4 files changed, 166 insertions(+), 63 deletions(-) diff --git a/.stylelintrc b/.stylelintrc index 53db4e40..36d58cf6 100644 --- a/.stylelintrc +++ b/.stylelintrc @@ -1,16 +1,3 @@ { - "defaultSeverity": "warning", - "rules": { - "block-closing-brace-newline-after": "always", - "block-opening-brace-newline-after": "always", - "block-closing-brace-newline-before": "always", - "block-opening-brace-space-before": "always", - "color-hex-case": "lower", - "selector-list-comma-newline-after": "always", - "indentation": 2, - "number-leading-zero": never, - "declaration-colon-space-after": "always-single-line", - "declaration-block-semicolon-newline-after": "always", - "rule-empty-line-before": ["always", { except: ["first-nested"] }] - } + "extends": "stylelint-config-rivet" } \ No newline at end of file diff --git a/gulpfile.js b/gulpfile.js index 23b3b6e3..b71330fa 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -11,7 +11,7 @@ const reporter = require("postcss-reporter"); const requireDir = require("require-dir"); const sass = require("gulp-sass"); const scss = require("postcss-scss"); -const stylelint = require("stylelint"); +const stylelint = require("gulp-stylelint"); const uglify = require("gulp-uglify"); const bannerPackage = require("./config/banner"); @@ -36,16 +36,27 @@ function compileSass() { } // List .scss files. See .stylelintrc for config -function lintSass() { - return src(["src/sass/**/*.scss", "!src/sass/libs/**/*.scss"]).pipe( - postcss([stylelint(), reporter({ clearMessages: true })], { - syntax: scss - }) - ); +function lintSassWatch() { + return src(["src/sass/**/*.scss", "!src/sass/libs/**/*.scss"]) + .pipe(stylelint({ + failAfterError: false, + reporters: [ + {formatter: 'string', console: true} + ] + })); +} + +function lintSassBuild() { + return src(["src/sass/**/*.scss", "!src/sass/libs/**/*.scss"]) + .pipe(stylelint({ + reporters: [ + {formatter: 'string', console: true} + ] + })); } function watchSass(callback) { - watch("src/sass/**/*.scss", series(compileSass, lintSass)); + watch("src/sass/**/*.scss", series(compileSass, lintSassWatch)); callback(); } @@ -220,6 +231,7 @@ function example(callback) { } exports.release = series( + lintSassBuild, compileSass, lintJSBuild, concatJS, @@ -236,6 +248,7 @@ exports.release = series( ); exports.build = series( + lintSassBuild, compileSass, lintJSBuild, concatJS, @@ -247,7 +260,7 @@ exports.build = series( exports.fractalBuild = fractalBuild; exports.headless = series(compileSass, - lintSass, + lintSassWatch, lintJSWatch, concatJS, fractalHeadless, @@ -257,7 +270,7 @@ exports.headless = series(compileSass, exports.default = series( compileSass, - lintSass, + lintSassWatch, lintJSWatch, concatJS, fractalStart, diff --git a/package-lock.json b/package-lock.json index 2282ba70..0cdcc5e9 100755 --- a/package-lock.json +++ b/package-lock.json @@ -1505,7 +1505,7 @@ "dependencies": { "acorn": { "version": "3.3.0", - "resolved": "http://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz", "integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo=", "dev": true } @@ -1988,7 +1988,7 @@ }, "autoprefixer": { "version": "7.2.6", - "resolved": "http://registry.npmjs.org/autoprefixer/-/autoprefixer-7.2.6.tgz", + "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-7.2.6.tgz", "integrity": "sha512-Iq8TRIB+/9eQ8rbGhcP7ct5cYb/3qjNYAR2SnzLCEcwF6rvVOax8+9+fccgXk4bEhQGjOZd5TLhsksmAdsbGqQ==", "dev": true, "requires": { @@ -2077,7 +2077,7 @@ }, "babel-helper-is-nodes-equiv": { "version": "0.0.1", - "resolved": "http://registry.npmjs.org/babel-helper-is-nodes-equiv/-/babel-helper-is-nodes-equiv-0.0.1.tgz", + "resolved": "https://registry.npmjs.org/babel-helper-is-nodes-equiv/-/babel-helper-is-nodes-equiv-0.0.1.tgz", "integrity": "sha1-NOmzALFHnd2Y7HfqC76TQt/jloQ=", "dev": true }, @@ -2625,7 +2625,7 @@ }, "boxen": { "version": "0.6.0", - "resolved": "http://registry.npmjs.org/boxen/-/boxen-0.6.0.tgz", + "resolved": "https://registry.npmjs.org/boxen/-/boxen-0.6.0.tgz", "integrity": "sha1-g2TUJIrDT/DvGy8r9JpsYM4NgbY=", "dev": true, "requires": { @@ -3401,7 +3401,7 @@ }, "chalk": { "version": "1.1.3", - "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", "dev": true, "requires": { @@ -3570,7 +3570,7 @@ "dependencies": { "lodash": { "version": "3.10.1", - "resolved": "http://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz", "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=", "dev": true } @@ -5277,7 +5277,7 @@ }, "eslint": { "version": "4.19.1", - "resolved": "http://registry.npmjs.org/eslint/-/eslint-4.19.1.tgz", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-4.19.1.tgz", "integrity": "sha512-bT3/1x1EbZB7phzYu7vCr1v3ONuzDtX8WjuM9c0iYxe+cq+pwcKEoQjl7zd3RpC6YOLgnSy3cTN58M2jcoPDIQ==", "dev": true, "requires": { @@ -5375,7 +5375,7 @@ }, "external-editor": { "version": "2.2.0", - "resolved": "http://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz", + "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz", "integrity": "sha512-bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A==", "dev": true, "requires": { @@ -5758,7 +5758,7 @@ }, "external-editor": { "version": "1.1.1", - "resolved": "http://registry.npmjs.org/external-editor/-/external-editor-1.1.1.tgz", + "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-1.1.1.tgz", "integrity": "sha1-Etew24UPf/fnCBuvQAVwAGDEYAs=", "dev": true, "requires": { @@ -6768,7 +6768,7 @@ "dependencies": { "jsonfile": { "version": "2.4.0", - "resolved": "http://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz", "integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=", "dev": true, "requires": { @@ -7984,7 +7984,7 @@ }, "got": { "version": "5.7.1", - "resolved": "http://registry.npmjs.org/got/-/got-5.7.1.tgz", + "resolved": "https://registry.npmjs.org/got/-/got-5.7.1.tgz", "integrity": "sha1-X4FjWmHkplifGAVp6k44FoClHzU=", "dev": true, "requires": { @@ -8445,6 +8445,82 @@ "vinyl": "^1.0.0" } }, + "gulp-stylelint": { + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/gulp-stylelint/-/gulp-stylelint-9.0.0.tgz", + "integrity": "sha512-JoYzy68jc26Z53ZtCJq9teZ81u3QS5DUwoRKHkPbs6k0xpafOVYnRIoOCDGc59vRWTvMDahxyaTlNvolCzr+sA==", + "dev": true, + "requires": { + "chalk": "^2.4.2", + "fancy-log": "^1.3.3", + "mkdirp": "^0.5.1", + "plugin-error": "^1.0.1", + "source-map": "^0.7.3", + "strip-ansi": "^5.2.0", + "through2": "^3.0.1" + }, + "dependencies": { + "ansi-regex": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", + "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", + "dev": true + }, + "ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, + "requires": { + "color-convert": "^1.9.0" + } + }, + "chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "dev": true, + "requires": { + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" + } + }, + "source-map": { + "version": "0.7.3", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz", + "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==", + "dev": true + }, + "strip-ansi": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "dev": true, + "requires": { + "ansi-regex": "^4.1.0" + } + }, + "supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + }, + "through2": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.1.tgz", + "integrity": "sha512-M96dvTalPT3YbYLaKaCuwu+j06D/8Jfib0o/PxbVt6Amhv3dUAtW6rTV1jPgJSBG83I/e04Y6xkVdVhSRhi0ww==", + "dev": true, + "requires": { + "readable-stream": "2 || 3" + } + } + } + }, "gulp-uglify": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/gulp-uglify/-/gulp-uglify-3.0.1.tgz", @@ -8750,7 +8826,7 @@ }, "http-errors": { "version": "1.6.3", - "resolved": "http://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz", "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=", "dev": true, "requires": { @@ -8962,7 +9038,7 @@ }, "inquirer": { "version": "1.2.3", - "resolved": "http://registry.npmjs.org/inquirer/-/inquirer-1.2.3.tgz", + "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-1.2.3.tgz", "integrity": "sha1-TexvMvN+97sLLtPx0aXD9UUHSRg=", "dev": true, "requires": { @@ -9228,7 +9304,7 @@ }, "is-obj": { "version": "1.0.1", - "resolved": "http://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz", + "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz", "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=", "dev": true }, @@ -9817,7 +9893,7 @@ }, "load-json-file": { "version": "1.1.0", - "resolved": "http://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", + "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", "dev": true, "requires": { @@ -9851,7 +9927,7 @@ }, "yargs": { "version": "6.6.0", - "resolved": "http://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz", "integrity": "sha1-eC7CHvQDNF+DCoCMo9UTr1YGUgg=", "dev": true, "requires": { @@ -10688,7 +10764,7 @@ }, "minimist": { "version": "1.2.0", - "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", "dev": true }, @@ -10737,7 +10813,7 @@ }, "mkdirp": { "version": "0.5.1", - "resolved": "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", "dev": true, "requires": { @@ -10746,7 +10822,7 @@ "dependencies": { "minimist": { "version": "0.0.8", - "resolved": "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", "dev": true } @@ -10996,7 +11072,7 @@ }, "node-localstorage": { "version": "0.6.0", - "resolved": "http://registry.npmjs.org/node-localstorage/-/node-localstorage-0.6.0.tgz", + "resolved": "https://registry.npmjs.org/node-localstorage/-/node-localstorage-0.6.0.tgz", "integrity": "sha1-RaBgHGky395mRKIzYfG+Fzx1068=", "dev": true }, @@ -11275,7 +11351,7 @@ }, "yargs": { "version": "3.32.0", - "resolved": "http://registry.npmjs.org/yargs/-/yargs-3.32.0.tgz", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.32.0.tgz", "integrity": "sha1-AwiOnr+edWtpdRYR0qXvWRSCyZU=", "dev": true, "requires": { @@ -11513,7 +11589,7 @@ }, "onetime": { "version": "1.1.0", - "resolved": "http://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz", "integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=", "dev": true }, @@ -11525,7 +11601,7 @@ }, "opn": { "version": "5.3.0", - "resolved": "http://registry.npmjs.org/opn/-/opn-5.3.0.tgz", + "resolved": "https://registry.npmjs.org/opn/-/opn-5.3.0.tgz", "integrity": "sha512-bYJHo/LOmoTd+pfiYhfZDnf9zekVJrY+cnS2a5F2x+w5ppvTqObojTP7WiFG+kVZs9Inw+qQ/lw7TroWwhdd2g==", "dev": true, "requires": { @@ -11544,7 +11620,7 @@ "dependencies": { "minimist": { "version": "0.0.10", - "resolved": "http://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz", "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=", "dev": true } @@ -11574,7 +11650,7 @@ }, "ora": { "version": "0.2.3", - "resolved": "http://registry.npmjs.org/ora/-/ora-0.2.3.tgz", + "resolved": "https://registry.npmjs.org/ora/-/ora-0.2.3.tgz", "integrity": "sha1-N1J9Igrc1Tw5tzVx11QVbV22V6Q=", "dev": true, "requires": { @@ -11601,7 +11677,7 @@ }, "os-locale": { "version": "1.4.0", - "resolved": "http://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz", + "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz", "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=", "dev": true, "requires": { @@ -11668,7 +11744,7 @@ }, "package-json": { "version": "2.4.0", - "resolved": "http://registry.npmjs.org/package-json/-/package-json-2.4.0.tgz", + "resolved": "https://registry.npmjs.org/package-json/-/package-json-2.4.0.tgz", "integrity": "sha1-DRW9Z9HLvduyyiIv8u24a8sxqLs=", "dev": true, "requires": { @@ -12178,7 +12254,7 @@ "dependencies": { "readable-stream": { "version": "1.0.34", - "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", "dev": true, "requires": { @@ -12480,7 +12556,7 @@ }, "opn": { "version": "3.0.3", - "resolved": "http://registry.npmjs.org/opn/-/opn-3.0.3.tgz", + "resolved": "https://registry.npmjs.org/opn/-/opn-3.0.3.tgz", "integrity": "sha1-ttmec5n3jWXDuq/+8fsojpuFJDo=", "dev": true, "requires": { @@ -14315,7 +14391,7 @@ }, "readable-stream": { "version": "2.3.6", - "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", "dev": true, "requires": { @@ -14664,7 +14740,7 @@ }, "reduce-css-calc": { "version": "1.3.0", - "resolved": "http://registry.npmjs.org/reduce-css-calc/-/reduce-css-calc-1.3.0.tgz", + "resolved": "https://registry.npmjs.org/reduce-css-calc/-/reduce-css-calc-1.3.0.tgz", "integrity": "sha1-dHyRTgSWFKTJz7umKYca0dKSdxY=", "dev": true, "requires": { @@ -16809,6 +16885,31 @@ } } }, + "stylelint-config-recommended": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/stylelint-config-recommended/-/stylelint-config-recommended-2.2.0.tgz", + "integrity": "sha512-bZ+d4RiNEfmoR74KZtCKmsABdBJr4iXRiCso+6LtMJPw5rd/KnxUWTxht7TbafrTJK1YRjNgnN0iVZaJfc3xJA==", + "dev": true + }, + "stylelint-config-rivet": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/stylelint-config-rivet/-/stylelint-config-rivet-1.0.0.tgz", + "integrity": "sha512-BvU5WQNn9YbxRcG3RPCPw6sPAtsPks5xkc3xzcQMCAPajhVoLyirgNBrlQcT8fP/QXgH8gCR9kXmjD6f1wqP4Q==", + "dev": true, + "requires": { + "stylelint": "^10.0.1", + "stylelint-config-standard": "^18.3.0" + } + }, + "stylelint-config-standard": { + "version": "18.3.0", + "resolved": "https://registry.npmjs.org/stylelint-config-standard/-/stylelint-config-standard-18.3.0.tgz", + "integrity": "sha512-Tdc/TFeddjjy64LvjPau9SsfVRexmTFqUhnMBrzz07J4p2dVQtmpncRF/o8yZn8ugA3Ut43E6o1GtjX80TFytw==", + "dev": true, + "requires": { + "stylelint-config-recommended": "^2.2.0" + } + }, "sugarss": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/sugarss/-/sugarss-2.0.0.tgz", @@ -17031,7 +17132,7 @@ }, "got": { "version": "6.7.1", - "resolved": "http://registry.npmjs.org/got/-/got-6.7.1.tgz", + "resolved": "https://registry.npmjs.org/got/-/got-6.7.1.tgz", "integrity": "sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA=", "dev": true, "requires": { @@ -17421,7 +17522,7 @@ }, "through": { "version": "2.3.8", - "resolved": "http://registry.npmjs.org/through/-/through-2.3.8.tgz", + "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=", "dev": true }, @@ -18307,7 +18408,7 @@ }, "vorpal": { "version": "1.11.4", - "resolved": "http://registry.npmjs.org/vorpal/-/vorpal-1.11.4.tgz", + "resolved": "https://registry.npmjs.org/vorpal/-/vorpal-1.11.4.tgz", "integrity": "sha1-/EOYmlLmFrYdFW5LgHk3bFyo8iY=", "dev": true, "requires": { @@ -18331,7 +18432,7 @@ }, "inquirer": { "version": "0.11.0", - "resolved": "http://registry.npmjs.org/inquirer/-/inquirer-0.11.0.tgz", + "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-0.11.0.tgz", "integrity": "sha1-dEi/qSQJKvMR1HFzu6uZDK4rsCc=", "dev": true, "requires": { @@ -18351,7 +18452,7 @@ "dependencies": { "lodash": { "version": "3.10.1", - "resolved": "http://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz", "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=", "dev": true } @@ -18566,7 +18667,7 @@ }, "wrap-ansi": { "version": "2.1.0", - "resolved": "http://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=", "dev": true, "requires": { @@ -18656,7 +18757,7 @@ }, "yargs": { "version": "6.4.0", - "resolved": "http://registry.npmjs.org/yargs/-/yargs-6.4.0.tgz", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-6.4.0.tgz", "integrity": "sha1-gW4ahm1VmMzzTlWW3c4i2S2kkNQ=", "dev": true, "requires": { diff --git a/package.json b/package.json index dab876c9..39a05032 100755 --- a/package.json +++ b/package.json @@ -44,6 +44,7 @@ "gulp-postcss": "^7.0.0", "gulp-rename": "^1.2.2", "gulp-sass": "^4.0.2", + "gulp-stylelint": "^9.0.0", "gulp-uglify": "^3.0.0", "jsdom": "^11.3.0", "jsdom-global": "^3.0.2", @@ -58,6 +59,7 @@ "pump": "^1.0.2", "puppeteer": "^1.16.0", "require-dir": "^0.3.2", - "stylelint": "^10.0.1" + "stylelint": "^10.0.1", + "stylelint-config-rivet": "^1.0.0" } } From 9ce62089e40d83ed5281ab0e95dbd5dbbc96cfbc Mon Sep 17 00:00:00 2001 From: Rachel Date: Wed, 22 May 2019 14:05:49 -0400 Subject: [PATCH 02/43] Added rule overwrite to allow custom selectors --- .stylelintrc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.stylelintrc b/.stylelintrc index 36d58cf6..478c3eef 100644 --- a/.stylelintrc +++ b/.stylelintrc @@ -1,3 +1,8 @@ { - "extends": "stylelint-config-rivet" + "extends": "stylelint-config-rivet", + "rules": { + "selector-type-no-unknown": [true, { + ignore: ["custom-elements"] + }] + } } \ No newline at end of file From 3c43f7c9292b964eea180c243784e6056e96f1ff Mon Sep 17 00:00:00 2001 From: Rachel Date: Mon, 27 May 2019 10:09:50 -0400 Subject: [PATCH 03/43] Corrected sass files based on stylelint warnings --- .stylelintrc | 4 ++ package-lock.json | 32 ++++++++++++++ package.json | 3 +- src/sass/components/_alerts.scss | 2 + src/sass/components/_badges.scss | 2 + src/sass/components/_box.scss | 6 +-- src/sass/components/_breadcrumb.scss | 6 +-- src/sass/components/_buttons.scss | 2 +- src/sass/components/_checkboxes.scss | 35 +++++++++------ src/sass/components/_dropdown.scss | 5 ++- src/sass/components/_footer.scss | 10 ++--- src/sass/components/_grid.scss | 1 + src/sass/components/_header.scss | 12 ++++-- src/sass/components/_input-group.scss | 2 +- src/sass/components/_inputs.scss | 47 +++++++++++---------- src/sass/components/_links.scss | 2 +- src/sass/components/_lists.scss | 2 +- src/sass/components/_loading-indicator.scss | 2 +- src/sass/components/_media-object.scss | 2 +- src/sass/components/_menu.scss | 17 ++++---- src/sass/components/_modals.scss | 9 ++-- src/sass/components/_pagination.scss | 3 ++ src/sass/components/_radios.scss | 17 +++----- src/sass/components/_tables.scss | 26 ++++++------ src/sass/components/_tabs.scss | 8 +--- src/sass/core/_base.scss | 2 +- src/sass/core/_variables.scss | 7 +-- src/sass/rivet.scss | 3 -- src/sass/utilities/_utilities-display.scss | 2 + src/sass/utilities/_utilities-flex.scss | 6 +-- src/sass/utilities/_utilities-text.scss | 1 + src/sass/utilities/_utilities-width.scss | 2 +- 32 files changed, 162 insertions(+), 118 deletions(-) diff --git a/.stylelintrc b/.stylelintrc index 478c3eef..5cdacff0 100644 --- a/.stylelintrc +++ b/.stylelintrc @@ -1,6 +1,10 @@ { "extends": "stylelint-config-rivet", + "plugins": ["stylelint-scss"], "rules": { + "at-rule-no-unknown": null, + "scss/at-rule-no-unknown": true, + "color-hex-length": "long", "selector-type-no-unknown": [true, { ignore: ["custom-elements"] }] diff --git a/package-lock.json b/package-lock.json index 0cdcc5e9..01b4fe58 100755 --- a/package-lock.json +++ b/package-lock.json @@ -4177,6 +4177,12 @@ "integrity": "sha1-Et0fc0A1wub6ymfcvc73TkKBE5c=", "dev": true }, + "cssesc": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz", + "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==", + "dev": true + }, "cssnano": { "version": "3.10.0", "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-3.10.0.tgz", @@ -16910,6 +16916,32 @@ "stylelint-config-recommended": "^2.2.0" } }, + "stylelint-scss": { + "version": "3.6.1", + "resolved": "https://registry.npmjs.org/stylelint-scss/-/stylelint-scss-3.6.1.tgz", + "integrity": "sha512-6bB2EHUZsE/bDVKUdzBXqOcfgXmg3zq9Lglgbu16EqMa4PM8Y48XKcB8coOj8CKr07GtlqtOdCNA2E5njoI9Kw==", + "dev": true, + "requires": { + "lodash": "^4.17.11", + "postcss-media-query-parser": "^0.2.3", + "postcss-resolve-nested-selector": "^0.1.1", + "postcss-selector-parser": "^6.0.2", + "postcss-value-parser": "^3.3.1" + }, + "dependencies": { + "postcss-selector-parser": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.2.tgz", + "integrity": "sha512-36P2QR59jDTOAiIkqEprfJDsoNrvwFei3eCqKd1Y0tUsBimsq39BLp7RD+JWny3WgB1zGhJX8XVePwm9k4wdBg==", + "dev": true, + "requires": { + "cssesc": "^3.0.0", + "indexes-of": "^1.0.1", + "uniq": "^1.0.1" + } + } + } + }, "sugarss": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/sugarss/-/sugarss-2.0.0.tgz", diff --git a/package.json b/package.json index 39a05032..a3e4fc64 100755 --- a/package.json +++ b/package.json @@ -60,6 +60,7 @@ "puppeteer": "^1.16.0", "require-dir": "^0.3.2", "stylelint": "^10.0.1", - "stylelint-config-rivet": "^1.0.0" + "stylelint-config-rivet": "^1.0.0", + "stylelint-scss": "^3.6.1" } } diff --git a/src/sass/components/_alerts.scss b/src/sass/components/_alerts.scss index a340c4b9..2e94ec2b 100644 --- a/src/sass/components/_alerts.scss +++ b/src/sass/components/_alerts.scss @@ -11,12 +11,14 @@ &__title { font-weight: $font-weight-bold; font-size: $ts-18; + /** * We'll put bottom margin on the title here so that the .alert can * be used with the __message only and still get the proper padding * around all sides. */ margin-bottom: $xxs; + /** * Add a little padding on the right so that the title won't end up * showing underneath the "X" button if it's used. diff --git a/src/sass/components/_badges.scss b/src/sass/components/_badges.scss index 49bfc205..493bc21c 100644 --- a/src/sass/components/_badges.scss +++ b/src/sass/components/_badges.scss @@ -7,6 +7,7 @@ border-radius: 999px; color: $color-black; display: inline-block; + /** * We set the type size to a percent here so that if the bade is used * inside another element that uses a "ts-*" type scale utility, @@ -16,6 +17,7 @@ font-weight: $font-weight-bold; letter-spacing: .02rem; line-height: 1.5; + /** * Use ems here so that padding stays proportional if parent * element font size changes. diff --git a/src/sass/components/_box.scss b/src/sass/components/_box.scss index 21680566..d87dac15 100644 --- a/src/sass/components/_box.scss +++ b/src/sass/components/_box.scss @@ -128,7 +128,6 @@ border-color: $color-blue--200; } - &--success { border-color: $color-green--200; } @@ -144,7 +143,6 @@ border-color: $color-green--200; } - &--warning { border-color: $color-yellow--100; } @@ -160,7 +158,6 @@ border-color: $color-yellow--100; } - &--danger { border-color: $color-orange--200; } @@ -176,7 +173,6 @@ border-color: $color-orange--200; } - &--card { box-shadow: $shadow-base; border: none; @@ -185,4 +181,4 @@ &--card &__footer { border-top-color: $color-black--200; } -} \ No newline at end of file +} diff --git a/src/sass/components/_breadcrumb.scss b/src/sass/components/_breadcrumb.scss index 6fe6be6d..4e667fd8 100644 --- a/src/sass/components/_breadcrumb.scss +++ b/src/sass/components/_breadcrumb.scss @@ -14,10 +14,10 @@ font-size: $ts-14; line-height: 1; - &:before { + &::before { content: '/'; padding-right: $xs; - color: #bbb; + color: #bbbbbb; } a { @@ -32,7 +32,7 @@ li:first-child { color: $color-black--600; - &:before { + &::before { content: none; } } diff --git a/src/sass/components/_buttons.scss b/src/sass/components/_buttons.scss index 73ed206b..389a1a26 100644 --- a/src/sass/components/_buttons.scss +++ b/src/sass/components/_buttons.scss @@ -19,7 +19,6 @@ line-height: 1; text-decoration: none; position: relative; - text-decoration: none; height: $xl; padding: 0 $sm * .75; display: inline-flex; @@ -313,6 +312,7 @@ position: absolute; left: 50%; top: 50%; + /** * This negative margin accounts for the width/height of the * default loading indicator above. diff --git a/src/sass/components/_checkboxes.scss b/src/sass/components/_checkboxes.scss index e32a0c84..b88f4744 100644 --- a/src/sass/components/_checkboxes.scss +++ b/src/sass/components/_checkboxes.scss @@ -10,13 +10,14 @@ input[type='checkbox'] { input[type='checkbox'] + label, .#{$prefix}-checkbox-wrapper input[type='checkbox'] ~ label { font-size: $sm; + /** * Helps visually align checkbox lists */ margin-left: .2rem; font-weight: $font-weight-regular; - &:before { + &::before { display: inline-block; content: ' '; border-radius: .125rem; @@ -24,6 +25,7 @@ input[type='checkbox'] + label, width: $sm; height: $sm; transition: all .2s ease; + /** * There are some magic numbers here that help improve rendering * of box-shadows in Firefox and IE. Making them just a smidge @@ -33,6 +35,7 @@ input[type='checkbox'] + label, * used on other inputs like text inputs, textareas, and selects. */ box-shadow: 0 0 0 .08rem $color-black--700; + /** * This helps visually center the label with the pseudo * element checkbox. @@ -48,7 +51,7 @@ input[type='checkbox'] + label, input[type='checkbox']:checked + label, .#{$prefix}-checkbox-wrapper input[type='checkbox']:checked ~ label { - &:before { + &::before { color: $color-white; background-color: $color-blue--600; box-shadow: 0 0 0 .08rem $color-blue--600; @@ -59,13 +62,23 @@ input[type='checkbox']:checked + label, } /* stylelint-disable */ -input[type='checkbox']:focus + label:before, -.#{$prefix}-checkbox-wrapper input[type='checkbox']:focus ~ label:before { +input[type='checkbox']:focus + label::before, +.#{$prefix}-checkbox-wrapper input[type='checkbox']:focus ~ label::before { box-shadow: 0 0 0 .08rem $color-black--700, 0 0 0 .1875rem $color-white, 0 0 0 .3125rem $color-blue--600; } +/* stylelint-enable */ + +input[type='checkbox']:disabled + label::before, +.#{$prefix}-checkbox-wrapper input[type='checkbox']:disabled ~ label::before { + background-color: $color-black--200; + box-shadow: 0 0 0 .08rem $color-black--300; +} + +/* stylelint-disable */ + input[type='checkbox']:checked:focus + label:before, input[type='checkbox']:indeterminate:focus + label:before, .#{$prefix}-checkbox-wrapper input[type='checkbox']:checked:focus ~ label:before, @@ -78,12 +91,6 @@ input[type='checkbox']:indeterminate:focus + label:before, } /* stylelint-enable */ -input[type='checkbox']:disabled + label:before, -.#{$prefix}-checkbox-wrapper input[type='checkbox']:disabled ~ label:before { - background-color: $color-black--200; - box-shadow: 0 0 0 .08rem $color-black--300; -} - input[type='checkbox']:disabled + label, .#{$prefix}-checkbox-wrapper input[type='checkbox']:disabled ~ label { color: $color-black--700; @@ -94,15 +101,15 @@ input[type='checkbox']:disabled + label, * Indeterminate state */ -input[type='checkbox']:indeterminate + label:before, -.#{$prefix}-checkbox-wrapper input[type='checkbox']:indeterminate ~ label:before { +input[type='checkbox']:indeterminate + label::before, +.#{$prefix}-checkbox-wrapper input[type='checkbox']:indeterminate ~ label::before { background-image: url('data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxNiIgaGVpZ2h0PSIxNiIgdmlld0JveD0iMCAwIDE2IDE2Ij4KICAgIDxwYXRoIGZpbGw9IiNmZmZmZmYiIGQ9Ik0xNCw5SDJBMSwxLDAsMCwxLDIsN0gxNGExLDEsMCwwLDEsMCwyWiIvPgo8L3N2Zz4='); background-color: $color-blue--600; box-shadow: 0 0 0 .08rem $color-blue--600; } -input[type='checkbox']:indeterminate:disabled + label:before, -.#{$prefix}-checkbox-wrapper input[type='checkbox']:indeterminate:disabled ~ label:before { +input[type='checkbox']:indeterminate:disabled + label::before, +.#{$prefix}-checkbox-wrapper input[type='checkbox']:indeterminate:disabled ~ label::before { background-color: $color-black--200; box-shadow: 0 0 0 .08rem $color-black--300; } diff --git a/src/sass/components/_dropdown.scss b/src/sass/components/_dropdown.scss index 62ce1aa6..032564f1 100644 --- a/src/sass/components/_dropdown.scss +++ b/src/sass/components/_dropdown.scss @@ -46,8 +46,8 @@ &__menu { position: absolute; margin-top: $xs; - background-color: #fff; - border: 1px solid #ddd; + background-color: #ffffff; + border: 1px solid #dddddd; border-radius: $xxs; min-width: 12.5rem; padding-top: $xs; @@ -77,6 +77,7 @@ display: block; text-decoration: none; color: $color-black; + /** * This padding-top and bottom value is a magic number. Sorry, * it just looks better. :) diff --git a/src/sass/components/_footer.scss b/src/sass/components/_footer.scss index de7b0e9e..2eb23e7d 100644 --- a/src/sass/components/_footer.scss +++ b/src/sass/components/_footer.scss @@ -21,7 +21,7 @@ /** * DEPRECATED * - * With the updates to the footer lockup, the div that the + * With the updates to the footer lockup, the div that the * `.#{$prefix}-footer__copyright-lockup` class is unncessary. We are deprecating * the class and removing the div from the code snippet. * @@ -59,13 +59,13 @@ display: inline-block; margin-top: 0; - &:first-child:after { + &:first-child::after { content: "|"; color: $color-black--500; margin: 0 $xs; } - &:after { + &::after { content: none; } } @@ -77,13 +77,13 @@ @include mq(519px) { .#{$prefix}-footer { - &__aux-item:after { + &__aux-item::after { content: "|"; color: $color-black--500; margin: 0 $xs; } - &__aux-item:last-child:after { + &__aux-item:last-child::after { content: none; } } diff --git a/src/sass/components/_grid.scss b/src/sass/components/_grid.scss index 07bd7811..ddc2c845 100644 --- a/src/sass/components/_grid.scss +++ b/src/sass/components/_grid.scss @@ -163,6 +163,7 @@ $gutter: $md / 2; .#{$prefix}-grid__item-#{$columns} { flex-basis: $width * 1%; max-width: $width * 1%; + @extend %item-properties; } } diff --git a/src/sass/components/_header.scss b/src/sass/components/_header.scss index 31def134..cdddb95b 100644 --- a/src/sass/components/_header.scss +++ b/src/sass/components/_header.scss @@ -13,7 +13,6 @@ } .#{$prefix}-header { - background-color: $color-white; display: flex; align-items: center; border-bottom: 1px solid $color-black--150; @@ -101,7 +100,6 @@ border-radius: 0; border-left: 1px solid $color-black--200; vertical-align: middle; - display: flex; align-items: center; justify-content: center; @@ -190,6 +188,7 @@ } } +/* stylelint-disable */ .#{$prefix}-drawer-button[aria-expanded='true'] { > .#{$prefix}-drawer-button-close { display: flex; @@ -199,6 +198,7 @@ display: none; } } +/* stylelint-enable */ .#{$prefix}-header__main-nav { display: none; @@ -214,11 +214,13 @@ ul li { margin-right: $lg; line-height: 1.5; + /** * This gets rid of the margin from default lists so that nav * items are vertically centered. */ margin-top: 0; + /** * This fixes some display issues in IE. */ @@ -279,7 +281,7 @@ ul li .#{$prefix}-dropdown__menu a::after { content: none; } - + /* stylelint-disable */ ul li { ul { display: block; @@ -297,6 +299,7 @@ } } } + /* stylelint-enable */ ul li:last-child { margin-right: 0; @@ -370,6 +373,7 @@ &:focus { @extend %button-focus; + z-index: map-get($z-index, z-1000); } } @@ -387,6 +391,7 @@ background-image: url('data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxNiIgaGVpZ2h0PSIxNiIgdmlld0JveD0iMCAwIDE2IDE2Ij4KICAgIDxwYXRoIGZpbGw9IiMzMzMzMzMiIGQ9Ik04LDEyLjQ2YTIsMiwwLDAsMS0xLjUyLS43TDEuMjQsNS42NWExLDEsMCwxLDEsMS41Mi0xLjNMOCwxMC40Nmw1LjI0LTYuMTFhMSwxLDAsMCwxLDEuNTIsMS4zTDkuNTIsMTEuNzZBMiwyLDAsMCwxLDgsMTIuNDZaIi8+Cjwvc3ZnPg=='); background-position: 0 center; background-repeat: no-repeat; + /** * Magic number - Use this to optically center by juuuust a smidge. */ @@ -440,7 +445,6 @@ outline: none; box-shadow: 0 0 0 .125rem $color-blue--600; display: block; - width: auto; margin-top: $xs; width: 100%; border-radius: $xxs; diff --git a/src/sass/components/_input-group.scss b/src/sass/components/_input-group.scss index e3d2ec5b..6712e706 100644 --- a/src/sass/components/_input-group.scss +++ b/src/sass/components/_input-group.scss @@ -64,4 +64,4 @@ white-space: nowrap; } } -} \ No newline at end of file +} diff --git a/src/sass/components/_inputs.scss b/src/sass/components/_inputs.scss index 5f91e01d..81070664 100644 --- a/src/sass/components/_inputs.scss +++ b/src/sass/components/_inputs.scss @@ -22,6 +22,7 @@ select { width: 100%; border-radius: $xxs; background-color: inherit; + /** * Making the decision here to stay with 1px border on form element, * but increasing the color contrast to meet WCAG requirements. @@ -53,6 +54,28 @@ textarea { line-height: 1.5; } +input[type='search'] { + height: auto; + -webkit-appearance: none; +} + +select { + background-image: url('data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxNiIgaGVpZ2h0PSIxNiIgdmlld0JveD0iMCAwIDE2IDE2Ij4KICAgIDxwYXRoIGZpbGw9IiMzMzMzMzMiIGQ9Ik04LDEyLjQ2YTIsMiwwLDAsMS0xLjUyLS43TDEuMjQsNS42NWExLDEsMCwxLDEsMS41Mi0xLjNMOCwxMC40Nmw1LjI0LTYuMTFhMSwxLDAsMCwxLDEuNTIsMS4zTDkuNTIsMTEuNzZBMiwyLDAsMCwxLDgsMTIuNDZaIi8+Cjwvc3ZnPg=='); + background-position: right $sm center; + background-size: $sm $sm; + background-repeat: no-repeat; + padding-right: $xl; + padding-left: $xs; + + /** + * Prefixes get rid of browser default select element styles. + */ + -webkit-appearance: none; + -moz-appearance: none; + -o-appearance: none; + appearance: none; +} + input[type='color']:disabled, input[type='date']:disabled, input[type='datetime']:disabled, @@ -98,11 +121,6 @@ select:focus { transition: box-shadow .2s ease; } -input[type='search'] { - height: auto; - -webkit-appearance: none; -} - label { display: inline-block; font-size: $ts-14; @@ -123,23 +141,6 @@ legend { display: block; } -select { - background-image: url('data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxNiIgaGVpZ2h0PSIxNiIgdmlld0JveD0iMCAwIDE2IDE2Ij4KICAgIDxwYXRoIGZpbGw9IiMzMzMzMzMiIGQ9Ik04LDEyLjQ2YTIsMiwwLDAsMS0xLjUyLS43TDEuMjQsNS42NWExLDEsMCwxLDEsMS41Mi0xLjNMOCwxMC40Nmw1LjI0LTYuMTFhMSwxLDAsMCwxLDEuNTIsMS4zTDkuNTIsMTEuNzZBMiwyLDAsMCwxLDgsMTIuNDZaIi8+Cjwvc3ZnPg=='); - background-position: right $sm center; - background-size: $sm $sm; - background-repeat: no-repeat; - padding-right: $xl; - padding-left: $xs; - - /** - * Prefixes get rid of browser default select element styles. - */ - -webkit-appearance: none; - -moz-appearance: none; - -o-appearance: none; - appearance: none; -} - select[multiple] { height: $xxl * 2; background-image: none; @@ -148,4 +149,4 @@ select[multiple] { select::-ms-expand { display: none; -} \ No newline at end of file +} diff --git a/src/sass/components/_links.scss b/src/sass/components/_links.scss index 514980bd..8008950b 100644 --- a/src/sass/components/_links.scss +++ b/src/sass/components/_links.scss @@ -39,4 +39,4 @@ a, &:hover { text-decoration: underline; } -} \ No newline at end of file +} diff --git a/src/sass/components/_lists.scss b/src/sass/components/_lists.scss index 085891b0..37bbf28c 100644 --- a/src/sass/components/_lists.scss +++ b/src/sass/components/_lists.scss @@ -59,4 +59,4 @@ dl dd { .inline-list, .#{$prefix}-inline-list { @include inline-list; -} \ No newline at end of file +} diff --git a/src/sass/components/_loading-indicator.scss b/src/sass/components/_loading-indicator.scss index aec84623..4762ea9e 100644 --- a/src/sass/components/_loading-indicator.scss +++ b/src/sass/components/_loading-indicator.scss @@ -63,4 +63,4 @@ 100% { transform: rotate(360deg); } -} \ No newline at end of file +} diff --git a/src/sass/components/_media-object.scss b/src/sass/components/_media-object.scss index 16f7ea20..c72f505d 100644 --- a/src/sass/components/_media-object.scss +++ b/src/sass/components/_media-object.scss @@ -16,4 +16,4 @@ &__append { flex-shrink: 1; } -} \ No newline at end of file +} diff --git a/src/sass/components/_menu.scss b/src/sass/components/_menu.scss index c9614f3a..dfc92ca0 100644 --- a/src/sass/components/_menu.scss +++ b/src/sass/components/_menu.scss @@ -4,15 +4,14 @@ margin: 0; padding: 0; } - + &__item { margin: 0; } - + &__item a, &__item button { text-decoration: none; - display: block; padding: $xxs $sm; position: relative; color: $color-black; @@ -21,11 +20,11 @@ -webkit-appearance: none; border: none; } - + &__item a[aria-current] { background-color: $color-black--100; } - + &__item a[aria-current]::after, &__item a:hover::after, &__item button:hover::after { @@ -58,11 +57,11 @@ #{$selector} &__item button { padding: $sm $sm*1.25; } - + #{$selector} &__item a[aria-current] { background-color: transparent; } - + #{$selector} &__item a[aria-current]::after, #{$selector} &__item a:hover::after, #{$selector} &__item button:hover::after { @@ -71,7 +70,7 @@ bottom: 0; top: auto; } - + #{$selector} &__item a:hover::after, #{$selector} &__item button:hover::after { background-color: $color-black--200; @@ -83,4 +82,4 @@ @include mq($breakpoint-md) { @include horizontal-menu('&:not(&--vertical)'); -} \ No newline at end of file +} diff --git a/src/sass/components/_modals.scss b/src/sass/components/_modals.scss index 35a14ea5..5b670a02 100644 --- a/src/sass/components/_modals.scss +++ b/src/sass/components/_modals.scss @@ -45,6 +45,7 @@ top: 1.1rem; padding: $xs; height: auto; + /** * Helps vertically center icon on hover. */ @@ -80,14 +81,14 @@ line-height: 1; } - &--confirmation &__body { - text-align: center; - } - &__body { padding: $sm; } + &--confirmation &__body { + text-align: center; + } + &__controls { padding: $sm; display: flex; diff --git a/src/sass/components/_pagination.scss b/src/sass/components/_pagination.scss index ad9fce0c..44c00564 100644 --- a/src/sass/components/_pagination.scss +++ b/src/sass/components/_pagination.scss @@ -22,12 +22,14 @@ a { border: 1px solid $color-black--300; display: inline-block; + /** * This negative margin compensates for the 1px borders that * bump up against each other. */ margin-left: -1px; min-width: $lg; + /** * .75rem here makes the pagination the same height as text inputs * for consistency's sake. @@ -81,6 +83,7 @@ background-color: $color-blue--600; border-color: $color-blue--600; color: $color-white; + /** * z-index hides the border overlap */ diff --git a/src/sass/components/_radios.scss b/src/sass/components/_radios.scss index 0809048b..eb19b67e 100644 --- a/src/sass/components/_radios.scss +++ b/src/sass/components/_radios.scss @@ -11,12 +11,13 @@ input[type='radio'] + label, .#{$prefix}-radio-wrapper input[type='radio'] ~ label { font-size: 1rem; font-weight: $font-weight-regular; + /** * Visually adjust due to the bigger hit area for radio buttons. */ margin-left: .125rem; - &:before { + &::before { /** * There are some magic numbers here that help improve rendering * of box-shadows in Firefox and IE. Making them just a smidge @@ -30,6 +31,7 @@ input[type='radio'] + label, line-height: 1; vertical-align: middle; display: inline-block; + /** * Optically center vertically with label */ @@ -76,19 +78,14 @@ input[type='radio']:checked:focus + label:before, } /* stylelint-enable */ -input[type='radio']:disabled + label:before, -.#{$prefix}-radio-wrapper input[type='radio']:disabled ~ label:before { +input[type='radio']:disabled + label::before, +.#{$prefix}-radio-wrapper input[type='radio']:disabled ~ label::before { background-color: $color-black--200; box-shadow: 0 0 0 .08rem $color-black--300; } -input[type='radio']:disabled + label:before, -.#{$prefix}-radio-wrapper input[type='radio']:disabled ~ label:before { - background-color: $color-black--200; -} - -input[type='radio']:checked:disabled + label:before, -.#{$prefix}-radio-wrapper input[type='radio']:checked:disabled ~ label:before { +input[type='radio']:checked:disabled + label::before, +.#{$prefix}-radio-wrapper input[type='radio']:checked:disabled ~ label::before { background-color: $color-black--300; box-shadow: inset 0 0 0 .125rem $color-black--200, 0 0 0 .08rem $color-black--300; } diff --git a/src/sass/components/_tables.scss b/src/sass/components/_tables.scss index a604b5a4..f785da63 100644 --- a/src/sass/components/_tables.scss +++ b/src/sass/components/_tables.scss @@ -10,6 +10,11 @@ table { width: 100%; } +tr th { + font-weight: $font-weight-regular; + padding: $sm; +} + thead { border-bottom: 1px solid $color-black--200; background-color: $color-subtle-gray; @@ -26,22 +31,10 @@ tr { border-bottom: 1px solid $color-black--200; } -tr th { - font-weight: $font-weight-regular; - padding: $sm; -} - tr td { padding: $sm; } -.table-stripes, -.#{$prefix}-table-stripes { - tr:nth-child(even) { - background-color: $color-subtle-gray; - } -} - .table-plain, .#{$prefix}-table-plain { thead { @@ -54,6 +47,13 @@ tr td { } } +.table-stripes, +.#{$prefix}-table-stripes { + tr:nth-child(even) { + background-color: $color-subtle-gray; + } +} + .#{$prefix}-table-compact { line-height: 1.2; @@ -75,4 +75,4 @@ tr td { tr th:first-child { border-left: 1px solid $color-black--200; } -} \ No newline at end of file +} diff --git a/src/sass/components/_tabs.scss b/src/sass/components/_tabs.scss index caa84a22..af599279 100644 --- a/src/sass/components/_tabs.scss +++ b/src/sass/components/_tabs.scss @@ -22,6 +22,7 @@ &:last-child { border-bottom: 1px solid $color-black--300; + margin-right: 0; } &:first-child { @@ -29,10 +30,6 @@ border-top-left-radius: $xxs; } - &:last-child { - margin-right: 0; - } - &:focus, &:hover { background-color: $color-blue--600; @@ -114,7 +111,6 @@ border-right: none; border-radius: 0; border-top: none; - border-right: none; border-bottom: 1px solid $color-black--300; border-left: none; width: 100%; @@ -143,4 +139,4 @@ .#{$prefix}-tabs__panel { border-top-right-radius: 0; } -} \ No newline at end of file +} diff --git a/src/sass/core/_base.scss b/src/sass/core/_base.scss index b55ffec1..5bd8111b 100644 --- a/src/sass/core/_base.scss +++ b/src/sass/core/_base.scss @@ -58,4 +58,4 @@ abbr, abbr[title] { border: none; text-decoration: none; -} \ No newline at end of file +} diff --git a/src/sass/core/_variables.scss b/src/sass/core/_variables.scss index 183df439..b85388d6 100644 --- a/src/sass/core/_variables.scss +++ b/src/sass/core/_variables.scss @@ -53,7 +53,6 @@ $ts-41: map-get($type-sizes, 41) !default; $ts-46: map-get($type-sizes, 46) !default; $ts-52: map-get($type-sizes, 52) !default; - // Type scale aliases $ts-xxs: $ts-12 !default; @@ -65,7 +64,7 @@ $ts-lg: $ts-32 !default; $ts-xl: $ts-41 !default; $ts-xxl: $ts-52 !default; -// Font weight variables +// Font weight variables $font-weight-bold: 700; $font-weight-regular: 400; @@ -88,7 +87,6 @@ $color-black: #333333 !default; $color-black--50: #fafafa !default; $color-subtle-gray: #f7f7f7 !default; - // END DEPRECATED // NOTE: Standardize the way we are using variants less than 100. @@ -251,7 +249,6 @@ $color-orange--700: #82270d !default; $color-orange--800: #571e0c !default; $color-orange--900: #2f1407 !default; - // DEPRECATED: We'll be working to replace the use of these aliased // variables in the nex major version of Rivet. @@ -404,4 +401,4 @@ $z-index: ( // Standard shadow(s) -$shadow-base: 0 1px 3px 2px rgba(0, 0, 0, .07); \ No newline at end of file +$shadow-base: 0 1px 3px 2px rgba(0, 0, 0, .07); diff --git a/src/sass/rivet.scss b/src/sass/rivet.scss index f9b5cb89..b6bf039b 100644 --- a/src/sass/rivet.scss +++ b/src/sass/rivet.scss @@ -2,12 +2,10 @@ // SPDX-License-Identifier: BSD-3-Clause @import "libs/normalize"; - @import "core/variables"; @import "core/tools"; @import "core/fonts"; @import "core/base"; - @import "utilities/utilities-border"; @import "utilities/utilities-color"; @import "utilities/utilities-display"; @@ -17,7 +15,6 @@ @import "utilities/utilities-visibility"; @import "utilities/utilities-width"; @import "utilities/utilities-z-index"; - @import "components/alerts"; @import "components/badges"; @import "components/box"; diff --git a/src/sass/utilities/_utilities-display.scss b/src/sass/utilities/_utilities-display.scss index 13bed09b..e8e33cc8 100644 --- a/src/sass/utilities/_utilities-display.scss +++ b/src/sass/utilities/_utilities-display.scss @@ -64,6 +64,7 @@ .#{$prefix}-display-flex { display: flex !important; } + /* End DEPRECATED */ .display-none, @@ -79,4 +80,5 @@ .#{$prefix}-vertical-center { align-items: center !important; } + /* End DEPRECATED */ diff --git a/src/sass/utilities/_utilities-flex.scss b/src/sass/utilities/_utilities-flex.scss index 670c2a9e..55e6a273 100644 --- a/src/sass/utilities/_utilities-flex.scss +++ b/src/sass/utilities/_utilities-flex.scss @@ -106,7 +106,7 @@ } } } - + // Grow .#{$prefix}-grow-1 { @@ -128,7 +128,7 @@ } } } - + // Align items .#{$prefix}-items-start { @@ -319,4 +319,4 @@ align-self: stretch; } } -} \ No newline at end of file +} diff --git a/src/sass/utilities/_utilities-text.scss b/src/sass/utilities/_utilities-text.scss index 0b377e52..36e23982 100644 --- a/src/sass/utilities/_utilities-text.scss +++ b/src/sass/utilities/_utilities-text.scss @@ -4,6 +4,7 @@ .text-uppercase, .#{$prefix}-text-uppercase { text-transform: uppercase; + /** * All uppercase text is harder for humans to read. A little extra * letter spacing helps make it easier. diff --git a/src/sass/utilities/_utilities-width.scss b/src/sass/utilities/_utilities-width.scss index fb04be10..248346e8 100644 --- a/src/sass/utilities/_utilities-width.scss +++ b/src/sass/utilities/_utilities-width.scss @@ -21,4 +21,4 @@ } } } -} \ No newline at end of file +} From c662ee0027d9edd7c0eed2805083a042ce988b3a Mon Sep 17 00:00:00 2001 From: Rachel Date: Thu, 30 May 2019 13:53:42 -0400 Subject: [PATCH 04/43] Updated step indicator sass to reflect stylelint rules --- src/sass/components/_step-indicator.scss | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/sass/components/_step-indicator.scss b/src/sass/components/_step-indicator.scss index b940f5dc..e7003ce8 100644 --- a/src/sass/components/_step-indicator.scss +++ b/src/sass/components/_step-indicator.scss @@ -3,6 +3,7 @@ list-style: none; margin: 0; padding: 0; + /** * Allows content to be scrollable on smaller screens */ @@ -22,7 +23,7 @@ z-index: 0; } - &:last-child:before { + &:last-child::before { width: 50%; } @@ -34,6 +35,7 @@ &__item-content { color: $color-black; + /** * If we set the link to display flex, we can use * flex-direction: column-reverse to add a variant where the label @@ -163,4 +165,4 @@ a.#{$prefix}-steps__item-content[aria-current] .#{$prefix}-steps__indicator { .#{$prefix}-steps { overflow-x: visible; } -} \ No newline at end of file +} From 59be045e215ebc733f6e9a1942d5a625bd010644 Mon Sep 17 00:00:00 2001 From: lmcgrana Date: Fri, 21 Jun 2019 09:47:31 -0400 Subject: [PATCH 05/43] Adds Browserstack logo for sponsorship account --- README.md | 2 ++ src/components/_extras/Browserstack-logo@2x.png | Bin 0 -> 31778 bytes 2 files changed, 2 insertions(+) create mode 100644 src/components/_extras/Browserstack-logo@2x.png diff --git a/README.md b/README.md index de88f8ad..4c729a37 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,8 @@ [![License](https://img.shields.io/badge/License-BSD%203--Clause-blue.svg)](https://opensource.org/licenses/BSD-3-Clause) [![npm version](https://img.shields.io/npm/v/rivet-uits.svg?style=flat)](https://www.npmjs.com/package/rivet-uits) [![CircleCI](https://circleci.com/gh/indiana-university/rivet-source.svg?style=shield&circle-token=:circle-token)](https://circleci.com/gh/indiana-university/rivet-source) +![Browserstack logo](./src/components/_extras/Browserstack-logo@2x.png) + ## Principles Designers and developers can use this system as a foundation for great experiences across all UITS applications. They can also contribute to it—and make the system relevant to any team. diff --git a/src/components/_extras/Browserstack-logo@2x.png b/src/components/_extras/Browserstack-logo@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..973bbc5c2536a8407ebec605ec13c6b7e36ba7c8 GIT binary patch literal 31778 zcmV)1K+V62P)LC=OqL+xIA1VmZ2qUcUp?Z*HQBgCfq#p=_+E4_s zLd5cCf8Cwiotd4TnVnfzeDPr}9QNFE&pqed@1A?^-C;0G`*p79D)%XaXS-Lw?dpcX z8>0gd;XYG}qz;t0%MdqI7cEf`u03~J;JomjAV4tD$HwQC2is}`Y z5TO9Bxecs5oDF+L6JuDgltA@8YR2=yfWWr|{lf1NixrOWDeTUgfoT#b_EW&N8VfL1 z0!k7{K#g%6dg`yhb*2(IwfpfT;KRM}9lRQ`A)F3O)D0ujeXPN7VDXKNn!!+jq&9SV z6Kr34sRoP3^$*}WyFE6>1NQwE2Y)bfLY=41A(`y03x95$1dM}{y=b2Ehm>8Dw`N1$ zL@)v}Y(ZaBvu-&nDJ>P5MW!UyNj8W#pE4mZwjV;E`VYySt$*tGlTv|1ACr{qzABk>dFK)v&MziLP!p2@vX06cLko~cYSZvKQCuZ)E>-4<0H`~iA{VjlJOFSjThpO z*{!jm@W(FRoYx`AYOi}^<99pXtMmsOd+;)EsT>!ZD08FEL|}-HMk=K;Mc~K9;4Hov z2;#hQMc_4}%<@nJ1m+M&e8wgQQvWzhHH%*VTcq2NSsoIyt1PzxGaSLq_IL7mWm3@T zsTTNcnLZS>(HIJWryT>S^Qb6Y(W1y7i9g9pht7gyyPtX>am~`Lm)xv&H7#_AX52nr zhlzhWa33>ppWi>q*vz0 zx<&&^_p1XBSh7h*1WFey1!!E{IH4f1M*g1lUjX*ZE+mR53czP(c4l{5S64Us+a4@Y z6Cw3=iIsH8zKt$%M-pB@`TTNSlZ>PhPgv& zto}pUM@$S^8$dOL58!(NK(e@XL}h{|z~<^8;@()&UW+Axe{P0%RRHePI%pZx!wk>C zMpGH2n<+^zvl2v4i{CXXuqhQis^@YYv=5o!2g}1_j)fuK2L^(GEsOy&$V$jx;Dr@O zNw7KZ#ht-|3$|z|o~F?jDp@j=NJyFTd`PP(gekK{lHc$(;2Ji<%UV9Bx8{Fmtk6`a zx4{9;Z>OMxo0edopkqLwC=l`%gT;9ru1ym#%HbEHaQ{G~Cj9&7F_Um!#yY>=m$0^E zq_|A1EK;>gX>$b2uf}QcbdQ3^%k5Xgzlj2Lmd={Z|84LG^kIKqM>vqo&z>;H0RO@- zZ(nB6gnxnK#TWx4n>4d@l#H@2xpNgV200xO{zWXO?89Yi5t8dwC`E*T5n-Z2&;O-G za91OvkqTWcM1vvYtuPOhK%vT56q<{ihRz5^7N9xP5)>D`r?h7k6NHO$ZIyy?g_o5N zYQjZ#JNhYCaw%($xIfm!Hdxn)2X8D4>WBX0d*;gbnUK8^V-~_%jFfXF_!rvE0I%Ay zTn~xsa43>fUa+@y!J~mPNiMN@fSR8W9l9w8a_YCk%I|5YgM3d+A*C>!p*`xP0#C_p z%isxTC>^08VL`o8+t>=S2BO7KrSYaTp>k3)9c{Ld#n4@11HMd5LRXAK@S ze+i9pZ$uKRG{j^K^z*nHA6x4&%ngT(0J_A@tGKZ{&uCGgvq#~Rw;R6ocLPHuLFU5U z(EH&m=yetpp8gvYBd=O{g9TVWJBE#nmbrttj?0ksHiU%kHsv~E>Iq_g?6D37EL0ub za^-V5LPb#ho^?*uS0cIGFSA7WHK}6!_AX)E*@qW!j}>l~=#^fL&OPi1*g7Wx88|NK zgY;=fZ)6(zwP|+GlL4tR%jAZvyBhFMHWZ^HhvPOk^g2ste7rzu(bA-?t3lv=bMP;i zOteJfPJfviKB?(Z}&LvgX4g^ zLJJfqR1zCVO^X^eF|DbA#)w*LOll(rLp0i|No|CGS~Y4y)xWH@X_|=D8f)W6BDSVL zkrI`fn102NDs4lG@)0j7x-XF=R3^Tw|gpudgN-Frc;*>9dxr1*4#GJ{w z=AH#85mgfTyDNyR-rVYY(*sM=ZZX0|zO+q!Cm&|)`(Zd3g>T2_lQLZv+XfGngaT_rULa^g#8~ zu2&?YIH`W&@4^ZgxDD$FM0HP7O315J>YC^o zH|J82qF*FB&t)<0y{_#r0v7J6diDMYR#r*xoLJn`dC0Jy=B6enFD;eQ1t&hz&`>u6 z8b-?!Ccb3g$@-)pAXgkK6v(6qKkQ}Gfl3Hny8WWi7n3S6*8UewrQ0Een*n3vfJ9gr z_V++p!QFh`BP;E^BM-s76~pQu?)v-t!D_WiX@A2O!%7{aQAwX3oQ|AGs`g+U#dJ{> zQz%32=VhRKQPttz&^$C#RV>r-j z#rn0NA|W@@xW(TBLqO@RMACaW9|sugb+#e^29%=E?p1-XPuIhRZ-dy51R&Q7FCwUP zS4B0b>=i=26jWiUty%fCB^yFN{&7-)$+`gCc`6U~+|dF>t~#hG7A~MmoGiTdv2ZWz zbl9Qq_%ZnTR5yfOc|e+WKue(wtl}s14z_?_WkGR^CjvDGrvUC#m|1+DTon4Oh9W_G z>pz)<)32&D_3K(K>+n3)0LKTj74u)fnSB_+H7w0=5}FeK7i>Zprw5-~1Yap~h#C#( ztTaf+T9qqT#JgxYLqY*OCN=8!iDME-m@yEgKj2gJyNW!FkCWFfo*hHTYZZX)7X%r$ zfvd*!CBd(vtC>t6JFh82^;mDT=J5CbQ7#1QZrBIe7Pmfs#)9Ir8wMwiX!%g}Lun9J zbp)i_#&|G18Kz?tq-RM%{4XWv#p02bYcmirsl{Kie9D{5oB<~1XmT;fig&S`xW8l( z48B6cI{5NSaCM5c>zuvP5UW@p@ik!H1SXaUbioJk=>sPBGb~>y65fU7`%tWXj|8`h zWvLC)airNSmRkcbe@@p9Kvrj3J}Bg(3tr#uUbGbm{oGCEL8v(p0Ac|RsJ=cs;%aQ` z3jVtrU{?u{*^%qUoA0m`{L`iTC+kzwq}vaFv#lC`oye65h+G^sE@2@M!qeTmo7~{f zvj8JHI?<;yi@-Yj9MtyCg3X^$HRNur)ol7RIxG_?NaZ2i^Z0Bu#^o>;76P5;u0cbl zbR5fo%H+U`hq;8Yb`~QxcC0#6? zMl=NkOC74?H0{~dhqjsIG+kW4!eAnsg;rGW0@TSxO>ez_cwOe>6$K`FO<+;orP67A zh*%40u>m?CrW=MM*gk-3v+>M@B_~IN=#gsq&%G&^cg->7Dic_eJH2M|GLM}r7ueki z?NMYt8{o4Iks-+h0LDFn^V%>fbM4?;n6@^jWY2b!+zAY<=C#x7@YmqjFc}J1%nbjv zGX#Fi9T2dUz)a~z(*Gg>~D#@KWY+>d9sJLZ+SO_C=d zur5D2eSaW??iN6GG8O+3qkG09IJ@o@Kuii$H1WcLJtOBphar!vfLSBFa@e>v0Ip>j zV9$33?L}prN%jN+)?Xi<;L7*dMT41=K@|aDDPH(^dlj$@g596;az>(JUg_h(hvXyj zkZzoxodtpRy1C(TULqOE@gn~x_(w@r!E5|n5=DubwLEPX@-e-|PMZhG1ir5MM zczdNFsjER%;q$^C-YbJjlI5W`7!d5O_`nVw>J{hd6n5On+fcDM*fxbW}tNK^P zV@%TD*iK+eZBG}T<^$3Wc}U@o$6kL^SV^zB+9!tzrp;5`kn`9A;5yncdnC$+0qCAF z7g|<4Bc$1fXR?L1DL@vyDn3sZH1i4anjb_$*pxBp^)P@nG}HZ`%~%*z6Xn_JqEBy|`5u7Wn5;L0N+4h$2O8VxauD_EFew7o|Q+!7P8ibf`Z^QN(J%-CW(b{C{y zhmquLqDD|Yh&DA{X6IE8_IGKOu@e zP#cO4W_Ca3EbCcgVO@zDZf8L_G#U)XRR5-Je-vb?V~vkohY8BwuJRJ7pbl65W_?;d zkD?WvDa9>N!dc0399kj~qf|<({!(47BAUMQ(X}yQ{}Y|NG?nh3S}XY-={*lg>D2Y3 zT#v=>)0V?a=6%>FRAo-VS<3{vh_eJ;!$(64{*tWw*I!pzKT;mZBXxO2njJU1*G&Oc z6E3%y&I*&oFS$S0eOD8_bc`LQ{`PNCVGu~q1Z3f$YJwX=NI%0mE(hY})?JF1T|QmO z)7xY`TD=EUvf65GTG@gKHsfs5=_01Y&A^BMhk~^h;!sH}J z|EIA^d6GGzbgW}D_HPO5`c#?C(W&uD_^t8L#Jd&KBU718n6lV1+GeOsZ|mzJO)b}j zj90hKNB*WOTI~NL6_@}6FaFR4bMk+KK^@X99q>sm*uUk+(B9St-oo2qe9@h-5Lc-? zh@gXSgcF}@bt~s*^@5#4F!RDqKs12lR?swdA}MaF<7qdpMN4Z~hBF@%zE;QH7$^Q} zv5|dLG9p~Y?{Sj5Lm$K=9)ko;kV22(wBJ4cKFdyL_yhjDN zR;9gBXfKvSL4mh!tOJmA6=JEoHbch zT?8#~*5yiilBTl77IwhK7sUH-57w=Ob1h}U#h8(V{R8J7fV0i7>Ef1TcZ0juPc&L} z>#ng8Q*HDj^sRvb(nUJu0QS}R`DzRqHW`Ggg!=ULxIWvY4#!`KNhSEV9LG$R)|ey{ zLQIXs3pNX~7?Zw3{B?E5ywIy$c(6n!}cQh(oNTSXX< z_eypBB+BKX(y~FQL|za#vfThd1}szXq2-Q264;1{PUEaCE-&NyH;~Nxcm0nK~RA zvaJxXg1o8B;5->z5boi-;H&TUKrl%uB%B2f$!ul1p#fI^tVMofxl%i(!jmkJQZ&&7 zRRTJe*5PD^Ny_$op@N;$a;Ttcyx5syl0CtIMcjoeJp#Dwld~c9?#aN|;?vgR+%5r_ zT$X-s6qkM1pfN!rAA{}q6}D*=Q&X>?^Rd7*D7xR!5L>x$FKPoj;?OeH|{N* zSmDHbYet|)@Jf*@a=hrdw&2#hi=I5lx{DDb23XCa^56gL5y8rrHkx2Gf96gPK+w`U z5?eUPxuGB&?qHqR;nJ0>SQj#4!~n~X_S{lp%X3(cljIGoJdOL8D{Zn#VJ}I6C68VP zP%~0`D?~a{NygFbE9i~dj{$U9A}0V=T!UrYS9SnzNNd!Y22o-LB{|8ovXKhtMDB;KE(Z+q1|cGHx<%bP0lF5u;N8ur}Y&Z{`{89P>4Rv=_~#daW<#?-hYPvt~h* z8!TH<^sTW&VW

hLzA&E-MzSB_c%PW|b5FrU!x~#FE71;RJMy%|gBoC}|glB3DFX ziCO9Zdfp-DFUY^I2naH@TKERx{AC{2)r=UmQNTL4|UKXMgs!!VCM;p>(ZdHygcYG zc3BFLJGC?LKKU(3yNzFKAGPdC*5!;CwIRSlu+m*Z(sKd#O_>JO=L~85o4)Ur90)!^ zH1PXp(WLco0l_U$2cAzigRQbc`YF<>5bDqT1%L}dF<`uHd6dlo?GeB_#_mAjL(*?F zi2T^jer2i*PELi9GouN#Xfr$)uCTCfXT+!t0G1(G?M9Evubk(fJhmJ}yIsNP+47)* zA%%%&Xrcj&74qI)3%)gv#S5od#fry}IDW}QI5FmWfS59t7Jc*MDu)v-t(lVhnV`YG z5OfxzO3*3=$eUZF*q_f{J7dJ?M-Es-q*R4T^xuV#L)4`V=JV#EFw}%Z1>;o+ zR;Mkx3!HmD1+xz%BasLU8#WAv3>^yd=FSB{a6quf0F>`RP5$z09Bu@yX^P)EIASog zeNcgJy>I0qZ&o*@+sHtR(GNE3q$Slv*svpta2kx#0~UhShxm1_u60H8e}$XgWzxVb(r)7GAh)_IbWJX{`NexztcJUSjz~QF&d|j`sH_#m* zTCRPkvHs0TTfV>Ek`moq6%Wk5mCfX~4pi=oVA_b=U>rt&zY zQs?n#UCqjD-kC5mst!u=-7}@nK5Gh5x$61n;f%sU4QL4!drk3Le^|K%>ts$?uh@|0 z<4{syechu$XG;YcjG#4v&FVG_R(Qv>zpm}}27A-EsBTIg(KJ?Qa)wd~$Vh_&&)>$B zsU(Uj^IC#Y&s-~fRVy!eTWV{v;&J)7ams$zS)6x${t*NVd!^--$ZMXUAkDF+vs8dq z*3;-3Ue|gm4mSX}Y3$uis?n=#1m{wxgjo&5{~i9`8~;B8Kq$d)n(V9+TSIxx#`8Lp zMFMK%CD6ALdMAutJSy&{|hYpzVW1V(dgn$G0%wq(bSVz!+#TAvonS4 zo#O4KbO2@FMOPm1n(gL+!*vnzq7lUl7kYauB!9~_l*C(HOp0E=Zeq@;^#$_%@k~^Uf z`l$Y8y!MR@bUO$?Z$h4hN&G0UZE@Y!G<)i3#|+OIF19DuuvFU_wk}(#NZFK3&&8h- zay$>)CJ%3w>0kcvdMWd?wC3fu!m!ZohGnI+=80Ynw1cj-`n&T@uVv|G>`CK;b2NCl zpqJ^#f}Ja-;C((j*m#H|9dH2tg#+4%_KZ+t+3-ZV)`E zqdHxkLts4Cbs~%PA7Z}#X0`!>Ls7;pI=V$~jQl-AUIOw8WweIHdGV%7RH1};1k~zr zX%micg~~`bG2sjW>=v|aMG^7`4r_6+3KjKk1gjjZXG*)BrmywwXr)l!x|t-C zQ)j5biZ73+>`J$LwkQs4Q}M`)A7k*4!CvJfEDlqlk^wVfE5XhR=P@3JEkTjRXnT@ zR#IX`6vn+GpqxI>gx)9Ac~IxEp1O4A2ux*@EhZD&%^WGReI$lU2D7Y0|VWvzzX#!^;Kj2 zH!2ffO1cV}pG&@(@p>-T%ohYJsmRfJBS^HWHYFeNlf1@V36D&3LARczP>^%BVfo`B z5nlf`3{~q_z~S{zwg@gX3>*$sljJ9YHx;tKDeTbVPM{7 zSy-7b8`c78zzG}-rQwa{eT^pznPPaIHESzTd;W1eKP72UVJC=xGj)g8=l2no8It0B z4W9RAapR!w%!Q_{Un#kjxH2Q_B&#fJPIN_GtFf*u(jW5EaH1|sqtEwHu8}Qr<5ki~ zD4x<2{b1!_QS5qB~V%W zkzskSgNJL21t^_51qMI04eZ_mbBpzQYfI*y}*Bx;f=_ z=NB|R6)av|mvI#Fj9dVtL(a0R+IJ!5V&|am>`S+x`cRe);9F`3oAs}U9}9|!`o73EcDnoxazbhJh19T_{WA%VBGv?Ag9MqAy9V`ViE0n zCl`$X@2`XU?tP*B&c$$IaT)w-@oIRxPcE$M=Y{J#I$>Y+tFYm#Qb@HC)ny@&Ym+@L znibLG&4(X^Xtre%cu@b&EdH~VYE3tgQtve($IB#_OKByD@xfKC1?vDEJPVS3b>hTG z>@}OCa_Zf>^~njCe}@%(o4$GCFHxQy@+5QkTG+q;zQ+f;_JI#k2h$}NSKor`m>qM6 zB@PDk!2S_SlHUsXzbC1WeVcT9sQ!&fr1o_aS(sv+`~oy5yM}c+vVOb!#=;rC@rZlT zjODUeWy^<;MWqFlDA6BCwZU@u_?tOk;p}O7CKlT%Satfq54jhYq$++3x`d0fb_vb8 z37NZMbMXA^EchP4>$*3)4VrTNd>rt%CKdQAPO|$_@TE_llJ=!=_h9+C*$-eBx(AM+ zq3m4#eo#N8$i{_hF_+LmH;q0Iq#j+*P_)JBHR}>;%k9H*J+gEO>C@u#n(rR#xP>42cRoKS}&W@^7?dRio5OxmeW&&LZ@MoiYh}O&0g?{L>TMhuTzxrhT)bGFVBLk!nL^ zSp9^uP`Msq09JHOtjXO&H_hHj-x`VPy|iAQG^o4lyBoe64EpU7WxXwF9nd~^QMdDI z{Eo!yAo4PRG+sd4H@=ky{qt~|+DckL-m)~y9>eqj&OTg+*MzuU=@?A!+DKNqUk-In z{6~#%p7uh84NMbzh4xlLXx~wjNF!TYG-%$uyWL<_-9sX=259doku0xVp$Kdij|4yj z%~BE%FC%S_;OHlfGD@H}bO0((Ziao|tpmF?&$Pa&M?2;;KL`k@j+z)0udA2j%DJe& zw8g@R+%DS)?z|-%n|1fgiXu69=dDk}+nj|ZUF-QZ-bG%>LJsV}`nnYDrOE5BG;L{c z`LE*V81v=5Se}f@a+ZCLAUHrr2Hns|CityKewVh4HSK*43t!VZ6c` zM_0DDz|vBuw8r&)5e2G&`C%yXL_j!(K=q$G5UreaB5(YeDKjM^?Lq6RPiDIJ(yjRI zGPvRxNSijp^a<8ODPMBsycMcnW@AS$&rCk)p(5U`>~w&%SME}fy80WG$vAx?3>Ysup%z4P39I605Wu{s1+qx33PQw;T&fW9Q&itt;`Qmr%EQ2ktQ=ww|zpe zTfVf8e4-cYdPa=e0ANwt^2pfJ1{8Z6A8pfhtw=-hYh5)M( zsNVT)Wh5#VB!fd;*%v^<(H~Z7w4yBST;Lhj3rNhA-x)<0(8ju(5u-K?SP80sa}q@; zi`ufOe`gnnfpGIJFSA}|K`yw?DFzaanZBl?s=jN#iE9qAu4csO6alOR`O9t$h$0d6 zxNuer_&=?H=;4zY0g92E$Js0(^z97x)4l1Q_UYPSmB#}`JtnOBhIKI`MyDuXCFtOq z3G4E69G95|9|_Rn-&$y)9v+DYfF~HKLs+X=?De7nmU>##Y!sUiGW0gECrP zdEM|aco@^-1@5*3*>6#8aDlYE%Qs&w=iS1I6Q_d$SUavAHV6+-m;_-gMCLFHWCsG& zURx?bqmdD<4yIb$(XM+7=Pcy0Q=B+)N)KR_Uo(uZ4DgfHB=l-_1xdXH$kvRMBil8& zB-Z}UkohmU_vB7|?LppcoH%j7N}0A@J+#7+DnVid}9#rMoyeKU@_^}nM3Yz*-Ufd%aUpH7&qI=sGet=kLN#s~`nW4i?UBb1s{@I<+dGm4Jot!vv zz-po0*AK5HByK$@y7bg0G_u^#NICXkArA!A|xO z1?X^V2?!>!!8zfTY~H1uI34DIwQj~Bp~z|RN(5{PV6_2VKtDTPR0yIqH50LHXmcwO zKTv?k8Z)w|Cy3F%=`THF0ttOUl7wT?1JLz}i0c^HxfQ_mKb^tc!4j^j@eJ>I!8_}D z*K*=?7y{OsX@g3NGc6U$ywcCwVCC(JR@F5KOIAOG#9rXHoCRUikzf&R@WcKvYn`Lax)jASkfI+D z>w{rfRv7?am>6V}`6m z|0VC;!Mm6fr^5iSzP;>7=$36$L4+K(uq}h>0&c&@2esXAhoEV=j2?7BzK?zjKy5&3 zW&8x)prQc^Lbrm|B*KVXKNQ)*YL^i!@A3?Q^B4T5MS$$vyU7dsZQt#_f6!&`&*9z7 ziBtO^&G~-!pIG8&T_>ekDwv~SRW>&pYD!*!uoziW-WLXVzuX62w5kLRq_p6#RS=*K z-9x&qDorj?ljPMq4Qg|+X7qe_DkQ3Ym7YhCj8UWq3GHs3!0YD?~f=1+ir z1gj4!e9Q(ZNR>+=SQiR{7lDekau)sO=s+Ml%4~&B2w;)*O-0BgAAwW)OlJDTLN9c% zDAvhBm$3IOh_Y^g>|07eutvt%e*LYk?}!;6Zsy(1iPND?s!{VVFYbQ{3#&t_Fct7An3rv!cu~9f3 zLPCk$(pP&OQ0BI%z;nw(k$=|DjSao^>)N4=cQq$Y?GUi~=R00wWh7h*dGMthd}BA zE<`J-ra7Mp>&of?mfC%gxn>3AFML5hS}V)t^I&0bM_(yPun6m+ptaBRKnpmp_|1PeOBzA3Z7 z*LMh-MS(<%4)ZKQYiokF0Ab52$8FK}zOS*tpF4)ZD#rNPdlo?c$5^LN0>K`^WnUmX z9}lndZs)}55Vx>Kbabv@=Aek6n9%GmEQDZo;*Ra>YCjGDScOj})wAi)>$|oUi2W%K&WZ`H8h?scj91pxShM0*gzkGGx$fIfn*a z#cY74w-Y@Y4^boxJ!btyJ{l#T&j&Z&bQ4@WWeSAR`s#M; zWCXn?Rla3GAB2RWgmc@PEOah(9PBt5jKP0+I>^{h|qaTt6w|_8BC<-wzc#cY--;iB(lq!Ixir0o`Yx2iyL! z6wRezOWr+_1RnEvaFN#&fOEw@I~tykV}8Pn95LB=osr<)RlHBhg|v$#DCV` z3Zy0_kEhusG`x*_?eGz*bCperfJNi2@)kS?LO8V`hRxfywSX0+E2d3r`FG(wwHvyh z3|6Cr-=wnmfe6lCt3-x^EsiLG!9dZ5;`cdKcy@U*fs7 z;V@)>xgaG*va+(k;Yb{0Z)}VKP3CH}u*5`uN+kw=n0EUT&)4S%RQZ}b!FdO{v$~@) zehq^2a{eSA4q!#&7Ar~*9jHX<2iR#>=4?i5osR$YCS0!BE6=si({ZNxQ?pA*+Gn?i25xMncR73}V zqT4%J1Nx4QfqjQb@Lk1;5==c4(_sc!n2y%G8cKwsrfxmhT_Yyu%UkrXlo<&G)cw18 zbK0V_VTJ)XK|Dyk90lo_F42*(_MJX}6?Ds(C; z0*}XIfFB(s@fqTw&wT9@~9d_ho=z)Q;%fKeg_a{tea1pY}oJwXwg`nT>dS3d`+al%WH|$0t5up68PA93S8EJ?8(fPG0(T^vI<3 zvw5$>gjR@e2_9d=azq} zKqa!5(zt(xDTzvFyATBXk3ech#&z&$%>NeV?ZPlWX_?dTcoUZU8I|e;RI1w8We1j# z{*l1YRlFC-FPryD~8rS9xD2w}$-%Jg;MwgMYosB<_VELt3eu6$wY05TUH>qrA;{CqS zO0YtGux(OXsh%wTr#d4sj;h|fMKkNTPO)h*)||ov<6T)3zy9?%|E8HYWDq;acQZ#E zSnDbGZpPVP6@N2UJER>(bY3WAL|hxQG5^Zg1Fw6>XieE_KydVlb5|JF2AQi-@yX1SL3c95xv(g273%GLEBEe=LZ;V;S)ud^=^KkbnC%~*tQVsdC6c;ei{KQ zz3~ahaXS5pfajRjTGcn0Ef!fVI0TtQbGLsOk^a2r@EMgeDQ zq_Nmx)M~hgA^f%vx)X2zXa}QfLLN@N0()6R30p|{MboZRxC5iUg&OU!?*Fp5>%VFY zK-6OjYTv(S9;2;ljk-X4xR%h^rqc`vEH}x3$pQras8uFvSSj|Gu&p4b1t|N!VHzdt zO7g)NgE2y4%)%i1sdZ7KA=i2xd1OVuaw>VJlX6oG1tQZ@1S{H(kD)Ks|~4$!xS>Q0RXr$5yz8@xg7HTiPlmQN=7ciFWKEcHVH*J-3> z%t&71#kaK2;1mGyYs`NXrff`TZi^2_&tHypL?3kfT1L4lxt&Nkn$FjFfJ)=|I$fUW8+SwXWHy#E_{vEaksA+n{oSBS_=d|x5MEegJ_RfDW7htaVx z0<0IryBH7FCn>xr&X1ET_Jg=hPNe$0IE!^Nqj_>hH2% zM%q70RhO)@Z3Zi>!&edi>d_~240t;3l3>%m`PzVH5uit=2}n2$nRGp?G?Kqt-QrWON_x&={+5#Gh!{=9tW5wFdoj+5&@m+Fy0HPJ{ONz zzwctU45cR-bx}FQMH^$iq#9jG@h=P@HZU|mWhl$CS*|oxp_iQ0dC^4{w;Stfc?oc| zBBUEpCY8v`n+od}BJDvvqn(CWQeC4jhk?l7(NTR+Uf+Y){>re#6#XbMrmgr+#j-cZ zdKqbdO{6Y74`OLlRw=|c$rhYV)rO*uq<|%MiH&L(S4ptDewDoWmKGgXWC5pHfB|>> z6T&`ETAp$t;D=o|KNVF%0#EmJ!J3`=A7zT{F`dub@Q3+Y_#ae8gWHbzMryp_<2#u# zOTjllr`$sfMTwujuuNZZW$K}$bnhp%&`9+|NfdXyj&;+3=}m*y>6O~`R5RkFqz95z z_<5r2lUic5ou0_YeW^wdAukt39$yih4iOJWr|zrX(vNZ>!pZ6VGO~ zkzA7bG3$ixtR)C0*yH|QGdqnkKfAjf9AO^}e()`jf^7o}I)S=!))Ux=k_=Yw^v?x9 zw$bSSO}CsaZuQZuM$-YrAknRnw3P8)?4Zd86r#aE1)=W}dxJ*MZdz1uLMt7RXCDN6_B3e<9NzZWT^l~i;} z5?MdpI>4yDTXw&|H&%{x2k|F;{b(U8%3^1Fb(I1jQx;h%R`gQZSQ7Hk9ha0-jP5|0 zeZU@#Ocshj65T>G8ZH}lKcg9wMJb4No`ay(?}$Fo>)J?Q{Ekk3nsC#(s#4#{pE_w=92M|dz*twGY zVPw}W&wzX6$#9&@3ZESr0V_{%57c}0C#m<%idlt4tG!^=zsD5^%=jYSEkJ6H0eM|4 z)thAi{4q%R=26BU^^W`Zc-8%ZaGnA@q5x-8$F`6f22lI+Qc!LSriW2>e#LNy1cxFK zZzZNzP%dbF`G;wY3*OfT>*WnBk5;gBKBf+>tHZ$_-$E;5lZ5 z3|Si)8`|Bl5}E>)`s#(2PLV@|D~{;{H+}j&44ym#!VVV%ydIF0Yh}^pl>J_LmC>q+ zQ(@bSD`42*p)kLH4$SW2ga-6AMZp5Ax8ISJ-+|dtHxvObuM}U(R&8tWg~h+FItZ%C zZ~>)@{~(Wz!e90?rV`okO>a}a={H0{NI5+Qzc7=^!MTrx-s=D61k!L-2L;&w6%s=pd-$ z{@I#0Y=+*NS?owQUqK*E0qN0-XbRJgx@thuQi+-*96E%)8 z6-KA&oXiNKjSEK+Y8a7seUZoNLkqNO9tR<3ZhD3+SYYLU9O$&9=9f*Zzo->=wFXZs zktgL@I^89WFM5Ga8@m%5Td2^x?Lhp+N_SwNU^5pGf0E~xT3IxZ)F;A~&wJpp*-iuz zJ1pNk6OQlo1X#_P^)AA6W(sfJk!tTrSjxzFiy|0xlO(Ym!bII8niTi#NQudC!*t@LN4+{6ysMm8vPu=y4N!vsw=Rr+kUqm z7xFHM+)wq}DU_MP@NRvrX!`_pJ^l=o2V3U^+ny9#pdWi~Nt2+^Ev|{oGZk{S;cxr{ zTZH#A1!dT>4mveIp3WH2!FIwR1t=E9tSCQ2EVS-pN0zyHJ zv427&__FK@@C0@zAB+(QWJd!=i@)`PWEQ|&=+Z0VKJc1rr2}YJF-G}bOG9Tr!%$Y8 zNz06Q8dCES0g>?nL>d41}Jm1HROH6D-{eTF%+c4dlv`(;|FTWkr z4_0GP)^Ev4$omr8FtFJK`~BMnDoy%7W_+btnYyW89}sbK|B z&ct@lW;{f6>e|8~3~djk48dEQYF|D**kn zg0d@kSRJ!yljj_3u{UJ>_3;9^2QST(IcQIQ57`&yLAFNJPM2%1Zc^b~AK-_K+ zvJe31k~30)>OH*!duG4)Jv_B-Pi<>z+qP}_`b<~a+111&*muD8bIMjbA`O&g$>9pl!u0b0}~gRI`7iEF>BIv4yaXBnk)x zSJWmNRtNHmy&3hs6%NEGN$^KG5|GK^L_4p$nm0%kjt|NSWK*X(aAaM6mZUwW?R|S{ zC8#@iUr+G%$DU0-;Ku%~G@3sFkTC}^;189Mk5?x~9&nPz-GByP2Vu*2jg}_Z#<;M}7{A>* z^s(Sa7R5K(-b>nWU%B(|=uZJd2Pv`Ls=ebhsMrPvp~xINF8Ml;v{B(1zu(Ro)^;cB zcwG`CjBaCb+rUCUjn^wF*u}~eUyjH{5bheVC$Mpzakd^gOLd{lksy2@G8Z~?HmSK@`Cc1;|-7OEs~epl@Ry#TZMi)8^tn|N!N9R zze>_Sr@2d$Vt)z`LPx;!MC1{&5S!NJF8l)?8ssXI(VqnmGenvSA5D(>Cw#)^+<0gik}PCE8jr(z3y6W8a=A5D)6~3mJ9N%h={rjpPOQt zGCSfPY9X+R@Q!n4)bYlXUo5yWy5fR5f z7deAdfob~Lo$IHQ%=qvfCZxBkDJ4^C7-Y^4@_rcJ^S3cnM>qvClH+DQFeDaZtCu96 zccftjV9&(vZ!Vg??6$sZN`&%6YKS2Spde=T)0RCXZq9Nfx$bQ$K~&SCx~{JN1D#Rd z9^ma91w_x>a5vHSz`Y{xo^E+g7J5fRt)e6QI^uJdjy&-haMP-*X+_}AG37CYSE0i{ zffe4#{$`pM{_A}t7P$pxD%c`{eNPgZ?rngCc144WavL}Z_LsuqE~4rScUhfuwR5U_ zqz6r=9qQsgB@6?@GpbXC^5EYO+n0tBwu*7ghg3<^3cBy$=o7pV%H!Npyz^3lucG=2 zmPrc2P)2~F{Y(ESjR<)atc@4!eM6Ap_y*HrY#tyfXvrqh)(=vvn*alV6Z_RUUV28u z!Q-}e@)(7XFg7<6Gz5;2R|SO%+uGrdqBO2=6zt&5Wi*A1$M!?i(mBF;0F<;WIquH_qd%f6 zGav#4+x#}zMCBW7&-27Gx=p)@N;teD;R?^G@D)d;RfgF`&+zTvll1bOZE{_{K>;FGQ+LW1Rpyeihd1FL@q%AR z<<-;nr_k{y*@c#b-r$iY{eaS~9Vm_Mf;H%IeV33cZu~7vMu_#uSna{R{n6kl69^qn zQ=0y#l_m+AS|~~z5RaBvvz|y&QMzYHEO6W$awGwj39CJZK5${5okTPC*l;Lv!3at- zr3L8rIWW{7w>Bw_+!oY%-q&d)L1r&wJx~CNUNlJ(q2)gMqeFrWnQcg~NK9!plle1s z8wlWX;+6%8R(|co%1+F)Gbqv_4$^3w2K%H35I6162V>=b8wMrdHc0$r90$=cyi9{? z;TKCJx7UX8en0m$aLxPk8VQ1vYiG#9yB#qqa|b6UhLxqWk>*!qN?vbS zMCU-MvAT(8qWmEv_e!2VCN9yZz(7@!HdMy-5gjk-?2D z@z#kY-8_NB=ZhK!hg*LGx+nL=Cu zHC`D^lVrn{8^lJ7gkib*#_T@h)$SIs@?54h-&r!YTSUCRiJ z^vI?fQ`VQ)!T|g?M0*2z=6qQ{&H}cC_r8mb5#}GH>fG^`_4zuW2<$yH7jayh zM3d(ArIqANt)szit|?ejL)0 zrgh|$&I+<;o?ln~aru`vy_~Y}KcH5%X?m}ffrK(l*uHfjIgDb&L!a`gskxIdl}8SO zOTwTe(tumXf6IIV10_$XWf%5VHLb;xWsXRfKazw5VC-taqfe9WtKlUQLk6nY!d{p- z@9`&M8zS>_yLicUeHHLq0B>U16#ielUFlxe{A4XY70+7qYhXP0x7SLAbq=Mhf;!~O zf&x6g)jjf#7o;>eijJn7aIY^(rRPchH9v09iUR$<-`XlcW98Uf9)|#|nHNE6Z-t7z zHW06mAM#8lX5Ly8N@$4xhg&o<%^iJ~28U<-4H?l2!~kX~z9)hY(JFQCn6a}l=!vY7 zd2+Sn!1Y3qDWeBOp%7}Fx6)lFAXC4!0rZgEh|!xkrlJg0Dv4zOCA8!G_n?VAECyAm z_a@XSxUAI})Nn{R0{Su`k9P`9>SW$5(Ad?i?;sCm!6fW&nqpqg*|*l-h3zMHP#xs_X_#C)r;>ayj*X(ch;Oti#j?I$ZO&$F&;~hyCO-c<1Nj zG8PjRe?%$Igk3}~hXn+Yxgr}CbAm3LAUDJWmK@w`;-O1pNS@Vz?gvSlB6pxCm$1ZSvZxHxEbyzef&B5`S}uo~ z3i5e+y)^lCC9s4;VkYS@i(f~g!k#5${a;P3`ceM@0Mobr6b+UOW3{g<3RgQz2!gTR zfdAd}N?o=JS0b$5EDY3PFY-pGR8R$$q?IM@4rfDx_N9X+q8S0Qd_082*iI_vhevA7 z<3Nz~fsF#%>AGys+U|E_ts{67QNM5Y(c*&&%;XWpASbtM35{gJO>J1Ut5MmfW{NHz z<(t+@S?cziPCI^B-Ok}`X8%$=k}t*3m)G}Y)i+A-8iGC1fx@DG39)``Q+}4Wr^3qf z8y+KWSlGNwr1Wifn4LuxYyDklKzs|h;>3Mf5?ugcUkb}DOdu?MjJ2Fd&g?8%i2Rl) zJj88)d3OPcftq54=IlU$@ZmOf2MK6su=&RBH|4tbAS6n&m!yb{ zVMLuU}3P(Q0)r?WJ)Q&Yor@M}WfCavVZ9?pfrECY_O zesA}50(`&INlzxx+F3Eono9XtGewM#k=B1^=ZQ2rmTF4enUV+H4z+w=UJRE*%QG)v z-hmWZrRl$ko{o0hrD#}EXf|w`DpAnnlrBVVUJog_$sMw#0u z?4H+%fw=|#)pjpdD+FNmAs)if>#Mlzo>$dqVRzC|n+PN^3Sr-nZ zNl_afRy+#Ifdc6C++O>LnI4=Fidc)NEJAoW_2O_wPE-*`o<-8+!{TJnX`{Ln{CBIQ z255+4A#iv*?DS?snA9}lI(Afr?>NN^35>bHDp~P4d%sCVqr;KH55Vgc^ab;rqbpJwkpVIQO~uX@%#~g$>xh?oJT35cs|~4W z@$UG+J~z}FZRmrLqX(SXu^ik2@q1+EaA=TD^QTuPa)Pbe}=e|qxW~&cKn^m5`1_~FbxQa>dchf%qXtA{2k|JeUBxeO6WZK=)jnE#PDA|WkD}blp^Ii zT3&A=Av59v0N`qtGS0t;Sq+_=pXMi&yavf~>IM(kQjTn)e=#F=8s~Fb8~NbCV-s*< z(k_;8qxZa#@$UG-%J?FL45i^`NC&x6?;-c+^1eXE^|s*jgruo_3kiZ@bW7ru*ua0& ztrosSSsjY{$-SEzhSurzxHsTAPSXSBXbW;za|*%EXub%4nLMO}l;^y_lP8m${%^%` zVjA?Arvml-1L(le^XQU1Cc5)fLhLR{N1=*0oe>sAO*ura5#wMZtl3S9uCaS4>e#&i zD5g`)!c%;D?%dVyh89LjC^pxX!X3MK^xk{M8wkdXhG=hZS5#BW6F9o&`Mclf1j{dI z(7SIl4k+e{l2k806KTDP<D!d+{#)%J~c5g#kmtR5dQdpd24qo*?U^*LNq_psPYvY$p~b`u((z%IT@MuYcBp9FH=&O5{ZH7F&FxrzN(yH zz`**V%Kmg{=w?`HQ<6{g;$f~07(VHlqO_OO^jl``?U6jO<|AipS2r{Ar%D4(MDs0W zOZb+(&;7B)uQjxhL2WIf;ev|QgF(1JF26kf=kn*Sm0s;Ga#}uhda|?S4f}yq4FiJv z>@~)om@EfieJTq$n+GDt)*ZGm#BHJWLBeL~I!B=(pm$M(yJ9k$*TyzU?TvfZR|j!Z zB^u3a<>o0J50LBizIow|R9u&=&Ui*KxfRx&Qq};THh=3S?NSt+lJFu0lpR41>16!8Ar3dJTU0H0uA+Th@?Rs-*mJ~I;QL^U%VHtF@;W>`ydaqF@S6HQRtwA#6u)B5O4y|^Q08yG3pD>^-^K`;#Tictgy<;< z<~yy-+UG>~eAGXzAIX@WCJM*CX<@??CVpu95)aljLqVgIla{Q(zCW6Z*195$-^x^+ zMxdY=ZvFm?`lVwS$K`uU>wGx@BeM1}Yx0)o?deR->ihZ6?_oB8r0jils@&W8V@b&i zgoBEcc-30GGCu?3gi85G>Mbe)k>@YQlq8Y;Je&7sKm9)sEk3^hj8*aY8q<1;J(6RK zXTQ;^-cU&Mwd}?o#RdgaDHLCpS?iY7EcB>NM&jf=r|--rZcapyhRkcWDN?#0s9NMY ziQO|qodacQeK2jGbrkm_#< zSNSxNe?2*2W~oZ=duUW~ILPcXqt=YX^^~ZzSIEwE1#duq)Xz|zY<$lfyoj(RyZed5 zcI{v)gc7!ddC6qIL)M6r^2Lj4sYM2k#B>e*)vlk0IowSrye;dC@cf@W=iwL0s_sMX z7#m&8@YxaCpW(IcQOZZtInlH=9W+N@M1TjSKSs-RzU)T42Y$B#s(GFu{Sf3Cw~Q(3 z?CZv;RZOpWM^~9^HInaI5(sVS(95ZvbD!JcW&9M)GLOoHlJa-D&QTP2(EC=-^VbP3 zDS;Z~WKTaYZbUramD*y}Ja-h0B?o_}s%0wR|GYMve*maq(Vmor$MdQaxsj;}h= zl4!d==ee%bGGedWmn;Gq@pTlsL8Qz))(TgM(mL@j8Dq!FE_OlT#-#L-<|glJIWk@6 z)5rc7*l;0gT&cX$j314Ge}o+F;CeXc2GFN!L#XKU&-04dBJY%`VoO|Mia{Q-$TU!; zx^{%d?zbWJUfJ%s(T!%j6HEbdSyjMOX-gbj*eI zwfZpw7u}i~*lqBJlyaoZF_Z9H)3jemIeKfX`pGB}aPZUkV7SZE>lLjGL_vIHCB?kkj>I#2w~HiHCF&~p24$kc@k>PBN%|~SMq?r)2}c8Uu=@td zZ>nGb+2Mp{Nvm?p#$=-KeCs{Ro4aF>I4~NqFg5CYxTw3kxzAeEDL&AF;z`JHohV^) z!2GPPjwU4aF`q*P$ku~pVBiIxLPjxl?T$>n>G`hmRx(F0npLp7t)ErreI6`jp>qNK z`zGlmws2bx;$-P(o~mCwu%l@=J$|NkqKY^(D) zwdYs7Y(k%iD@hL>MG>_tc~?k>gjc(PG{(<}EbI)3>l;X}@~lyz>X@aX?>K2cEnSPB zHdFe)<}C^i+wZBaNmWMQVcvjbeOk?`PlN$GL_=X=3EO#+U+u&9w%_-60U2=$N%)yk z8zq>z_bU&V&Pmm511!u^ekrCMJFZA!?cQ=^dhN4heGwjw$7ONZ4nFipFeenpI#h6F zvJ1u=UM>3Fp*>45K1Yt|OQG=vtD*)CFy8h*v)g|f+}aL$V4dDY9{4ugYlwsC!%x@A zZk+zkBU_pL>0XIWSk7sS>W-Qb6I|RjmX1Ya|QB76&?;u5%b6iXcf%i!%S-rtjE-VMSjet&Ot`fgZS1#9CRe5rVlvD0KyfF~U8J=+Vzx;qn&ev>PCYoQS&(C&DrjA-M1&84%Q ziJvpZYolA5+Quf^`eKt1GAemGDO`kq3qdNimhyk9a&Bk z-)G0P8@dB28_5I^i>U~g9G=!hNB~d-(v56#FeWu?=N71SCW{Do|0SyX)9zS`% zl+Y-r3L3<$=6>w3N5oU-^hmgi#$nP=eCT!X(c~uSy&WHZYV-1B%g=n>gTI~0J153Q z>``0>j*VELtZ9d7L`yQHS;3E)7{9X$F+v=ViK2)nZj0d5kh-A&wr0;pj8Fh}oMica zqK9n}u1zh45!-0xvP5(26yYEcjJsAi<_=4Z1xTS@I(#Fe^r4yZ< zJ-uqQZ{%+K)vlyL&0B=2ozL6I!xphSze=pAVYdd7?62ic><8|+G2mLD+>*?kjtx)b z{QKs$(vwHmvMRG%cy0mphZQ@ds*BYGztMkgZ^g38@crz$)u%DBz8}9cxsb86ncuZn zRVLQ#w9$$QO>s6(yW7rh^$dN+VfpjiaFfEdIe?Jjkxj_#``HU}Fe(4bWi9eg;cuYE zG40W4>Ko~yP&EgT(EqB6HU8?^W&FN1@_zACM&6qjC4Oc-u}VOgnwL@-dmnvTik|2C zHS+rRfgZ_tk|M(~U)Ei&X+h{SD~&`!D7Qf}!DNgxeR90$fi=4x0RGfR&(>mTFT+_Y zzTmjG#aI2n%n#@Eap!2XESVG=Ny^b2V$97<7qCj5ZXYh1tLx7KZ77SJ@4`T7!2k1Z zTF}z<(Y;{}O0xS6-0c8+eo2)3IrzmbmFM0^V%~)mw1h8AHOK^yKb;5DS!eC}v)a_^ znRk;n@kM5zhYT;5qHB;k+JShiwQ@y{8kov|E&Y8Kv>_T!*=A5988I79%Hw&?U?=G_ zcgb#Ra`TOY$4C{rrAs-Lg{-q?+P>pDK=f@0jsi#JQHT8!%y<^UE9Vh)hvZHFk*sD1O1Hj;GJXY6SBOzef3 zy*v|05?=9jiNl0HVDX7ju@zVYjYwX9dK5m#=Is-%Un+n&IdV$QP*wW@-8?m++%4fD z@c?Q5X-!h#B`fbab090;arSF0)_d zV*rSV$kyB#<)C~Hm)A}M_X{hDz+oB5S zbqYlUb}OJjq7v8M)(l43%_xyFHxvFS6+>RTD3f3(Q*0PSlIaNXx(1nP{V9$6jzunn zxO-Jbzj(lG5TBTgbNs=IMp>Qzu9xgHw719Z))C1HNU$#vYtNMovL-SA`DE+U#cd#+ z(D(Mk>npV;p7r1qNCZPv;mw~)4mqbPhpagH{UbrdO<(AgsnBCQW2&7oozkymijth& zwfQ{buK6n+1!w;^N5@KL)v|pT-L^-$y&~9<#FWO4q;$_Oi#L*Dv$g2q{vusKf^DyY zyVH~Y5i3^4C8+FNx}DTmI?fD$xL85C;eF6y=}wZsAL8%CTWFCZY_=S2OX-cs9Je?9oCi0*OXj98pzgj#tt1eT? zpYj2XjpiR5#`*+xI214A0F>&Gq0!QF5~X5Ii7vF6NIg%917S$iM=*JuoHFp_E6zdk ze@(Z-8aT9R#22U1Kpukg$etVLVEw&nLqBQ9X*zw(_@bNpvJ=+s7&Su(W_Mqz>HUn4 zpybHNs#Ourj5~)r^C}~*uP3puKMN-NMRdG9`b;4o{cf`k{P+EO{==QOAWYAAzk|5B>d38^9Y(6s^`)&+?Cbfkj}rO+NYdlhBwK{HPSWV8X_r zI}NaBt7=Y zVSd4Ie&M9v9u>JdfPERuHI02$5 z*{V!j&tQQRK-Evx-Ci8g8c?0CTXl! zL%bE%rKjOOEwzc_*6rJQ9kA{YI1x~1CITTq8^5@T_)K90c9jEmk{=S=N zKbZG`MCdSK=+{i*`7PscXbc5ijeesS$gAkfQiHgqc>e&oR(=?}MPlqqZznGgEPZ^X zkP*nE-yySftM6I1U-0H{?>WB14=7zSxGaG^KcIh8+>@hL_x#Y^YSQpz;-2 zzLJVh>WL}tA`oXKo+9tkEr+(Mka2C6q@ma@acni*^>41}`!z-vT>!fCPafN%as$g1 zxi^iyH=aeyM(`>!qv(EYZ zZ?4k&t!OE7vE)-%h_UOdKjV-gpPmf&A6WDCSrF9vBbTCkgodJu%XHrm+*NG_?GDvF zvvB9yd@K8y+FPT;FWOooBhYEdvNa+M?Lk08w;oahuI~Df3y1r-Y|*`K{2m06MY1tt zrkV>!&z8qjndWgucHH(0xyyX+>uk?eI#P6x*xG2HXrX_N)-+$<7Ye*}ZHbb}1iPrt zsD?we()=bgXh?69x`N?a8}up$C}u=00JmjVTvdF)s}eAGHl)yt*)LFD<*JnYG;>D(OpYelB&GrVjCQ6@HtNz})MwwsyZ%t}U~j z9RR+Tl_40H)0$VQ?1Q^DW9t$k?GJL_B7{$2k`pP+Y9&eRmyvfCS1xA3*YO#w!B5F| zqi6$ciz2*3i5^4Hm2-PZYy&?(ZPn=JHW^O{-+F%*`MZ6eHHyzfm%`*||7AyEP=JeQ z*?Wd8|NWWkcuB#9s11q{ia&;Mo#^=1A0no3oh)u&4 zAxFsVtIwT=*HP%cc;|^)+0YQ`^=ci&?vq15S&mX3*^YS-rXChbqQ6;`8Ny(~ zSRo}VWJ1q*LarGtrq_Bug5|l$9E!;#;yr=jSg)du2{RHc=F9QODa)xzRdAzg-6X9LZRmOUf00s`b7Rn28&t-raMZ09*5I3 zhH8s``78Xh!{lQW_@^1ez_)OF=s`OcTKgwTrz0PTebFc+UF;rCIZAsC%7k0bE(toX z_q`M!PF9DdJ^*Ed3Fg!@@+~ncuA#9`&h9uq75UKR-99lm8lz&IrTxr+0wTUc{flh_ zGYS9I)NuU^!<(<=kwo4}=&!aNPOm$xoB@zci%d`EZ5a+v{rQ7&K_%SzF3bIF9P0Om z3u-sGr4<(`i>?Q5+eH!k8$H1<6JN>`nnn4-V_~n=_Yu?WT>SUsKO7#h7YH);Vf$3| z(GzgOTeZ0?%MU$X{L4RUMSdJZ`18;zMX0VRt<`c={OjoHbW7Bk z}ol41NPj3`qrqq{35AtH>+N1RnY%t68&L$N`_X{lRZTY|6##brT@FV z6AAZMauxb*ob!o6x=DQKr!sFq_Qh{SUf@CZ;Gh_7`5kbM{Q&6?p}D#u4PjiDOUG+^ z#FqH63thU7Z1$gTq6?TV;$w;ZsWxcY7~w@!9*Tq$`v(dK(vhtXTgie-DBjPtorfLR7RY6U&o)0Rp(eUYXdhl? zcT9r-dKNUUa8MqM@SAl`pAU!cY5n4+3)2gHcNSr=PKDxK4)>%c-?Q3&F(}8Yh_N^& zO@g1hm1^3@b)^mKHuMrOH9ltSO(d-*07~P(NR&AhR?cmQy$!6rlV&`Lhri0|(G0s5 z$$S{Z+ow-Q(MT+PJRl`p_*E@&aRsy!KYgk=*yIImT?B0%agz6_*$=2*j^VM+?ous@ zn;y8dgsNe-?uYXwwvDJ95kfbX<%oo3J+PVCg^N#2Xj%7 zzkd7!;`9v3$u?Qw2lo?Ykqcpx35m8DZ}>8Sm%GOS4tz1M!Y^J24kgK4N_Ue7e~cXA z)VC!v{EJ31BB;$O%Ow|eg2XYx`q*4DJcXJ(LJQiw8EPVmL!yz3GB%CcLI>sS^=Nr0)IQ9UE$g%8t2m_&AwZ$5Lhh?a@JF#=iBfq=fpZ=%3JpfLV)eF++O=ME)SE(t=EpZU z6q+li3AVPX-Z9Th!XXr;OE@)t;jde+y^IpUEjg9bbZ;U@dNFhzz^f= zYE1So`ba>PHrk9J%%KAVY`!wfPwS0wwj8aj=`u2m7na0IRvo`d#ft$m@iwN zE&C<2qQX5ba?MUx1vlYMi~UJ@Q!J=th4obmm)o)8Rt|Qk>!>X4MRWn?E$IYP$)> zM6j2cD5WW+%NkZEk4}x$cexHhFfW0{M{#(BmFdnmUQII97nVofdzgYZer0uv3)T;%h}Z9nYwP9F%X zmOH+!ApL!|0sVBK8ShUd7eRCCJ5}!!qB34%OpQeGi8;;JwF;%Z74dE3C0nQ3r_9X$ zMcE7q9{2>+2Fe5P@lTsS<)v<;K(n&hQCXpdQd*Slx$NbzS*OTlZYie5DgaRn0ftMP=-XZZ{@h^zV!BkD0JFU^G8t3PtT6?!f|W*W|;xswe~x%Z1l zvtrSABm2J!qE=FhCOd5fILwubvop5#58x@F+>ksAE%{*GxGNS7U}>c&c|%;GPRW9u zG5KU0^ip@L2o|%cOWv)iSCNr&;^Z9X8;3&{n+&!ENOSJ-qdrg1fw6iF#Ja}Tmd=IwDeY=PxP$*jE~A&)7i>FxR+ z%M{gxaSfOW*}$&l6tc)Y(K~jc;rcZ^DuXx}PF^>_(!}WC7Xt~Rh*3yKWVjUB0+iG` z{d3se*?JON9@P5_k)*o*&qrZhgA#P-pQ(c!Kk52d#!U-Ze8sS?9mc_$hR;2SvUpAd za)I$F+fnLOG{9)i;+`CN-2#aM^>u14!%B_%`n;%T3ZA<9){19GYCYRJYQ38qgKoKj zh(F)o+Jkqgzi8Tdo|lnPXc;dM_BaNk&g0Hn`dIy-(RI9O(fAn75644#Ec_=x$-`;S z>*%(P{0`d4O^SrZ))?=CV#8NhrIjboosC0mXQKxRCzNg#wOm9w;oP81T8eWzY!`(k zfEaey3Gkoj_eV3HPE%*p*GP@3HTc-XEQo9utJC*C_kq1&Y8|}d5BC>m+p`maC;&-Q zw8UYFfMZkoh$1AFmc79l9>C0Cw!Zcs`GfZQswYv#r!?6WX3fOf zgJeN8qM>Nk%^3L!QO}W<)!629lmqv?)qJV8P7bL#5vKK|G4*18Kj?(xznxaiDb{Vq z?_YzxEg&m#&)Rmu?(zT1b|sRRfoxsyZuB19`GWqZ&w+`&aQ@W%@_g>521CNrYQe5f z_oac&#Hu21P|Ncjqr+!T8C_O~x=2-5J=DDIBZK02RH`o&43y?oSn8-T&Vaf@r>0Qm zt&QTex;lg*##Y}ggCTX$L*BxCaTPAEg^fuH+^;(u99O;&$`aHpPoNEdGYN}i3KY;|-1c;y>|Tp8a9B6lg#UU#XLa>|YP$eK<|95&62!j&Sj2*EjWinQqxY?( zMbT_VAi+MvFIdWSL`hTvgSExrV1v5URI(qr>*G*8uC#QnxakP2OEs~L%qgPPyIXQ@ z@Aiz3vT1chbwtZQyM#6hV2Acl3|3~`T}Kz~8~=Xsi0f&Q!{Jh~zuCK7`K^ZeBPOdz z0kgSQLp8^Lu-So+QBLn)TngY&sxZL?+Fq#rnS6}G;cYQr)NO?fAD^ZvwJ&9a2cz55 z>Az{ZYtC9W8>@69WOc47raB0zyt5rrDEe)OptooTaIe5qw5S% zwS*|GV}~@W2RDoN*3*MaTvI2X%`-CEG&uwR^QFNk0MTugTc=(dxuPokxf5ZQ1qXtEpjeGPn9a!{4L5wG z$@P0P{KskXOokivaCekdFkm?%TU+KnhLAR5vI-t*q)c5vx2eHcl z65296*D?e*!&p02Y$%hS>Zp!AzI6GNxt3&2`=#$@P5`kEW2teewW^_4~s4~o&Q9E zc~pJYeQ)X0)Qn>ucQwntp}PrLr;;`yQi>!JQ+SJjPT{54w`_*$zS2BQ`!JUWq}p zKk=N{DD2Z=mVcJv&vzCQ-w3>UOVuvq)h6L4{-1kef~}?7eY?2be#7C!#)Cv>Iqw2Y z@j*!3K*S{h@XB!IH{R1C)%gE=J?w1#P1c#X|EwL>$rlwOyvYXx*oAd%YXu%Q=F4Y3 z)H3t`>0d+0G_@qAvQGz29douS^s$L`Xr4Bai+OSA@S&}2PG2?(&~j7p82?KS$)F{6 z#pfr8@P$24=~7MA;=0rey<&KtRt9*ReI4%4(0Q9zm0YU?bBcc|RbrTB!q8z4ibp*~|zVr9d?{89K@}f1uhC%-y D&6QcP literal 0 HcmV?d00001 From 48f69b320d73ff4de18fe909bb639f74830a89e3 Mon Sep 17 00:00:00 2001 From: Rachel Date: Wed, 10 Jul 2019 14:27:31 -0400 Subject: [PATCH 06/43] Updated focus for input groups --- src/components/23-input-group/input-group.hbs | 2 +- src/sass/components/_input-group.scss | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/components/23-input-group/input-group.hbs b/src/components/23-input-group/input-group.hbs index 5c7d1b1a..abefb03d 100644 --- a/src/components/23-input-group/input-group.hbs +++ b/src/components/23-input-group/input-group.hbs @@ -2,7 +2,7 @@

- +
diff --git a/src/sass/components/_input-group.scss b/src/sass/components/_input-group.scss index 6712e706..2ca59b94 100644 --- a/src/sass/components/_input-group.scss +++ b/src/sass/components/_input-group.scss @@ -18,6 +18,10 @@ z-index: map-get($z-index, z-100); } + &__input:focus:not(:last-child) { + z-index: 201; + } + &__append { flex-grow: 1; margin-left: -1px; From 62af13d1e123b90427abab91107668ff677cc2d4 Mon Sep 17 00:00:00 2001 From: Rachel Date: Wed, 10 Jul 2019 15:32:53 -0400 Subject: [PATCH 07/43] Updated z-index value to use sass map --- src/sass/components/_input-group.scss | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/sass/components/_input-group.scss b/src/sass/components/_input-group.scss index 2ca59b94..8a4d5dc7 100644 --- a/src/sass/components/_input-group.scss +++ b/src/sass/components/_input-group.scss @@ -18,8 +18,9 @@ z-index: map-get($z-index, z-100); } - &__input:focus:not(:last-child) { - z-index: 201; + &__input:focus:not(:last-child), + &__input:focus:not(:first-child) { + z-index: map-get($z-index, z-300); } &__append { From 6a8e02abb8129645502e611fa68725d3fa7e5edc Mon Sep 17 00:00:00 2001 From: Rachel Date: Thu, 11 Jul 2019 13:56:08 -0400 Subject: [PATCH 08/43] Fixed broken headerCSS function --- gulpfile.js | 6 +- package-lock.json | 360 +++++++++++++++++++++++++--------------------- 2 files changed, 202 insertions(+), 164 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index b71330fa..a34aade1 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -49,6 +49,7 @@ function lintSassWatch() { function lintSassBuild() { return src(["src/sass/**/*.scss", "!src/sass/libs/**/*.scss"]) .pipe(stylelint({ + failAfterError: true, reporters: [ {formatter: 'string', console: true} ] @@ -80,11 +81,10 @@ function compileCSS() { return src("static/css/rivet.css").pipe(dest("./css")); } -function headerCSS(callback) { - src("./css/rivet.css") +function headerCSS() { + return src("./css/rivet.css") .pipe(header(bannerPackage, { package: package })) .pipe(dest("./css/")); - callback(); } function minifyCSS(callback) { diff --git a/package-lock.json b/package-lock.json index 01b4fe58..f5ec6683 100755 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "rivet-uits", - "version": "1.5.0", + "version": "1.6.0", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -3616,13 +3616,12 @@ "dev": true }, "clone-regexp": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/clone-regexp/-/clone-regexp-1.0.1.tgz", - "integrity": "sha512-Fcij9IwRW27XedRIJnSOEupS7RVcXtObJXbcUOX93UCLqqOdRpkvzKywOOSizmEK/Is3S/RHX9dLdfo6R1Q1mw==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/clone-regexp/-/clone-regexp-2.2.0.tgz", + "integrity": "sha512-beMpP7BOtTipFuW8hrJvREQ2DrRu3BE7by0ZpibtfBA+qfHYvMGTc2Yb1JMYPKg/JUw0CHYvpg796aNTSW9z7Q==", "dev": true, "requires": { - "is-regexp": "^1.0.0", - "is-supported-regexp-flag": "^1.0.0" + "is-regexp": "^2.0.0" } }, "clone-stats": { @@ -5603,12 +5602,12 @@ } }, "execall": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/execall/-/execall-1.0.0.tgz", - "integrity": "sha1-c9CQTjlbPKsGWLCNCewlMH8pu3M=", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/execall/-/execall-2.0.0.tgz", + "integrity": "sha512-0FU2hZ5Hh6iQnarpRtQurM/aAvp3RIbfvgLHrcqJYzhXyV2KFruhuChf9NC6waAhiUR7FFtlugkI4p7f2Fqlow==", "dev": true, "requires": { - "clone-regexp": "^1.0.0" + "clone-regexp": "^2.1.0" } }, "executable": { @@ -5845,9 +5844,9 @@ "dev": true }, "fast-glob": { - "version": "2.2.6", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.6.tgz", - "integrity": "sha512-0BvMaZc1k9F+MeWWMe8pL6YltFzZYcJsYU7D4JyDA6PAczaXvxqQQ/z+mDF7/4Mw01DeUc+i3CTKajnkANkV4w==", + "version": "2.2.7", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.7.tgz", + "integrity": "sha512-g1KuQwHOZAmOZMuBtHdxDtju+T2RT8jgCC9aANsbpdiDDTSnjgfuVsIBNKbUeJI3oKMRExcfNDtJl4OhbffMsw==", "dev": true, "requires": { "@mrmlnc/readdir-enhanced": "^2.2.1", @@ -6670,9 +6669,9 @@ } }, "flatted": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.0.tgz", - "integrity": "sha512-R+H8IZclI8AAkSBRQJLVOsxwAoHd6WC40b4QTNWIjzAa6BXOBfQcM587MXDTVPeYaopFNWHUFLx7eNmHDSxMWg==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.1.tgz", + "integrity": "sha512-a1hQMktqW9Nmqr5aktAux3JMNqaucxGcjtjWnZLHX7yyPCmlSV3M54nGYbqT8K+0GhF3NBgmJCc3ma+WOgX8Jg==", "dev": true }, "flatten": { @@ -6819,7 +6818,8 @@ "ansi-regex": { "version": "2.1.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "aproba": { "version": "1.2.0", @@ -6840,12 +6840,14 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -6860,17 +6862,20 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -6987,7 +6992,8 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -6999,6 +7005,7 @@ "version": "1.0.0", "bundled": true, "dev": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -7013,6 +7020,7 @@ "version": "3.0.4", "bundled": true, "dev": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -7020,12 +7028,14 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "minipass": { "version": "2.3.5", "bundled": true, "dev": true, + "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -7044,6 +7054,7 @@ "version": "0.5.1", "bundled": true, "dev": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -7124,7 +7135,8 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -7136,6 +7148,7 @@ "version": "1.4.0", "bundled": true, "dev": true, + "optional": true, "requires": { "wrappy": "1" } @@ -7221,7 +7234,8 @@ "safe-buffer": { "version": "5.1.2", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "safer-buffer": { "version": "2.1.2", @@ -7257,6 +7271,7 @@ "version": "1.0.2", "bundled": true, "dev": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -7276,6 +7291,7 @@ "version": "3.0.1", "bundled": true, "dev": true, + "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -7319,12 +7335,14 @@ "wrappy": { "version": "1.0.2", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "yallist": { "version": "3.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true } } }, @@ -8792,9 +8810,9 @@ } }, "html-tags": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/html-tags/-/html-tags-2.0.0.tgz", - "integrity": "sha1-ELMKOGCF9Dzt41PMj6fLDe7qZos=", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/html-tags/-/html-tags-3.0.0.tgz", + "integrity": "sha512-xiXEBjihaNI+VZ2mKEoI5ZPxqUsevTKM+aeeJ/W4KAg2deGE35minmCJMn51BvwJZmiHaeAxrb2LAS0yZJxuuA==", "dev": true }, "htmlparser2": { @@ -8812,9 +8830,9 @@ }, "dependencies": { "readable-stream": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.3.0.tgz", - "integrity": "sha512-EsI+s3k3XsW+fU8fQACLN59ky34AZ14LoeVZpYwmZvldCFo0r0gnelwF2TcMjLor/BTL5aDJVBMkss0dthToPw==", + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.4.0.tgz", + "integrity": "sha512-jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ==", "dev": true, "requires": { "inherits": "^2.0.3", @@ -9371,9 +9389,9 @@ "dev": true }, "is-regexp": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-regexp/-/is-regexp-1.0.0.tgz", - "integrity": "sha1-/S2INUXEa6xaYz57mgnof6LLUGk=", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-regexp/-/is-regexp-2.1.0.tgz", + "integrity": "sha512-OZ4IlER3zmRIoB9AqNhEggVxqIH4ofDns5nRrPS6yQxXE1TPCUpFznBfRQmQa8uC+pXqjMnukiJBxCisIxiLGA==", "dev": true }, "is-relative": { @@ -9403,12 +9421,6 @@ "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=", "dev": true }, - "is-supported-regexp-flag": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-supported-regexp-flag/-/is-supported-regexp-flag-1.0.1.tgz", - "integrity": "sha512-3vcJecUUrpgCqc/ca0aWeNu64UGgxcvO60K/Fkr1N6RSvfGCTU60UKN68JDmKokgba0rFFJs12EnzOQa14ubKQ==", - "dev": true - }, "is-svg": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-svg/-/is-svg-2.1.0.tgz", @@ -9695,9 +9707,9 @@ } }, "known-css-properties": { - "version": "0.13.0", - "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.13.0.tgz", - "integrity": "sha512-6VWDxNr7cQXPDtMdCWLZMK3E8hdLrpyPPRdx6RbyvqklqgM6/XNFsVopv8QOZ+hRB6iHG/urEDwzlWbmMCv/kw==", + "version": "0.14.0", + "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.14.0.tgz", + "integrity": "sha512-P+0a/gBzLgVlCnK8I7VcD0yuYJscmWn66wH9tlKsQnmVdg689tLEmziwB9PuazZYLkcm07fvWOKCJJqI55sD5Q==", "dev": true }, "kuler": { @@ -10637,9 +10649,9 @@ } }, "mdast-util-compact": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/mdast-util-compact/-/mdast-util-compact-1.0.2.tgz", - "integrity": "sha512-d2WS98JSDVbpSsBfVvD9TaDMlqPRz7ohM/11G0rp5jOBb5q96RJ6YLszQ/09AAixyzh23FeIpCGqfaamEADtWg==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/mdast-util-compact/-/mdast-util-compact-1.0.3.tgz", + "integrity": "sha512-nRiU5GpNy62rZppDKbLwhhtw5DXoFMqw9UNZFmlPsNaQCZ//WLjGKUwWMdJrUH+Se7UvtO2gXtAMe0g/N+eI5w==", "dev": true, "requires": { "unist-util-visit": "^1.1.0" @@ -11083,9 +11095,9 @@ "dev": true }, "node-releases": { - "version": "1.1.19", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.19.tgz", - "integrity": "sha512-SH/B4WwovHbulIALsQllAVwqZZD1kPmKCqrhGfR29dXjLAVZMHvBjD3S6nL9D/J9QkmZ1R92/0wCMDKXUUvyyA==", + "version": "1.1.25", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.25.tgz", + "integrity": "sha512-fI5BXuk83lKEoZDdH3gRhtsNgh05/wZacuXkgbiYkceE7+QIMXOg98n9ZV7mz27B+kFHnqHcUpscZZlGRSmTpQ==", "dev": true, "requires": { "semver": "^5.3.0" @@ -13048,12 +13060,12 @@ } }, "postcss-jsx": { - "version": "0.36.0", - "resolved": "https://registry.npmjs.org/postcss-jsx/-/postcss-jsx-0.36.0.tgz", - "integrity": "sha512-/lWOSXSX5jlITCKFkuYU2WLFdrncZmjSVyNpHAunEgirZXLwI8RjU556e3Uz4mv0WVHnJA9d3JWb36lK9Yx99g==", + "version": "0.36.1", + "resolved": "https://registry.npmjs.org/postcss-jsx/-/postcss-jsx-0.36.1.tgz", + "integrity": "sha512-xaZpy01YR7ijsFUtu5rViYCFHurFIPHir+faiOQp8g/NfTfWqZCKDhKrydQZ4d8WlSAmVdXGwLjpFbsNUI26Sw==", "dev": true, "requires": { - "@babel/core": ">=7.1.0" + "@babel/core": ">=7.2.2" } }, "postcss-less": { @@ -13097,9 +13109,9 @@ } }, "postcss": { - "version": "7.0.16", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.16.tgz", - "integrity": "sha512-MOo8zNSlIqh22Uaa3drkdIAgUGEL+AD1ESiSdmElLUmE2uVDo1QloiT/IfW9qRw8Gw+Y/w69UVMGwbufMSftxA==", + "version": "7.0.17", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.17.tgz", + "integrity": "sha512-546ZowA+KZ3OasvQZHsbuEpysvwTZNGJv9EfyCQdsIDltPSWHAeTQ5fQy/Npi2ZDtLI3zs7Ps/p6wThErhm9fQ==", "dev": true, "requires": { "chalk": "^2.4.2", @@ -13845,9 +13857,9 @@ } }, "postcss": { - "version": "7.0.16", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.16.tgz", - "integrity": "sha512-MOo8zNSlIqh22Uaa3drkdIAgUGEL+AD1ESiSdmElLUmE2uVDo1QloiT/IfW9qRw8Gw+Y/w69UVMGwbufMSftxA==", + "version": "7.0.17", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.17.tgz", + "integrity": "sha512-546ZowA+KZ3OasvQZHsbuEpysvwTZNGJv9EfyCQdsIDltPSWHAeTQ5fQy/Npi2ZDtLI3zs7Ps/p6wThErhm9fQ==", "dev": true, "requires": { "chalk": "^2.4.2", @@ -13908,9 +13920,9 @@ } }, "postcss": { - "version": "7.0.16", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.16.tgz", - "integrity": "sha512-MOo8zNSlIqh22Uaa3drkdIAgUGEL+AD1ESiSdmElLUmE2uVDo1QloiT/IfW9qRw8Gw+Y/w69UVMGwbufMSftxA==", + "version": "7.0.17", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.17.tgz", + "integrity": "sha512-546ZowA+KZ3OasvQZHsbuEpysvwTZNGJv9EfyCQdsIDltPSWHAeTQ5fQy/Npi2ZDtLI3zs7Ps/p6wThErhm9fQ==", "dev": true, "requires": { "chalk": "^2.4.2", @@ -15611,9 +15623,9 @@ } }, "slash": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz", - "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", "dev": true }, "slice-ansi": { @@ -16245,9 +16257,9 @@ "dev": true }, "stylelint": { - "version": "10.0.1", - "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-10.0.1.tgz", - "integrity": "sha512-NbpD9BvQRmPe7QfaLB2OqhhDr5g6SAn43AAH2XLyqtQ9ZcioQECgadkIbormfhzxLhccAQWBZbVNiZz1oqEf8g==", + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-10.1.0.tgz", + "integrity": "sha512-OmlUXrgzEMLQYj1JPTpyZPR9G4bl0StidfHnGJEMpdiQ0JyTq0MPg1xkHk1/xVJ2rTPESyJCDWjG8Kbpoo7Kuw==", "dev": true, "requires": { "autoprefixer": "^9.5.1", @@ -16255,20 +16267,20 @@ "chalk": "^2.4.2", "cosmiconfig": "^5.2.0", "debug": "^4.1.1", - "execall": "^1.0.0", + "execall": "^2.0.0", "file-entry-cache": "^5.0.1", "get-stdin": "^7.0.0", "global-modules": "^2.0.0", "globby": "^9.2.0", "globjoin": "^0.1.4", - "html-tags": "^2.0.0", + "html-tags": "^3.0.0", "ignore": "^5.0.6", - "import-lazy": "^3.1.0", + "import-lazy": "^4.0.0", "imurmurhash": "^0.1.4", - "known-css-properties": "^0.13.0", + "known-css-properties": "^0.14.0", "leven": "^3.1.0", "lodash": "^4.17.11", - "log-symbols": "^2.2.0", + "log-symbols": "^3.0.0", "mathml-tag-names": "^2.1.0", "meow": "^5.0.0", "micromatch": "^4.0.0", @@ -16276,7 +16288,7 @@ "pify": "^4.0.1", "postcss": "^7.0.14", "postcss-html": "^0.36.0", - "postcss-jsx": "^0.36.0", + "postcss-jsx": "^0.36.1", "postcss-less": "^3.1.4", "postcss-markdown": "^0.36.0", "postcss-media-query-parser": "^0.2.3", @@ -16290,9 +16302,10 @@ "postcss-value-parser": "^3.3.1", "resolve-from": "^5.0.0", "signal-exit": "^3.0.2", - "slash": "^2.0.0", + "slash": "^3.0.0", "specificity": "^0.4.1", "string-width": "^4.1.0", + "strip-ansi": "^5.2.0", "style-search": "^0.1.0", "sugarss": "^2.0.0", "svg-tags": "^1.0.0", @@ -16300,9 +16313,9 @@ }, "dependencies": { "ajv": { - "version": "6.10.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz", - "integrity": "sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==", + "version": "6.10.1", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.1.tgz", + "integrity": "sha512-w1YQaVGNC6t2UCPjEawK/vo/dG8OOrVtUmhBT1uJJYxbl5kU2Tj3v6LGqBcsysN1yhuCStJCCA3GqdvKY8sqXQ==", "dev": true, "requires": { "fast-deep-equal": "^2.0.1", @@ -16327,17 +16340,26 @@ } }, "autoprefixer": { - "version": "9.5.1", - "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.5.1.tgz", - "integrity": "sha512-KJSzkStUl3wP0D5sdMlP82Q52JLy5+atf2MHAre48+ckWkXgixmfHyWmA77wFDy6jTHU6mIgXv6hAQ2mf1PjJQ==", + "version": "9.6.1", + "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.6.1.tgz", + "integrity": "sha512-aVo5WxR3VyvyJxcJC3h4FKfwCQvQWb1tSI5VHNibddCVWrcD1NvlxEweg3TSgiPztMnWfjpy2FURKA2kvDE+Tw==", "dev": true, "requires": { - "browserslist": "^4.5.4", - "caniuse-lite": "^1.0.30000957", + "browserslist": "^4.6.3", + "caniuse-lite": "^1.0.30000980", + "chalk": "^2.4.2", "normalize-range": "^0.1.2", "num2fraction": "^1.2.2", - "postcss": "^7.0.14", - "postcss-value-parser": "^3.3.1" + "postcss": "^7.0.17", + "postcss-value-parser": "^4.0.0" + }, + "dependencies": { + "postcss-value-parser": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.0.0.tgz", + "integrity": "sha512-ESPktioptiSUchCKgggAkzdmkgzKfmp0EU8jXH+5kbIUB+unr0Y4CY9SRMvibuvYUBjNh1ACLbxqYNpdTQOteQ==", + "dev": true + } } }, "braces": { @@ -16350,14 +16372,14 @@ } }, "browserslist": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.6.0.tgz", - "integrity": "sha512-Jk0YFwXBuMOOol8n6FhgkDzn3mY9PYLYGk29zybF05SbRTsMgPqmTNeQQhOghCxq5oFqAXE3u4sYddr4C0uRhg==", + "version": "4.6.4", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.6.4.tgz", + "integrity": "sha512-ErJT8qGfRt/VWHSr1HeqZzz50DvxHtr1fVL1m5wf20aGrG8e1ce8fpZ2EjZEfs09DDZYSvtRaDlMpWslBf8Low==", "dev": true, "requires": { - "caniuse-lite": "^1.0.30000967", - "electron-to-chromium": "^1.3.133", - "node-releases": "^1.1.19" + "caniuse-lite": "^1.0.30000981", + "electron-to-chromium": "^1.3.188", + "node-releases": "^1.1.25" } }, "camelcase": { @@ -16378,9 +16400,9 @@ } }, "caniuse-lite": { - "version": "1.0.30000969", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000969.tgz", - "integrity": "sha512-Kus0yxkoAJgVc0bax7S4gLSlFifCa7MnSZL9p9VuS/HIKEL4seaqh28KIQAAO50cD/rJ5CiJkJFapkdDAlhFxQ==", + "version": "1.0.30000983", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000983.tgz", + "integrity": "sha512-/llD1bZ6qwNkt41AsvjsmwNOoA4ZB+8iqmf5LVyeSXuBODT/hAMFNVOh84NdUzoiYiSKqo5vQ3ZzeYHSi/olDQ==", "dev": true }, "chalk": { @@ -16392,17 +16414,6 @@ "ansi-styles": "^3.2.1", "escape-string-regexp": "^1.0.5", "supports-color": "^5.3.0" - }, - "dependencies": { - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - } } }, "cosmiconfig": { @@ -16436,9 +16447,9 @@ } }, "electron-to-chromium": { - "version": "1.3.134", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.134.tgz", - "integrity": "sha512-C3uK2SrtWg/gSWaluLHWSHjyebVZCe4ZC0NVgTAoTq8tCR9FareRK5T7R7AS/nPZShtlEcjVMX1kQ8wi4nU68w==", + "version": "1.3.189", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.189.tgz", + "integrity": "sha512-C26Kv6/rLNmGDaPR5HORMtTQat9aWBBKjQk9aFtN1Bk6cQBSw8cYdsel/mcrQlNlMMjt1sAKsTYqf77+sK2uTw==", "dev": true }, "fast-deep-equal": { @@ -16532,19 +16543,25 @@ "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz", "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==", "dev": true + }, + "slash": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz", + "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==", + "dev": true } } }, "ignore": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.1.tgz", - "integrity": "sha512-DWjnQIFLenVrwyRCKZT+7a7/U4Cqgar4WG8V++K3hw+lrW1hc/SIwdiGmtxKCVACmHULTuGeBbHJmbwW7/sAvA==", + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.2.tgz", + "integrity": "sha512-vdqWBp7MyzdmHkkRWV5nY+PfGRbYbahfuvsBCh277tq+w9zyNi7h5CYJCK0kmzti9kU+O/cB7sE8HvKv6aXAKQ==", "dev": true }, "import-lazy": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-3.1.0.tgz", - "integrity": "sha512-8/gvXvX2JMn0F+CDlSC4l6kOmVaLOO3XLkksI7CI3Ud95KDYJuYur2b9P/PUt/i/pDAMd/DulQsNbbbmRRsDIQ==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-4.0.0.tgz", + "integrity": "sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==", "dev": true }, "indent-string": { @@ -16565,16 +16582,6 @@ "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", "dev": true }, - "js-yaml": { - "version": "3.13.1", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz", - "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==", - "dev": true, - "requires": { - "argparse": "^1.0.7", - "esprima": "^4.0.0" - } - }, "json-schema-traverse": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", @@ -16607,6 +16614,15 @@ } } }, + "log-symbols": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-3.0.0.tgz", + "integrity": "sha512-dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ==", + "dev": true, + "requires": { + "chalk": "^2.4.2" + } + }, "map-obj": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-2.0.0.tgz", @@ -16641,9 +16657,9 @@ } }, "ms": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", - "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", "dev": true }, "parse-json": { @@ -16680,14 +16696,25 @@ "dev": true }, "postcss": { - "version": "7.0.16", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.16.tgz", - "integrity": "sha512-MOo8zNSlIqh22Uaa3drkdIAgUGEL+AD1ESiSdmElLUmE2uVDo1QloiT/IfW9qRw8Gw+Y/w69UVMGwbufMSftxA==", + "version": "7.0.17", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.17.tgz", + "integrity": "sha512-546ZowA+KZ3OasvQZHsbuEpysvwTZNGJv9EfyCQdsIDltPSWHAeTQ5fQy/Npi2ZDtLI3zs7Ps/p6wThErhm9fQ==", "dev": true, "requires": { "chalk": "^2.4.2", "source-map": "^0.6.1", "supports-color": "^6.1.0" + }, + "dependencies": { + "supports-color": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", + "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } } }, "postcss-reporter": { @@ -16700,6 +16727,17 @@ "lodash": "^4.17.11", "log-symbols": "^2.2.0", "postcss": "^7.0.7" + }, + "dependencies": { + "log-symbols": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz", + "integrity": "sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==", + "dev": true, + "requires": { + "chalk": "^2.0.1" + } + } } }, "postcss-scss": { @@ -16811,18 +16849,18 @@ "dev": true }, "supports-color": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", - "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", "dev": true, "requires": { "has-flag": "^3.0.0" } }, "table": { - "version": "5.3.3", - "resolved": "https://registry.npmjs.org/table/-/table-5.3.3.tgz", - "integrity": "sha512-3wUNCgdWX6PNpOe3amTTPWPuF6VGvgzjKCaO1snFj0z7Y3mUPWf5+zDtxUVGispJkDECPmR29wbzh6bVMOHbcw==", + "version": "5.4.1", + "resolved": "https://registry.npmjs.org/table/-/table-5.4.1.tgz", + "integrity": "sha512-E6CK1/pZe2N75rGZQotFOdmzWQ1AILtgYbMAbAjvms0S1l5IDB47zG3nCnFGB/w+7nB3vKofbLXCH7HPBo864w==", "dev": true, "requires": { "ajv": "^6.9.1", @@ -16983,9 +17021,9 @@ } }, "postcss": { - "version": "7.0.16", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.16.tgz", - "integrity": "sha512-MOo8zNSlIqh22Uaa3drkdIAgUGEL+AD1ESiSdmElLUmE2uVDo1QloiT/IfW9qRw8Gw+Y/w69UVMGwbufMSftxA==", + "version": "7.0.17", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.17.tgz", + "integrity": "sha512-546ZowA+KZ3OasvQZHsbuEpysvwTZNGJv9EfyCQdsIDltPSWHAeTQ5fQy/Npi2ZDtLI3zs7Ps/p6wThErhm9fQ==", "dev": true, "requires": { "chalk": "^2.4.2", @@ -17973,24 +18011,24 @@ } }, "unist-util-find-all-after": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/unist-util-find-all-after/-/unist-util-find-all-after-1.0.2.tgz", - "integrity": "sha512-nDl79mKpffXojLpCimVXnxhlH/jjaTnDuScznU9J4jjsaUtBdDbxmlc109XtcqxY4SDO0SwzngsxxW8DIISt1w==", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/unist-util-find-all-after/-/unist-util-find-all-after-1.0.4.tgz", + "integrity": "sha512-CaxvMjTd+yF93BKLJvZnEfqdM7fgEACsIpQqz8vIj9CJnUb9VpyymFS3tg6TCtgrF7vfCJBF5jbT2Ox9CBRYRQ==", "dev": true, "requires": { - "unist-util-is": "^2.0.0" + "unist-util-is": "^3.0.0" } }, "unist-util-is": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-2.1.2.tgz", - "integrity": "sha512-YkXBK/H9raAmG7KXck+UUpnKiNmUdB+aBGrknfQ4EreE1banuzrKABx3jP6Z5Z3fMSPMQQmeXBlKpCbMwBkxVw==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-3.0.0.tgz", + "integrity": "sha512-sVZZX3+kspVNmLWBPAB6r+7D9ZgAFPNWm66f7YNb420RlQSbn+n8rG8dGZSkrER7ZIXGQYNm5pqC3v3HopH24A==", "dev": true }, "unist-util-remove-position": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-1.1.2.tgz", - "integrity": "sha512-XxoNOBvq1WXRKXxgnSYbtCF76TJrRoe5++pD4cCBsssSiWSnPEktyFrFLE8LTk3JW5mt9hB0Sk5zn4x/JeWY7Q==", + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-1.1.3.tgz", + "integrity": "sha512-CtszTlOjP2sBGYc2zcKA/CvNdTdEs3ozbiJ63IPBxh8iZg42SCCb8m04f8z2+V1aSk5a7BxbZKEdoDjadmBkWA==", "dev": true, "requires": { "unist-util-visit": "^1.1.0" @@ -18003,21 +18041,21 @@ "dev": true }, "unist-util-visit": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-1.4.0.tgz", - "integrity": "sha512-FiGu34ziNsZA3ZUteZxSFaczIjGmksfSgdKqBfOejrrfzyUy5b7YrlzT1Bcvi+djkYDituJDy2XB7tGTeBieKw==", + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-1.4.1.tgz", + "integrity": "sha512-AvGNk7Bb//EmJZyhtRUnNMEpId/AZ5Ph/KUpTI09WHQuDZHKovQ1oEv3mfmKpWKtoMzyMC4GLBm1Zy5k12fjIw==", "dev": true, "requires": { "unist-util-visit-parents": "^2.0.0" } }, "unist-util-visit-parents": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-2.1.0.tgz", - "integrity": "sha512-j0XZY3063E6v7qhx4+Q2Z0r8SMrLX7Mr6DabiCy67zMEcFQYtpNOplLlEK1KKEBEs9S+xB5U+yloQxbSwF9P/g==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-2.1.2.tgz", + "integrity": "sha512-DyN5vD4NE3aSeB+PXYNKxzGsfocxp6asDc2XXE3b0ekO2BaRUpBicbbUygfSvYfUz1IkmjFR1YF7dPklraMZ2g==", "dev": true, "requires": { - "unist-util-is": "^2.1.2" + "unist-util-is": "^3.0.0" } }, "universalify": { @@ -18282,9 +18320,9 @@ } }, "vfile-location": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/vfile-location/-/vfile-location-2.0.4.tgz", - "integrity": "sha512-KRL5uXQPoUKu+NGvQVL4XLORw45W62v4U4gxJ3vRlDfI9QsT4ZN1PNXn/zQpKUulqGDpYuT0XDfp5q9O87/y/w==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/vfile-location/-/vfile-location-2.0.5.tgz", + "integrity": "sha512-Pa1ey0OzYBkLPxPZI3d9E+S4BmvfVwNAAXrrqGbwTVXWaX2p9kM1zZ+n35UtVM06shmWKH4RPRN8KI80qE3wNQ==", "dev": true }, "vfile-message": { From 4aaf091d93ab478682b1181be7a4647f6d6f83d8 Mon Sep 17 00:00:00 2001 From: Rachel Date: Tue, 16 Jul 2019 09:47:19 -0400 Subject: [PATCH 09/43] Transferred Timeline component from codepen to repository --- src/components/29-timeline/README.md | 12 ++ .../29-timeline/timeline--centered-dates.hbs | 32 +++ .../29-timeline/timeline--centered.hbs | 32 +++ .../29-timeline/timeline--right-aligned.hbs | 28 +++ .../29-timeline/timeline--right-dates.hbs | 28 +++ .../29-timeline/timeline--standard-dates.hbs | 28 +++ .../29-timeline/timeline.config.yml | 14 ++ src/components/29-timeline/timeline.hbs | 28 +++ src/sass/components/_timeline.scss | 195 ++++++++++++++++++ src/sass/rivet.scss | 1 + 10 files changed, 398 insertions(+) create mode 100644 src/components/29-timeline/README.md create mode 100644 src/components/29-timeline/timeline--centered-dates.hbs create mode 100644 src/components/29-timeline/timeline--centered.hbs create mode 100644 src/components/29-timeline/timeline--right-aligned.hbs create mode 100644 src/components/29-timeline/timeline--right-dates.hbs create mode 100644 src/components/29-timeline/timeline--standard-dates.hbs create mode 100644 src/components/29-timeline/timeline.config.yml create mode 100644 src/components/29-timeline/timeline.hbs create mode 100644 src/sass/components/_timeline.scss diff --git a/src/components/29-timeline/README.md b/src/components/29-timeline/README.md new file mode 100644 index 00000000..1fb33b79 --- /dev/null +++ b/src/components/29-timeline/README.md @@ -0,0 +1,12 @@ +# Timeline +The timeline component can be used to visualize a series of events, deadlines, or other time-relevant material. + +## When to use +- Your website or app needs to display a series of time-related events/activities that require further explanation + +## When to consider something else +- When communicating where users are in a process, use the Step Indicator +- For normal lists, use ordered lists or unordered lists + +## Implementation notes +- Keep date labels short (a date, season, year, or other temporal descriptions) \ No newline at end of file diff --git a/src/components/29-timeline/timeline--centered-dates.hbs b/src/components/29-timeline/timeline--centered-dates.hbs new file mode 100644 index 00000000..25864e26 --- /dev/null +++ b/src/components/29-timeline/timeline--centered-dates.hbs @@ -0,0 +1,32 @@ +
+
+
+

Timeline Component

+

Centered with date labels

+
+
+
+
+
+
+

Sample Item

+ Spring 2019 +

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus in nulla ante. Suspendisse potenti. Donec efficitur, sem vitae dignissim viverra, nunc purus tempus nisi, feugiat ullamcorper tellus urna ut dui. Suspendisse potenti.

+
+
+
+
+
+
+
+
+

Sample Item 2

+ Summer 2019 +

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus in nulla ante. Suspendisse potenti. Donec efficitur, sem vitae dignissim viverra, nunc purus tempus nisi, feugiat ullamcorper tellus urna ut dui. Suspendisse potenti.

+
+
+
+
+
+
+
\ No newline at end of file diff --git a/src/components/29-timeline/timeline--centered.hbs b/src/components/29-timeline/timeline--centered.hbs new file mode 100644 index 00000000..7ca2ccff --- /dev/null +++ b/src/components/29-timeline/timeline--centered.hbs @@ -0,0 +1,32 @@ +
+
+
+

Timeline Component

+

Centered

+
+
+
+
+
+
+

Sample Item

+ Spring 2019 +

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus in nulla ante. Suspendisse potenti. Donec efficitur, sem vitae dignissim viverra, nunc purus tempus nisi, feugiat ullamcorper tellus urna ut dui. Suspendisse potenti.

+
+
+
+
+
+
+
+
+

Sample Item 2

+ Summer 2019 +

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus in nulla ante. Suspendisse potenti. Donec efficitur, sem vitae dignissim viverra, nunc purus tempus nisi, feugiat ullamcorper tellus urna ut dui. Suspendisse potenti.

+
+
+
+
+
+
+
\ No newline at end of file diff --git a/src/components/29-timeline/timeline--right-aligned.hbs b/src/components/29-timeline/timeline--right-aligned.hbs new file mode 100644 index 00000000..5273ed47 --- /dev/null +++ b/src/components/29-timeline/timeline--right-aligned.hbs @@ -0,0 +1,28 @@ +
+
+
+

Timeline Component

+

Right-aligned

+
+
+
+
+
+

Sample Item

+ Spring 2019 +

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus in nulla ante. Suspendisse potenti. Donec efficitur, sem vitae dignissim viverra, nunc purus tempus nisi, feugiat ullamcorper tellus urna ut dui. Suspendisse potenti.

+
+
+
+
+
+
+

Sample Item 2

+ Summer 2019 +

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus in nulla ante. Suspendisse potenti. Donec efficitur, sem vitae dignissim viverra, nunc purus tempus nisi, feugiat ullamcorper tellus urna ut dui. Suspendisse potenti.

+
+
+
+
+
+
\ No newline at end of file diff --git a/src/components/29-timeline/timeline--right-dates.hbs b/src/components/29-timeline/timeline--right-dates.hbs new file mode 100644 index 00000000..3c83566a --- /dev/null +++ b/src/components/29-timeline/timeline--right-dates.hbs @@ -0,0 +1,28 @@ +
+
+
+

Timeline Component

+

Right-aligned with date labels

+
+
+
+
+
+

Sample Item

+ Spring 2019 +

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus in nulla ante. Suspendisse potenti. Donec efficitur, sem vitae dignissim viverra, nunc purus tempus nisi, feugiat ullamcorper tellus urna ut dui. Suspendisse potenti.

+
+
+
+
+
+
+

Sample Item 2

+ Summer 2019 +

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus in nulla ante. Suspendisse potenti. Donec efficitur, sem vitae dignissim viverra, nunc purus tempus nisi, feugiat ullamcorper tellus urna ut dui. Suspendisse potenti.

+
+
+
+
+
+
\ No newline at end of file diff --git a/src/components/29-timeline/timeline--standard-dates.hbs b/src/components/29-timeline/timeline--standard-dates.hbs new file mode 100644 index 00000000..5d04f2ce --- /dev/null +++ b/src/components/29-timeline/timeline--standard-dates.hbs @@ -0,0 +1,28 @@ +
+
+
+

Timeline Component

+

Standard with date labels

+
+
+
+
+
+

Sample Item

+ Spring 2019 +

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus in nulla ante. Suspendisse potenti. Donec efficitur, sem vitae dignissim viverra, nunc purus tempus nisi, feugiat ullamcorper tellus urna ut dui. Suspendisse potenti.

+
+
+
+
+
+
+

Sample Item 2

+ Summer 2019 +

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus in nulla ante. Suspendisse potenti. Donec efficitur, sem vitae dignissim viverra, nunc purus tempus nisi, feugiat ullamcorper tellus urna ut dui. Suspendisse potenti.

+
+
+
+
+
+
\ No newline at end of file diff --git a/src/components/29-timeline/timeline.config.yml b/src/components/29-timeline/timeline.config.yml new file mode 100644 index 00000000..6ca0e8fb --- /dev/null +++ b/src/components/29-timeline/timeline.config.yml @@ -0,0 +1,14 @@ +status: "alpha" +variants: + - name: "default" + label: "Standard Timeline" + - name: "standard-dates" + label: "Standard Timeline w/ Date Labels" + - name: "centered" + label: "Centered Timeline" + - name: "centered-dates" + label: "Centered Timeline w/ Date Labels" + - name: "right-aligned" + label: "Right-aligned Timeline" + - name: "right-dates" + label: "Right-aligned Timeline w/ Date Labels" \ No newline at end of file diff --git a/src/components/29-timeline/timeline.hbs b/src/components/29-timeline/timeline.hbs new file mode 100644 index 00000000..991a7f8e --- /dev/null +++ b/src/components/29-timeline/timeline.hbs @@ -0,0 +1,28 @@ +
+
+
+

Timeline Component

+

Standard

+
+
+
+
+
+

Sample Item

+ Spring 2019 +

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus in nulla ante. Suspendisse potenti. Donec efficitur, sem vitae dignissim viverra, nunc purus tempus nisi, feugiat ullamcorper tellus urna ut dui. Suspendisse potenti.

+
+
+
+
+
+
+

Sample Item 2

+ Summer 2019 +

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus in nulla ante. Suspendisse potenti. Donec efficitur, sem vitae dignissim viverra, nunc purus tempus nisi, feugiat ullamcorper tellus urna ut dui. Suspendisse potenti.

+
+
+
+
+
+
\ No newline at end of file diff --git a/src/sass/components/_timeline.scss b/src/sass/components/_timeline.scss new file mode 100644 index 00000000..07492a7b --- /dev/null +++ b/src/sass/components/_timeline.scss @@ -0,0 +1,195 @@ +// Copyright (C) 2018 The Trustees of Indiana University +// SPDX-License-Identifier: BSD-3-Clause + +.#{$prefix}-timeline { + width: 90%; + margin: 0 auto; + position: relative; + padding: $lg 0; + margin-top: $lg; + margin-bottom: $lg; + + &::before { + content: ''; + position: absolute; + top: 0; + left: 0; + height: 100%; + width: $xxs; + background: $color-black--200; + } + + &:first-child { + margin-top: 0; + } + + .#{$prefix}-timeline__item::after { + margin-left: -$xxs; + border: solid transparent; + content: " "; + height: 0; + width: 0; + position: absolute; + pointer-events: none; + border-right-color: #f5f5f6; + border-width: $sm; + top: .625rem; + } + + .#{$prefix}-timeline__item { + position: relative; + margin: $lg 0; + } + + .#{$prefix}-timeline__marker { + width: .75rem; + height: .75rem; + position: absolute; + color: $color-white; + background: $color-midnight; + border-radius: 50%; + box-shadow: 0 0 0 5px #f5f5f6; + margin-top: 1.25rem; + margin-left: -$xxs; + } + + .#{$prefix}-timeline__content { + margin-left: 1.75rem; + } + + .#{$prefix}-timeline__date { + font-size: $ts-14; + color: $color-black--700; + } +} + +.#{$prefix}-timeline-right { + &::before { + content: ''; + position: absolute; + top: 0; + left: unset; + right: 1.125rem; + height: 100%; + width: $xxs; + background: $color-cream; + } + + .#{$prefix}-timeline__item::after { + margin-left: 0; + right: $sm; + border-left-color: #f5f5f6; + border-right-color: transparent; + } + + .#{$prefix}-timeline__marker { + margin-left: 0; + right: .75rem; + } + + .#{$prefix}-timeline__content { + margin-left: 0; + margin-right: 3rem; + } +} + +@media screen and (min-width: 740px) { + .#{$prefix}-timeline-center { + &::before { + content: ''; + position: absolute; + top: 0; + left: 50%; + height: 100%; + width: $xxs; + background: $color-cream; + } + + .#{$prefix}-timeline__item-right { + margin-left: auto; + } + + .#{$prefix}-timeline__item::after { + margin-left: -$md; + left: 100%; + border-left-color: #f5f5f6; + border-right-color: transparent; + } + + .#{$prefix}-timeline__item-right::after { + margin-left: -$sm; + left: unset; + border-right-color: #f5f5f6; + border-left-color: transparent; + } + + .#{$prefix}-timeline__marker { + margin-left: -$xxs; + left: 100%; + } + + .#{$prefix}-timeline__item-right .#{$prefix}-timeline__marker { + left: unset; + margin-left: -$sm; + } + + .#{$prefix}-timeline__content { + margin-left: 0; + margin-right: .75rem; + } + + .#{$prefix}-timeline__item-right .#{$prefix}-timeline__content { + margin-right: 0; + margin-left: $sm; + } + } +} + +@media screen and (min-width: 1260px) { + .#{$prefix}-timeline-center .#{$prefix}-timeline__item { + .#{$prefix}-timeline__date.#{$prefix}-timeline__date--label { + max-width: fit-content; + text-align: left; + position: relative; + display: block; + left: unset; + right: unset; + top: unset; + margin-left: 30.5rem; + margin-top: -3rem; + margin-bottom: 3rem; + } + } + + .#{$prefix}-timeline-right .#{$prefix}-timeline__item { + .#{$prefix}-timeline__date.#{$prefix}-timeline__date--label { + max-width: fit-content; + text-align: left; + position: relative; + display: block; + left: unset; + right: unset; + top: unset; + margin-left: 60rem; + margin-top: -3rem; + margin-bottom: 3rem; + } + } + + .#{$prefix}-timeline-center .#{$prefix}-timeline__item-right, + .#{$prefix}-timeline__item { + .#{$prefix}-timeline__date.#{$prefix}-timeline__date--label { + min-width: 6.25rem; + min-height: fit-content; + left: -7.5rem; + right: initial; + text-align: right; + position: absolute; + display: block; + top: $sm; + margin-left: unset; + margin-top: unset; + margin-right: unset; + } + } +} diff --git a/src/sass/rivet.scss b/src/sass/rivet.scss index 08c5df8a..46f972bf 100644 --- a/src/sass/rivet.scss +++ b/src/sass/rivet.scss @@ -41,5 +41,6 @@ @import "components/step-indicator"; @import "components/tables"; @import "components/tabs"; +@import "components/timeline"; @import "components/type-scale"; @import "components/validation"; From 11e59bec52092ad7c99a370c16dfc911f2f09385 Mon Sep 17 00:00:00 2001 From: Rachel Date: Thu, 18 Jul 2019 10:07:53 -0400 Subject: [PATCH 10/43] Fixed BEM modifier to .rvt-timeline--right --- src/components/29-timeline/timeline--right-aligned.hbs | 2 +- src/components/29-timeline/timeline--right-dates.hbs | 2 +- src/sass/components/_timeline.scss | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/29-timeline/timeline--right-aligned.hbs b/src/components/29-timeline/timeline--right-aligned.hbs index 5273ed47..55607030 100644 --- a/src/components/29-timeline/timeline--right-aligned.hbs +++ b/src/components/29-timeline/timeline--right-aligned.hbs @@ -3,7 +3,7 @@

Timeline Component

Right-aligned

-
+
diff --git a/src/components/29-timeline/timeline--right-dates.hbs b/src/components/29-timeline/timeline--right-dates.hbs index 3c83566a..d28f698e 100644 --- a/src/components/29-timeline/timeline--right-dates.hbs +++ b/src/components/29-timeline/timeline--right-dates.hbs @@ -3,7 +3,7 @@

Timeline Component

Right-aligned with date labels

-
+
diff --git a/src/sass/components/_timeline.scss b/src/sass/components/_timeline.scss index 07492a7b..798b7ad3 100644 --- a/src/sass/components/_timeline.scss +++ b/src/sass/components/_timeline.scss @@ -161,7 +161,7 @@ } } - .#{$prefix}-timeline-right .#{$prefix}-timeline__item { + .#{$prefix}-timeline--right .#{$prefix}-timeline__item { .#{$prefix}-timeline__date.#{$prefix}-timeline__date--label { max-width: fit-content; text-align: left; From d8662cc3baf09e8e224ba3a3d95f1f8e83677dac Mon Sep 17 00:00:00 2001 From: Rachel Date: Thu, 18 Jul 2019 10:09:22 -0400 Subject: [PATCH 11/43] Removed superfluous data attributes --- src/components/29-timeline/timeline--centered-dates.hbs | 2 +- src/components/29-timeline/timeline--centered.hbs | 2 +- src/components/29-timeline/timeline--standard-dates.hbs | 2 +- src/components/29-timeline/timeline.hbs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/29-timeline/timeline--centered-dates.hbs b/src/components/29-timeline/timeline--centered-dates.hbs index 25864e26..3d522c19 100644 --- a/src/components/29-timeline/timeline--centered-dates.hbs +++ b/src/components/29-timeline/timeline--centered-dates.hbs @@ -16,7 +16,7 @@
-
+
diff --git a/src/components/29-timeline/timeline--centered.hbs b/src/components/29-timeline/timeline--centered.hbs index 7ca2ccff..0e7623fa 100644 --- a/src/components/29-timeline/timeline--centered.hbs +++ b/src/components/29-timeline/timeline--centered.hbs @@ -16,7 +16,7 @@
-
+
diff --git a/src/components/29-timeline/timeline--standard-dates.hbs b/src/components/29-timeline/timeline--standard-dates.hbs index 5d04f2ce..3e29783c 100644 --- a/src/components/29-timeline/timeline--standard-dates.hbs +++ b/src/components/29-timeline/timeline--standard-dates.hbs @@ -4,7 +4,7 @@

Timeline Component

Standard with date labels

-
+
diff --git a/src/components/29-timeline/timeline.hbs b/src/components/29-timeline/timeline.hbs index 991a7f8e..6e33befa 100644 --- a/src/components/29-timeline/timeline.hbs +++ b/src/components/29-timeline/timeline.hbs @@ -4,7 +4,7 @@

Timeline Component

Standard

-
+
From 76ec330968435757e7721b4210291f31d8c12dd6 Mon Sep 17 00:00:00 2001 From: Rachel Date: Thu, 18 Jul 2019 10:14:39 -0400 Subject: [PATCH 12/43] Switched to using mq mixin --- src/sass/components/_timeline.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/sass/components/_timeline.scss b/src/sass/components/_timeline.scss index 798b7ad3..e7ab3833 100644 --- a/src/sass/components/_timeline.scss +++ b/src/sass/components/_timeline.scss @@ -93,7 +93,7 @@ } } -@media screen and (min-width: 740px) { +@include mq($breakpoint-md) { .#{$prefix}-timeline-center { &::before { content: ''; @@ -145,7 +145,7 @@ } } -@media screen and (min-width: 1260px) { +@include mq($breakpoint-xl) { .#{$prefix}-timeline-center .#{$prefix}-timeline__item { .#{$prefix}-timeline__date.#{$prefix}-timeline__date--label { max-width: fit-content; From 823ac06a6e0471ec57d4b4ebed6eac34da142fe3 Mon Sep 17 00:00:00 2001 From: Rachel Date: Thu, 18 Jul 2019 10:20:59 -0400 Subject: [PATCH 13/43] Added aria-hidden to __marker --- src/components/29-timeline/timeline--centered-dates.hbs | 4 ++-- src/components/29-timeline/timeline--centered.hbs | 4 ++-- src/components/29-timeline/timeline--right-aligned.hbs | 4 ++-- src/components/29-timeline/timeline--right-dates.hbs | 4 ++-- src/components/29-timeline/timeline--standard-dates.hbs | 4 ++-- src/components/29-timeline/timeline.hbs | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/components/29-timeline/timeline--centered-dates.hbs b/src/components/29-timeline/timeline--centered-dates.hbs index 3d522c19..494e33ab 100644 --- a/src/components/29-timeline/timeline--centered-dates.hbs +++ b/src/components/29-timeline/timeline--centered-dates.hbs @@ -6,7 +6,7 @@
-
+

Sample Item

@@ -17,7 +17,7 @@
-
+

Sample Item 2

diff --git a/src/components/29-timeline/timeline--centered.hbs b/src/components/29-timeline/timeline--centered.hbs index 0e7623fa..68669853 100644 --- a/src/components/29-timeline/timeline--centered.hbs +++ b/src/components/29-timeline/timeline--centered.hbs @@ -6,7 +6,7 @@
-
+

Sample Item

@@ -17,7 +17,7 @@
-
+

Sample Item 2

diff --git a/src/components/29-timeline/timeline--right-aligned.hbs b/src/components/29-timeline/timeline--right-aligned.hbs index 55607030..bdf2ebec 100644 --- a/src/components/29-timeline/timeline--right-aligned.hbs +++ b/src/components/29-timeline/timeline--right-aligned.hbs @@ -5,7 +5,7 @@

Right-aligned

-
+

Sample Item

@@ -14,7 +14,7 @@
-
+

Sample Item 2

diff --git a/src/components/29-timeline/timeline--right-dates.hbs b/src/components/29-timeline/timeline--right-dates.hbs index d28f698e..7a171218 100644 --- a/src/components/29-timeline/timeline--right-dates.hbs +++ b/src/components/29-timeline/timeline--right-dates.hbs @@ -5,7 +5,7 @@

Right-aligned with date labels

-
+

Sample Item

@@ -14,7 +14,7 @@
-
+

Sample Item 2

diff --git a/src/components/29-timeline/timeline--standard-dates.hbs b/src/components/29-timeline/timeline--standard-dates.hbs index 3e29783c..ce70f8f6 100644 --- a/src/components/29-timeline/timeline--standard-dates.hbs +++ b/src/components/29-timeline/timeline--standard-dates.hbs @@ -5,7 +5,7 @@

Standard with date labels

-
+

Sample Item

@@ -14,7 +14,7 @@
-
+

Sample Item 2

diff --git a/src/components/29-timeline/timeline.hbs b/src/components/29-timeline/timeline.hbs index 6e33befa..9d5163b0 100644 --- a/src/components/29-timeline/timeline.hbs +++ b/src/components/29-timeline/timeline.hbs @@ -5,7 +5,7 @@

Standard

-
+

Sample Item

@@ -14,7 +14,7 @@
-
+

Sample Item 2

From e9a3b9f0b7fe4a381120254be2d8999efbd0231c Mon Sep 17 00:00:00 2001 From: Rachel Date: Thu, 18 Jul 2019 10:35:18 -0400 Subject: [PATCH 14/43] Removed utility class --- src/components/29-timeline/timeline--centered-dates.hbs | 4 ++-- src/components/29-timeline/timeline--centered.hbs | 4 ++-- src/components/29-timeline/timeline--right-aligned.hbs | 4 ++-- src/components/29-timeline/timeline--right-dates.hbs | 4 ++-- src/components/29-timeline/timeline--standard-dates.hbs | 4 ++-- src/components/29-timeline/timeline.hbs | 4 ++-- src/sass/components/_timeline.scss | 1 + 7 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/components/29-timeline/timeline--centered-dates.hbs b/src/components/29-timeline/timeline--centered-dates.hbs index 494e33ab..c6e6a98e 100644 --- a/src/components/29-timeline/timeline--centered-dates.hbs +++ b/src/components/29-timeline/timeline--centered-dates.hbs @@ -8,7 +8,7 @@
-
+

Sample Item

Spring 2019

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus in nulla ante. Suspendisse potenti. Donec efficitur, sem vitae dignissim viverra, nunc purus tempus nisi, feugiat ullamcorper tellus urna ut dui. Suspendisse potenti.

@@ -19,7 +19,7 @@
-
+

Sample Item 2

Summer 2019

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus in nulla ante. Suspendisse potenti. Donec efficitur, sem vitae dignissim viverra, nunc purus tempus nisi, feugiat ullamcorper tellus urna ut dui. Suspendisse potenti.

diff --git a/src/components/29-timeline/timeline--centered.hbs b/src/components/29-timeline/timeline--centered.hbs index 68669853..13f994c9 100644 --- a/src/components/29-timeline/timeline--centered.hbs +++ b/src/components/29-timeline/timeline--centered.hbs @@ -8,7 +8,7 @@
-
+

Sample Item

Spring 2019

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus in nulla ante. Suspendisse potenti. Donec efficitur, sem vitae dignissim viverra, nunc purus tempus nisi, feugiat ullamcorper tellus urna ut dui. Suspendisse potenti.

@@ -19,7 +19,7 @@
-
+

Sample Item 2

Summer 2019

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus in nulla ante. Suspendisse potenti. Donec efficitur, sem vitae dignissim viverra, nunc purus tempus nisi, feugiat ullamcorper tellus urna ut dui. Suspendisse potenti.

diff --git a/src/components/29-timeline/timeline--right-aligned.hbs b/src/components/29-timeline/timeline--right-aligned.hbs index bdf2ebec..bdb94475 100644 --- a/src/components/29-timeline/timeline--right-aligned.hbs +++ b/src/components/29-timeline/timeline--right-aligned.hbs @@ -7,7 +7,7 @@
-
+

Sample Item

Spring 2019

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus in nulla ante. Suspendisse potenti. Donec efficitur, sem vitae dignissim viverra, nunc purus tempus nisi, feugiat ullamcorper tellus urna ut dui. Suspendisse potenti.

@@ -16,7 +16,7 @@
-
+

Sample Item 2

Summer 2019

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus in nulla ante. Suspendisse potenti. Donec efficitur, sem vitae dignissim viverra, nunc purus tempus nisi, feugiat ullamcorper tellus urna ut dui. Suspendisse potenti.

diff --git a/src/components/29-timeline/timeline--right-dates.hbs b/src/components/29-timeline/timeline--right-dates.hbs index 7a171218..68566245 100644 --- a/src/components/29-timeline/timeline--right-dates.hbs +++ b/src/components/29-timeline/timeline--right-dates.hbs @@ -7,7 +7,7 @@
-
+

Sample Item

Spring 2019

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus in nulla ante. Suspendisse potenti. Donec efficitur, sem vitae dignissim viverra, nunc purus tempus nisi, feugiat ullamcorper tellus urna ut dui. Suspendisse potenti.

@@ -16,7 +16,7 @@
-
+

Sample Item 2

Summer 2019

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus in nulla ante. Suspendisse potenti. Donec efficitur, sem vitae dignissim viverra, nunc purus tempus nisi, feugiat ullamcorper tellus urna ut dui. Suspendisse potenti.

diff --git a/src/components/29-timeline/timeline--standard-dates.hbs b/src/components/29-timeline/timeline--standard-dates.hbs index ce70f8f6..84093883 100644 --- a/src/components/29-timeline/timeline--standard-dates.hbs +++ b/src/components/29-timeline/timeline--standard-dates.hbs @@ -7,7 +7,7 @@
-
+

Sample Item

Spring 2019

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus in nulla ante. Suspendisse potenti. Donec efficitur, sem vitae dignissim viverra, nunc purus tempus nisi, feugiat ullamcorper tellus urna ut dui. Suspendisse potenti.

@@ -16,7 +16,7 @@
-
+

Sample Item 2

Summer 2019

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus in nulla ante. Suspendisse potenti. Donec efficitur, sem vitae dignissim viverra, nunc purus tempus nisi, feugiat ullamcorper tellus urna ut dui. Suspendisse potenti.

diff --git a/src/components/29-timeline/timeline.hbs b/src/components/29-timeline/timeline.hbs index 9d5163b0..05e52d19 100644 --- a/src/components/29-timeline/timeline.hbs +++ b/src/components/29-timeline/timeline.hbs @@ -7,7 +7,7 @@
-
+

Sample Item

Spring 2019

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus in nulla ante. Suspendisse potenti. Donec efficitur, sem vitae dignissim viverra, nunc purus tempus nisi, feugiat ullamcorper tellus urna ut dui. Suspendisse potenti.

@@ -16,7 +16,7 @@
-
+

Sample Item 2

Summer 2019

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus in nulla ante. Suspendisse potenti. Donec efficitur, sem vitae dignissim viverra, nunc purus tempus nisi, feugiat ullamcorper tellus urna ut dui. Suspendisse potenti.

diff --git a/src/sass/components/_timeline.scss b/src/sass/components/_timeline.scss index e7ab3833..a524db9c 100644 --- a/src/sass/components/_timeline.scss +++ b/src/sass/components/_timeline.scss @@ -54,6 +54,7 @@ } .#{$prefix}-timeline__content { + padding: $md; margin-left: 1.75rem; } From 25492efbf517c0639ed657934294cc95d620dad6 Mon Sep 17 00:00:00 2001 From: Rachel Date: Thu, 18 Jul 2019 10:45:01 -0400 Subject: [PATCH 15/43] Removed outer grid and unnecessary headings --- .../29-timeline/timeline--centered-dates.hbs | 46 ++++++++----------- .../29-timeline/timeline--centered.hbs | 46 ++++++++----------- .../29-timeline/timeline--right-aligned.hbs | 42 +++++++---------- .../29-timeline/timeline--right-dates.hbs | 42 +++++++---------- .../29-timeline/timeline--standard-dates.hbs | 42 +++++++---------- src/components/29-timeline/timeline.hbs | 42 +++++++---------- 6 files changed, 106 insertions(+), 154 deletions(-) diff --git a/src/components/29-timeline/timeline--centered-dates.hbs b/src/components/29-timeline/timeline--centered-dates.hbs index c6e6a98e..2235a442 100644 --- a/src/components/29-timeline/timeline--centered-dates.hbs +++ b/src/components/29-timeline/timeline--centered-dates.hbs @@ -1,31 +1,23 @@ -
+
-
-

Timeline Component

-

Centered with date labels

-
-
-
-
-
-
-

Sample Item

- Spring 2019 -

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus in nulla ante. Suspendisse potenti. Donec efficitur, sem vitae dignissim viverra, nunc purus tempus nisi, feugiat ullamcorper tellus urna ut dui. Suspendisse potenti.

-
-
-
-
-
-
-
-
-

Sample Item 2

- Summer 2019 -

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus in nulla ante. Suspendisse potenti. Donec efficitur, sem vitae dignissim viverra, nunc purus tempus nisi, feugiat ullamcorper tellus urna ut dui. Suspendisse potenti.

-
-
-
+
+
+
+
+

Sample Item

+ Spring 2019 +

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus in nulla ante. Suspendisse potenti. Donec efficitur, sem vitae dignissim viverra, nunc purus tempus nisi, feugiat ullamcorper tellus urna ut dui. Suspendisse potenti.

+
+
+
+
+
+
+
+
+

Sample Item 2

+ Summer 2019 +

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus in nulla ante. Suspendisse potenti. Donec efficitur, sem vitae dignissim viverra, nunc purus tempus nisi, feugiat ullamcorper tellus urna ut dui. Suspendisse potenti.

diff --git a/src/components/29-timeline/timeline--centered.hbs b/src/components/29-timeline/timeline--centered.hbs index 13f994c9..c194ec27 100644 --- a/src/components/29-timeline/timeline--centered.hbs +++ b/src/components/29-timeline/timeline--centered.hbs @@ -1,31 +1,23 @@ -
+
-
-

Timeline Component

-

Centered

-
-
-
-
-
-
-

Sample Item

- Spring 2019 -

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus in nulla ante. Suspendisse potenti. Donec efficitur, sem vitae dignissim viverra, nunc purus tempus nisi, feugiat ullamcorper tellus urna ut dui. Suspendisse potenti.

-
-
-
-
-
-
-
-
-

Sample Item 2

- Summer 2019 -

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus in nulla ante. Suspendisse potenti. Donec efficitur, sem vitae dignissim viverra, nunc purus tempus nisi, feugiat ullamcorper tellus urna ut dui. Suspendisse potenti.

-
-
-
+
+
+
+
+

Sample Item

+ Spring 2019 +

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus in nulla ante. Suspendisse potenti. Donec efficitur, sem vitae dignissim viverra, nunc purus tempus nisi, feugiat ullamcorper tellus urna ut dui. Suspendisse potenti.

+
+
+
+
+
+
+
+
+

Sample Item 2

+ Summer 2019 +

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus in nulla ante. Suspendisse potenti. Donec efficitur, sem vitae dignissim viverra, nunc purus tempus nisi, feugiat ullamcorper tellus urna ut dui. Suspendisse potenti.

diff --git a/src/components/29-timeline/timeline--right-aligned.hbs b/src/components/29-timeline/timeline--right-aligned.hbs index bdb94475..ebd97e95 100644 --- a/src/components/29-timeline/timeline--right-aligned.hbs +++ b/src/components/29-timeline/timeline--right-aligned.hbs @@ -1,28 +1,20 @@ -
-
-
-

Timeline Component

-

Right-aligned

-
-
-
-
-
-

Sample Item

- Spring 2019 -

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus in nulla ante. Suspendisse potenti. Donec efficitur, sem vitae dignissim viverra, nunc purus tempus nisi, feugiat ullamcorper tellus urna ut dui. Suspendisse potenti.

-
-
-
-
-
-
-

Sample Item 2

- Summer 2019 -

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus in nulla ante. Suspendisse potenti. Donec efficitur, sem vitae dignissim viverra, nunc purus tempus nisi, feugiat ullamcorper tellus urna ut dui. Suspendisse potenti.

-
-
-
+
+
+
+
+
+

Sample Item

+ Spring 2019 +

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus in nulla ante. Suspendisse potenti. Donec efficitur, sem vitae dignissim viverra, nunc purus tempus nisi, feugiat ullamcorper tellus urna ut dui. Suspendisse potenti.

+
+
+
+
+
+
+

Sample Item 2

+ Summer 2019 +

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus in nulla ante. Suspendisse potenti. Donec efficitur, sem vitae dignissim viverra, nunc purus tempus nisi, feugiat ullamcorper tellus urna ut dui. Suspendisse potenti.

\ No newline at end of file diff --git a/src/components/29-timeline/timeline--right-dates.hbs b/src/components/29-timeline/timeline--right-dates.hbs index 68566245..c40dffba 100644 --- a/src/components/29-timeline/timeline--right-dates.hbs +++ b/src/components/29-timeline/timeline--right-dates.hbs @@ -1,28 +1,20 @@ -
-
-
-

Timeline Component

-

Right-aligned with date labels

-
-
-
-
-
-

Sample Item

- Spring 2019 -

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus in nulla ante. Suspendisse potenti. Donec efficitur, sem vitae dignissim viverra, nunc purus tempus nisi, feugiat ullamcorper tellus urna ut dui. Suspendisse potenti.

-
-
-
-
-
-
-

Sample Item 2

- Summer 2019 -

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus in nulla ante. Suspendisse potenti. Donec efficitur, sem vitae dignissim viverra, nunc purus tempus nisi, feugiat ullamcorper tellus urna ut dui. Suspendisse potenti.

-
-
-
+
+
+
+
+
+

Sample Item

+ Spring 2019 +

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus in nulla ante. Suspendisse potenti. Donec efficitur, sem vitae dignissim viverra, nunc purus tempus nisi, feugiat ullamcorper tellus urna ut dui. Suspendisse potenti.

+
+
+
+
+
+
+

Sample Item 2

+ Summer 2019 +

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus in nulla ante. Suspendisse potenti. Donec efficitur, sem vitae dignissim viverra, nunc purus tempus nisi, feugiat ullamcorper tellus urna ut dui. Suspendisse potenti.

\ No newline at end of file diff --git a/src/components/29-timeline/timeline--standard-dates.hbs b/src/components/29-timeline/timeline--standard-dates.hbs index 84093883..370d93a0 100644 --- a/src/components/29-timeline/timeline--standard-dates.hbs +++ b/src/components/29-timeline/timeline--standard-dates.hbs @@ -1,28 +1,20 @@ -
-
-
-

Timeline Component

-

Standard with date labels

-
-
-
-
-
-

Sample Item

- Spring 2019 -

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus in nulla ante. Suspendisse potenti. Donec efficitur, sem vitae dignissim viverra, nunc purus tempus nisi, feugiat ullamcorper tellus urna ut dui. Suspendisse potenti.

-
-
-
-
-
-
-

Sample Item 2

- Summer 2019 -

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus in nulla ante. Suspendisse potenti. Donec efficitur, sem vitae dignissim viverra, nunc purus tempus nisi, feugiat ullamcorper tellus urna ut dui. Suspendisse potenti.

-
-
-
+
+
+
+
+
+

Sample Item

+ Spring 2019 +

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus in nulla ante. Suspendisse potenti. Donec efficitur, sem vitae dignissim viverra, nunc purus tempus nisi, feugiat ullamcorper tellus urna ut dui. Suspendisse potenti.

+
+
+
+
+
+
+

Sample Item 2

+ Summer 2019 +

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus in nulla ante. Suspendisse potenti. Donec efficitur, sem vitae dignissim viverra, nunc purus tempus nisi, feugiat ullamcorper tellus urna ut dui. Suspendisse potenti.

\ No newline at end of file diff --git a/src/components/29-timeline/timeline.hbs b/src/components/29-timeline/timeline.hbs index 05e52d19..c32d2a70 100644 --- a/src/components/29-timeline/timeline.hbs +++ b/src/components/29-timeline/timeline.hbs @@ -1,28 +1,20 @@ -
-
-
-

Timeline Component

-

Standard

-
-
-
-
-
-

Sample Item

- Spring 2019 -

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus in nulla ante. Suspendisse potenti. Donec efficitur, sem vitae dignissim viverra, nunc purus tempus nisi, feugiat ullamcorper tellus urna ut dui. Suspendisse potenti.

-
-
-
-
-
-
-

Sample Item 2

- Summer 2019 -

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus in nulla ante. Suspendisse potenti. Donec efficitur, sem vitae dignissim viverra, nunc purus tempus nisi, feugiat ullamcorper tellus urna ut dui. Suspendisse potenti.

-
-
-
+
+
+
+
+
+

Sample Item

+ Spring 2019 +

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus in nulla ante. Suspendisse potenti. Donec efficitur, sem vitae dignissim viverra, nunc purus tempus nisi, feugiat ullamcorper tellus urna ut dui. Suspendisse potenti.

+
+
+
+
+
+
+

Sample Item 2

+ Summer 2019 +

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus in nulla ante. Suspendisse potenti. Donec efficitur, sem vitae dignissim viverra, nunc purus tempus nisi, feugiat ullamcorper tellus urna ut dui. Suspendisse potenti.

\ No newline at end of file From 5ae8da29f0ef2f7235b8c04618d48c42a52803e9 Mon Sep 17 00:00:00 2001 From: Rachel Date: Thu, 18 Jul 2019 11:00:36 -0400 Subject: [PATCH 16/43] Removed margins and width from rvt-timeline --- src/sass/components/_timeline.scss | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/sass/components/_timeline.scss b/src/sass/components/_timeline.scss index a524db9c..5286b0ba 100644 --- a/src/sass/components/_timeline.scss +++ b/src/sass/components/_timeline.scss @@ -2,12 +2,8 @@ // SPDX-License-Identifier: BSD-3-Clause .#{$prefix}-timeline { - width: 90%; - margin: 0 auto; position: relative; padding: $lg 0; - margin-top: $lg; - margin-bottom: $lg; &::before { content: ''; @@ -19,10 +15,6 @@ background: $color-black--200; } - &:first-child { - margin-top: 0; - } - .#{$prefix}-timeline__item::after { margin-left: -$xxs; border: solid transparent; From ff170cd7b6ec9a5f4a1fe063f1a31d1d99f71d0f Mon Sep 17 00:00:00 2001 From: Rachel Date: Thu, 18 Jul 2019 11:47:21 -0400 Subject: [PATCH 17/43] Restructured selector hierarchy --- .../29-timeline/timeline--centered-dates.hbs | 2 +- .../29-timeline/timeline--centered.hbs | 2 +- src/sass/components/_timeline.scss | 75 ++++++++++--------- 3 files changed, 40 insertions(+), 39 deletions(-) diff --git a/src/components/29-timeline/timeline--centered-dates.hbs b/src/components/29-timeline/timeline--centered-dates.hbs index 2235a442..c6f6a39b 100644 --- a/src/components/29-timeline/timeline--centered-dates.hbs +++ b/src/components/29-timeline/timeline--centered-dates.hbs @@ -1,4 +1,4 @@ -
+
diff --git a/src/components/29-timeline/timeline--centered.hbs b/src/components/29-timeline/timeline--centered.hbs index c194ec27..2db372e4 100644 --- a/src/components/29-timeline/timeline--centered.hbs +++ b/src/components/29-timeline/timeline--centered.hbs @@ -1,4 +1,4 @@ -
+
diff --git a/src/sass/components/_timeline.scss b/src/sass/components/_timeline.scss index 5286b0ba..593821aa 100644 --- a/src/sass/components/_timeline.scss +++ b/src/sass/components/_timeline.scss @@ -15,7 +15,7 @@ background: $color-black--200; } - .#{$prefix}-timeline__item::after { + &__item::after { margin-left: -$xxs; border: solid transparent; content: " "; @@ -28,12 +28,12 @@ top: .625rem; } - .#{$prefix}-timeline__item { + &__item { position: relative; margin: $lg 0; } - .#{$prefix}-timeline__marker { + &__marker { width: .75rem; height: .75rem; position: absolute; @@ -45,27 +45,21 @@ margin-left: -$xxs; } - .#{$prefix}-timeline__content { + &__content { padding: $md; margin-left: 1.75rem; } - .#{$prefix}-timeline__date { + &__date { font-size: $ts-14; color: $color-black--700; } } -.#{$prefix}-timeline-right { +.#{$prefix}-timeline--right { &::before { - content: ''; - position: absolute; - top: 0; left: unset; right: 1.125rem; - height: 100%; - width: $xxs; - background: $color-cream; } .#{$prefix}-timeline__item::after { @@ -87,15 +81,9 @@ } @include mq($breakpoint-md) { - .#{$prefix}-timeline-center { + .#{$prefix}-timeline--center { &::before { - content: ''; - position: absolute; - top: 0; left: 50%; - height: 100%; - width: $xxs; - background: $color-cream; } .#{$prefix}-timeline__item-right { @@ -139,23 +127,24 @@ } @include mq($breakpoint-xl) { - .#{$prefix}-timeline-center .#{$prefix}-timeline__item { - .#{$prefix}-timeline__date.#{$prefix}-timeline__date--label { - max-width: fit-content; - text-align: left; - position: relative; + .#{$prefix}-timeline { + &__date--label { + min-width: 6.25rem; + min-height: fit-content; + left: -7.5rem; + right: initial; + text-align: right; + position: absolute; display: block; - left: unset; - right: unset; - top: unset; - margin-left: 30.5rem; - margin-top: -3rem; - margin-bottom: 3rem; + top: $sm; + margin-left: unset; + margin-top: unset; + margin-right: unset; } } - .#{$prefix}-timeline--right .#{$prefix}-timeline__item { - .#{$prefix}-timeline__date.#{$prefix}-timeline__date--label { + .#{$prefix}-timeline--center { + .#{$prefix}-timeline__date--label { max-width: fit-content; text-align: left; position: relative; @@ -163,15 +152,12 @@ left: unset; right: unset; top: unset; - margin-left: 60rem; + margin-left: 30.5rem; margin-top: -3rem; margin-bottom: 3rem; } - } - .#{$prefix}-timeline-center .#{$prefix}-timeline__item-right, - .#{$prefix}-timeline__item { - .#{$prefix}-timeline__date.#{$prefix}-timeline__date--label { + .#{$prefix}-timeline__item-right .#{$prefix}-timeline__date--label { min-width: 6.25rem; min-height: fit-content; left: -7.5rem; @@ -185,4 +171,19 @@ margin-right: unset; } } + + .#{$prefix}-timeline--right { + .#{$prefix}-timeline__date--label { + max-width: fit-content; + text-align: left; + position: relative; + display: block; + left: unset; + right: unset; + top: unset; + margin-left: 60rem; + margin-top: -3rem; + margin-bottom: 3rem; + } + } } From 7f9e3161ad3429f5c6bf15cc0f4e1f693b4c70f0 Mon Sep 17 00:00:00 2001 From: Rachel Date: Mon, 22 Jul 2019 10:22:46 -0400 Subject: [PATCH 18/43] Added Rivet Box (card variant) styling into rvt-timelint__content class --- src/components/29-timeline/timeline--centered-dates.hbs | 4 ++-- src/components/29-timeline/timeline--centered.hbs | 4 ++-- src/components/29-timeline/timeline--right-aligned.hbs | 4 ++-- src/components/29-timeline/timeline--right-dates.hbs | 4 ++-- src/components/29-timeline/timeline--standard-dates.hbs | 4 ++-- src/components/29-timeline/timeline.hbs | 4 ++-- src/sass/components/_timeline.scss | 4 ++++ 7 files changed, 16 insertions(+), 12 deletions(-) diff --git a/src/components/29-timeline/timeline--centered-dates.hbs b/src/components/29-timeline/timeline--centered-dates.hbs index c6f6a39b..816bb6c1 100644 --- a/src/components/29-timeline/timeline--centered-dates.hbs +++ b/src/components/29-timeline/timeline--centered-dates.hbs @@ -3,7 +3,7 @@
-
+

Sample Item

Spring 2019

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus in nulla ante. Suspendisse potenti. Donec efficitur, sem vitae dignissim viverra, nunc purus tempus nisi, feugiat ullamcorper tellus urna ut dui. Suspendisse potenti.

@@ -14,7 +14,7 @@
-
+

Sample Item 2

Summer 2019

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus in nulla ante. Suspendisse potenti. Donec efficitur, sem vitae dignissim viverra, nunc purus tempus nisi, feugiat ullamcorper tellus urna ut dui. Suspendisse potenti.

diff --git a/src/components/29-timeline/timeline--centered.hbs b/src/components/29-timeline/timeline--centered.hbs index 2db372e4..f30052e1 100644 --- a/src/components/29-timeline/timeline--centered.hbs +++ b/src/components/29-timeline/timeline--centered.hbs @@ -3,7 +3,7 @@
-
+

Sample Item

Spring 2019

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus in nulla ante. Suspendisse potenti. Donec efficitur, sem vitae dignissim viverra, nunc purus tempus nisi, feugiat ullamcorper tellus urna ut dui. Suspendisse potenti.

@@ -14,7 +14,7 @@
-
+

Sample Item 2

Summer 2019

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus in nulla ante. Suspendisse potenti. Donec efficitur, sem vitae dignissim viverra, nunc purus tempus nisi, feugiat ullamcorper tellus urna ut dui. Suspendisse potenti.

diff --git a/src/components/29-timeline/timeline--right-aligned.hbs b/src/components/29-timeline/timeline--right-aligned.hbs index ebd97e95..89486ad0 100644 --- a/src/components/29-timeline/timeline--right-aligned.hbs +++ b/src/components/29-timeline/timeline--right-aligned.hbs @@ -2,7 +2,7 @@
-
+

Sample Item

Spring 2019

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus in nulla ante. Suspendisse potenti. Donec efficitur, sem vitae dignissim viverra, nunc purus tempus nisi, feugiat ullamcorper tellus urna ut dui. Suspendisse potenti.

@@ -11,7 +11,7 @@
-
+

Sample Item 2

Summer 2019

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus in nulla ante. Suspendisse potenti. Donec efficitur, sem vitae dignissim viverra, nunc purus tempus nisi, feugiat ullamcorper tellus urna ut dui. Suspendisse potenti.

diff --git a/src/components/29-timeline/timeline--right-dates.hbs b/src/components/29-timeline/timeline--right-dates.hbs index c40dffba..03debaa4 100644 --- a/src/components/29-timeline/timeline--right-dates.hbs +++ b/src/components/29-timeline/timeline--right-dates.hbs @@ -2,7 +2,7 @@
-
+

Sample Item

Spring 2019

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus in nulla ante. Suspendisse potenti. Donec efficitur, sem vitae dignissim viverra, nunc purus tempus nisi, feugiat ullamcorper tellus urna ut dui. Suspendisse potenti.

@@ -11,7 +11,7 @@
-
+

Sample Item 2

Summer 2019

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus in nulla ante. Suspendisse potenti. Donec efficitur, sem vitae dignissim viverra, nunc purus tempus nisi, feugiat ullamcorper tellus urna ut dui. Suspendisse potenti.

diff --git a/src/components/29-timeline/timeline--standard-dates.hbs b/src/components/29-timeline/timeline--standard-dates.hbs index 370d93a0..3c436b90 100644 --- a/src/components/29-timeline/timeline--standard-dates.hbs +++ b/src/components/29-timeline/timeline--standard-dates.hbs @@ -2,7 +2,7 @@
-
+

Sample Item

Spring 2019

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus in nulla ante. Suspendisse potenti. Donec efficitur, sem vitae dignissim viverra, nunc purus tempus nisi, feugiat ullamcorper tellus urna ut dui. Suspendisse potenti.

@@ -11,7 +11,7 @@
-
+

Sample Item 2

Summer 2019

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus in nulla ante. Suspendisse potenti. Donec efficitur, sem vitae dignissim viverra, nunc purus tempus nisi, feugiat ullamcorper tellus urna ut dui. Suspendisse potenti.

diff --git a/src/components/29-timeline/timeline.hbs b/src/components/29-timeline/timeline.hbs index c32d2a70..a9e025e5 100644 --- a/src/components/29-timeline/timeline.hbs +++ b/src/components/29-timeline/timeline.hbs @@ -2,7 +2,7 @@
-
+

Sample Item

Spring 2019

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus in nulla ante. Suspendisse potenti. Donec efficitur, sem vitae dignissim viverra, nunc purus tempus nisi, feugiat ullamcorper tellus urna ut dui. Suspendisse potenti.

@@ -11,7 +11,7 @@
-
+

Sample Item 2

Summer 2019

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus in nulla ante. Suspendisse potenti. Donec efficitur, sem vitae dignissim viverra, nunc purus tempus nisi, feugiat ullamcorper tellus urna ut dui. Suspendisse potenti.

diff --git a/src/sass/components/_timeline.scss b/src/sass/components/_timeline.scss index 593821aa..8798f3c2 100644 --- a/src/sass/components/_timeline.scss +++ b/src/sass/components/_timeline.scss @@ -48,6 +48,10 @@ &__content { padding: $md; margin-left: 1.75rem; + background-color: $color-white; + border-radius: $xxs; + box-shadow: $shadow-base; + border: none; } &__date { From 0fb5fd65278e18e24dbdaa6e1530e6004501ef22 Mon Sep 17 00:00:00 2001 From: Rachel Date: Tue, 23 Jul 2019 09:21:45 -0400 Subject: [PATCH 19/43] Rewrote magic numbers --- .../29-timeline/timeline--centered-dates.hbs | 12 +- .../29-timeline/timeline--centered.hbs | 12 +- .../29-timeline/timeline--right-aligned.hbs | 4 +- .../29-timeline/timeline--right-dates.hbs | 4 +- .../29-timeline/timeline--standard-dates.hbs | 4 +- src/components/29-timeline/timeline.hbs | 4 +- src/sass/components/_timeline.scss | 116 ++++++++++-------- 7 files changed, 87 insertions(+), 69 deletions(-) diff --git a/src/components/29-timeline/timeline--centered-dates.hbs b/src/components/29-timeline/timeline--centered-dates.hbs index 816bb6c1..6d2f582e 100644 --- a/src/components/29-timeline/timeline--centered-dates.hbs +++ b/src/components/29-timeline/timeline--centered-dates.hbs @@ -1,21 +1,21 @@
-
-
+
+
-

Sample Item

+

Sample Item

Spring 2019

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus in nulla ante. Suspendisse potenti. Donec efficitur, sem vitae dignissim viverra, nunc purus tempus nisi, feugiat ullamcorper tellus urna ut dui. Suspendisse potenti.

-
-
+
+
-

Sample Item 2

+

Sample Item 2

Summer 2019

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus in nulla ante. Suspendisse potenti. Donec efficitur, sem vitae dignissim viverra, nunc purus tempus nisi, feugiat ullamcorper tellus urna ut dui. Suspendisse potenti.

diff --git a/src/components/29-timeline/timeline--centered.hbs b/src/components/29-timeline/timeline--centered.hbs index f30052e1..6d95b2de 100644 --- a/src/components/29-timeline/timeline--centered.hbs +++ b/src/components/29-timeline/timeline--centered.hbs @@ -1,21 +1,21 @@
-
-
+
+
-

Sample Item

+

Sample Item

Spring 2019

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus in nulla ante. Suspendisse potenti. Donec efficitur, sem vitae dignissim viverra, nunc purus tempus nisi, feugiat ullamcorper tellus urna ut dui. Suspendisse potenti.

-
-
+
+
-

Sample Item 2

+

Sample Item 2

Summer 2019

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus in nulla ante. Suspendisse potenti. Donec efficitur, sem vitae dignissim viverra, nunc purus tempus nisi, feugiat ullamcorper tellus urna ut dui. Suspendisse potenti.

diff --git a/src/components/29-timeline/timeline--right-aligned.hbs b/src/components/29-timeline/timeline--right-aligned.hbs index 89486ad0..23ffbe51 100644 --- a/src/components/29-timeline/timeline--right-aligned.hbs +++ b/src/components/29-timeline/timeline--right-aligned.hbs @@ -3,7 +3,7 @@
-

Sample Item

+

Sample Item

Spring 2019

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus in nulla ante. Suspendisse potenti. Donec efficitur, sem vitae dignissim viverra, nunc purus tempus nisi, feugiat ullamcorper tellus urna ut dui. Suspendisse potenti.

@@ -12,7 +12,7 @@
-

Sample Item 2

+

Sample Item 2

Summer 2019

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus in nulla ante. Suspendisse potenti. Donec efficitur, sem vitae dignissim viverra, nunc purus tempus nisi, feugiat ullamcorper tellus urna ut dui. Suspendisse potenti.

diff --git a/src/components/29-timeline/timeline--right-dates.hbs b/src/components/29-timeline/timeline--right-dates.hbs index 03debaa4..c5a213a5 100644 --- a/src/components/29-timeline/timeline--right-dates.hbs +++ b/src/components/29-timeline/timeline--right-dates.hbs @@ -3,7 +3,7 @@
-

Sample Item

+

Sample Item

Spring 2019

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus in nulla ante. Suspendisse potenti. Donec efficitur, sem vitae dignissim viverra, nunc purus tempus nisi, feugiat ullamcorper tellus urna ut dui. Suspendisse potenti.

@@ -12,7 +12,7 @@
-

Sample Item 2

+

Sample Item 2

Summer 2019

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus in nulla ante. Suspendisse potenti. Donec efficitur, sem vitae dignissim viverra, nunc purus tempus nisi, feugiat ullamcorper tellus urna ut dui. Suspendisse potenti.

diff --git a/src/components/29-timeline/timeline--standard-dates.hbs b/src/components/29-timeline/timeline--standard-dates.hbs index 3c436b90..0aa3c988 100644 --- a/src/components/29-timeline/timeline--standard-dates.hbs +++ b/src/components/29-timeline/timeline--standard-dates.hbs @@ -3,7 +3,7 @@
-

Sample Item

+

Sample Item

Spring 2019

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus in nulla ante. Suspendisse potenti. Donec efficitur, sem vitae dignissim viverra, nunc purus tempus nisi, feugiat ullamcorper tellus urna ut dui. Suspendisse potenti.

@@ -12,7 +12,7 @@
-

Sample Item 2

+

Sample Item 2

Summer 2019

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus in nulla ante. Suspendisse potenti. Donec efficitur, sem vitae dignissim viverra, nunc purus tempus nisi, feugiat ullamcorper tellus urna ut dui. Suspendisse potenti.

diff --git a/src/components/29-timeline/timeline.hbs b/src/components/29-timeline/timeline.hbs index a9e025e5..4ae92d99 100644 --- a/src/components/29-timeline/timeline.hbs +++ b/src/components/29-timeline/timeline.hbs @@ -3,7 +3,7 @@
-

Sample Item

+

Sample Item

Spring 2019

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus in nulla ante. Suspendisse potenti. Donec efficitur, sem vitae dignissim viverra, nunc purus tempus nisi, feugiat ullamcorper tellus urna ut dui. Suspendisse potenti.

@@ -12,7 +12,7 @@
-

Sample Item 2

+

Sample Item 2

Summer 2019

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus in nulla ante. Suspendisse potenti. Donec efficitur, sem vitae dignissim viverra, nunc purus tempus nisi, feugiat ullamcorper tellus urna ut dui. Suspendisse potenti.

diff --git a/src/sass/components/_timeline.scss b/src/sass/components/_timeline.scss index 8798f3c2..51bf54d4 100644 --- a/src/sass/components/_timeline.scss +++ b/src/sass/components/_timeline.scss @@ -7,6 +7,7 @@ &::before { content: ''; + margin-left: $xxs; position: absolute; top: 0; left: 0; @@ -16,16 +17,16 @@ } &__item::after { - margin-left: -$xxs; + margin-left: 0; border: solid transparent; content: " "; height: 0; width: 0; position: absolute; pointer-events: none; - border-right-color: #f5f5f6; + border-right-color: $color-black--100; border-width: $sm; - top: .625rem; + top: .4rem; } &__item { @@ -34,26 +35,30 @@ } &__marker { - width: .75rem; - height: .75rem; + width: $sm*.75; + height: $sm*.75; position: absolute; color: $color-white; background: $color-midnight; border-radius: 50%; - box-shadow: 0 0 0 5px #f5f5f6; - margin-top: 1.25rem; - margin-left: -$xxs; + box-shadow: 0 0 0 $xxs $color-black--100; + margin-top: $sm; } &__content { padding: $md; - margin-left: 1.75rem; + margin-left: $lg; background-color: $color-white; border-radius: $xxs; box-shadow: $shadow-base; border: none; } + & h2 { + font-size: $ts-26; + font-weight: $font-weight-bold; + } + &__date { font-size: $ts-14; color: $color-black--700; @@ -63,24 +68,24 @@ .#{$prefix}-timeline--right { &::before { left: unset; - right: 1.125rem; + right: $xxs; } .#{$prefix}-timeline__item::after { margin-left: 0; - right: $sm; - border-left-color: #f5f5f6; + right: 0; + border-left-color: $color-black--100; border-right-color: transparent; } .#{$prefix}-timeline__marker { margin-left: 0; - right: .75rem; + right: 0; } .#{$prefix}-timeline__content { margin-left: 0; - margin-right: 3rem; + margin-right: $lg; } } @@ -88,6 +93,21 @@ .#{$prefix}-timeline--center { &::before { left: 50%; + margin-left: 0; + } + + & > div { + display: flex; + flex-wrap: wrap; + margin-right: -$sm*.75; + margin-left: -$sm*.75; + } + + .#{$prefix}-timeline__item { + flex-basis: 50%; + max-width: 50%; + padding: 0 $sm*.75; + width: 100%; } .#{$prefix}-timeline__item-right { @@ -97,14 +117,14 @@ .#{$prefix}-timeline__item::after { margin-left: -$md; left: 100%; - border-left-color: #f5f5f6; + border-left-color: $color-black--100; border-right-color: transparent; } .#{$prefix}-timeline__item-right::after { margin-left: -$sm; left: unset; - border-right-color: #f5f5f6; + border-right-color: $color-black--100; border-left-color: transparent; } @@ -120,56 +140,52 @@ .#{$prefix}-timeline__content { margin-left: 0; - margin-right: .75rem; + margin-right: $sm*.75; } .#{$prefix}-timeline__item-right .#{$prefix}-timeline__content { margin-right: 0; margin-left: $sm; } - } -} -@include mq($breakpoint-xl) { - .#{$prefix}-timeline { - &__date--label { - min-width: 6.25rem; + .#{$prefix}-timeline__date--label { + text-align: left; + position: absolute; + display: block; + left: initial; + right: -$sm*7; + top: unset; + margin-top: -$sm*3.15; + } + + .#{$prefix}-timeline__item-right .#{$prefix}-timeline__date--label { + min-width: fit-content; min-height: fit-content; - left: -7.5rem; + left: -$sm*7.5; right: initial; text-align: right; position: absolute; display: block; - top: $sm; + top: $sm*.75; margin-left: unset; margin-top: unset; margin-right: unset; } } +} - .#{$prefix}-timeline--center { - .#{$prefix}-timeline__date--label { +@include mq($breakpoint-xl) { + .#{$prefix}-timeline { + &__date--label { + min-width: fit-content; max-width: fit-content; - text-align: left; - position: relative; - display: block; - left: unset; - right: unset; - top: unset; - margin-left: 30.5rem; - margin-top: -3rem; - margin-bottom: 3rem; - } - - .#{$prefix}-timeline__item-right .#{$prefix}-timeline__date--label { - min-width: 6.25rem; min-height: fit-content; - left: -7.5rem; + left: -$sm*7.5; right: initial; text-align: right; position: absolute; display: block; - top: $sm; + top: $sm*.75; margin-left: unset; margin-top: unset; margin-right: unset; @@ -178,16 +194,18 @@ .#{$prefix}-timeline--right { .#{$prefix}-timeline__date--label { + min-width: fit-content; max-width: fit-content; + min-height: fit-content; + left: unset; + right: -$sm*6; text-align: left; - position: relative; + position: absolute; display: block; - left: unset; - right: unset; - top: unset; - margin-left: 60rem; - margin-top: -3rem; - margin-bottom: 3rem; + top: $sm*.75; + margin-left: unset; + margin-top: unset; + margin-right: unset; } } } From 5aadf3537a994fe674d17ed9a440880971c07bde Mon Sep 17 00:00:00 2001 From: Rachel Date: Tue, 23 Jul 2019 09:27:39 -0400 Subject: [PATCH 20/43] Added comment regarding use of magic numbers related to &__marker --- src/sass/components/_timeline.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/sass/components/_timeline.scss b/src/sass/components/_timeline.scss index 51bf54d4..dfb17f20 100644 --- a/src/sass/components/_timeline.scss +++ b/src/sass/components/_timeline.scss @@ -34,6 +34,10 @@ margin: $lg 0; } + /** + * The marker for the timeline visually only looks good at 12px (.75rem). This results in several magic numbers related to the placement of other items such as the &__item::after (above) and date labels (where applicable). This also results in cascading magic numbers for placement of elements such as &__content for variant timelines. + */ + &__marker { width: $sm*.75; height: $sm*.75; From bd1a67002b65278a7950c23f8a19076de0bfe399 Mon Sep 17 00:00:00 2001 From: Rachel Date: Tue, 23 Jul 2019 16:47:52 -0400 Subject: [PATCH 21/43] Restructured text inputs to establish variants within config file --- .../05-text-inputs/text-inputs.config.yml | 11 ++ src/components/05-text-inputs/text-inputs.hbs | 181 +----------------- 2 files changed, 16 insertions(+), 176 deletions(-) diff --git a/src/components/05-text-inputs/text-inputs.config.yml b/src/components/05-text-inputs/text-inputs.config.yml index 6e9c040b..8e583cdc 100644 --- a/src/components/05-text-inputs/text-inputs.config.yml +++ b/src/components/05-text-inputs/text-inputs.config.yml @@ -1 +1,12 @@ +title: "Text inputs" status: "ready" +context: + modifier: "" + class: "" + alert: false +variants: + - name: "disabled" + context: + modifier: "disabled" + alert: true + alertVariant: "\\@alerts" \ No newline at end of file diff --git a/src/components/05-text-inputs/text-inputs.hbs b/src/components/05-text-inputs/text-inputs.hbs index 365dc35e..132142eb 100644 --- a/src/components/05-text-inputs/text-inputs.hbs +++ b/src/components/05-text-inputs/text-inputs.hbs @@ -1,177 +1,6 @@ -
-
-
-
-
- - Text-inputs default - - - - - - -
- -
- Text input - validation states - - - - -
- - - - - - - - - - First name is valid! - -
- - - -
- - - - - - - - - - Your Password is weak. - -
- - - -
- - - - - - - - - - The Username you entered is taken. - -
- - - -
- - - - - - - - - - - The - Description tells users more about this stuff. - -
- -
- -
- - Textarea default - - - - - - - -
- -
- - Textarea validation states - - - - -
- - - - - - - - - - Your Essay is valid! - -
- - - -
- - - - - - - - - - Your Response has some mispellings! - -
- - - -
- - - - - - - - - - Your Description has special characters that need replaced. - -
- - - -
- - - - - - - - - - - Add a Message to give users more information. - -
-
-
-
-
-
+ + +{{#if alert}} + {{>(lookup . 'alertVariant') }} +{{/if}} \ No newline at end of file From 937cc4f8a5ad8f94956d8bbc334482449e2d4b34 Mon Sep 17 00:00:00 2001 From: Rachel Date: Wed, 24 Jul 2019 09:55:21 -0400 Subject: [PATCH 22/43] Refactored alerts fractal organization --- .../11-alerts/alerts--alert-lists.hbs | 24 ---------------- src/components/11-alerts/alerts.config.yml | 25 +++++++++++++---- src/components/11-alerts/alerts.hbs | 28 ++----------------- 3 files changed, 22 insertions(+), 55 deletions(-) delete mode 100644 src/components/11-alerts/alerts--alert-lists.hbs diff --git a/src/components/11-alerts/alerts--alert-lists.hbs b/src/components/11-alerts/alerts--alert-lists.hbs deleted file mode 100644 index 4ee3f571..00000000 --- a/src/components/11-alerts/alerts--alert-lists.hbs +++ /dev/null @@ -1,24 +0,0 @@ -
    -
  • - -
    • -
  • - -
    • -
  • - -
    • -
  • - -
    • -
diff --git a/src/components/11-alerts/alerts.config.yml b/src/components/11-alerts/alerts.config.yml index 7c0e902a..43ef0cad 100644 --- a/src/components/11-alerts/alerts.config.yml +++ b/src/components/11-alerts/alerts.config.yml @@ -1,9 +1,22 @@ title: Alerts & errors status: "ready" +context: + type: "info" + title: "Scheduled System Maintenance" + message: "This system will be unavailable on August 1st due to scheduled system maintenance. Please check back on August 2nd." variants: - - name: "default" - label: "Page-level alerts" - - name: "alert-lists" - label: "Alert lists" - notes: | - # Alert lists \ No newline at end of file + - name: "success" + context: + type: "success" + title: "Thank you!" + message: "We have received your application. Check your email in a few weeks to find out if you’ve been admitted." + - name: "warning" + context: + type: "warning" + title: "Unsaved Changes" + message: "Your changes have not been saved. To save your changes, click ‘Save my changes’ or click ‘Cancel’ to exit without saving." + - name: "error" + context: + type: "error" + title: "Incorrect User ID or Password" + message: "The user ID and password you entered do not match. Please check your entries and try again. Forgot your user ID or password?" \ No newline at end of file diff --git a/src/components/11-alerts/alerts.hbs b/src/components/11-alerts/alerts.hbs index 931fe039..2d7d70d1 100644 --- a/src/components/11-alerts/alerts.hbs +++ b/src/components/11-alerts/alerts.hbs @@ -1,27 +1,5 @@ - -

Information Alert

-
-

Scheduled System Maintenance

-

This system will be unavailable on August 1st due to scheduled system maintenance. Please check back on August 2nd.

+
+

{{ title }}

+

{{ message }}

{{> @includes--alert-close-button }}
- -

Success Alert

-
-

Thank you!

-

We have received your application. Check your email in a few weeks to find out if you’ve been admitted.

- {{> @includes--alert-close-button }} -
- -

Warning Alert

-
-

Unsaved Changes

-

Your changes have not been saved. To save your changes, click ‘Save my changes’ or click ‘Cancel’ to exit without saving.

- {{> @includes--alert-close-button }} -
- -

Error Alert

- From a4c801fd09777a1ca6574ef5091d10269a9028e7 Mon Sep 17 00:00:00 2001 From: Rachel Date: Wed, 24 Jul 2019 10:22:26 -0400 Subject: [PATCH 23/43] Created new folder for inline-alerts, and added appropriate SVGs to includes folder --- .../includes--inline-alert-danger.hbs | 6 +++++ .../includes--inline-alert-info.hbs | 7 ++++++ .../includes--inline-alert-success.hbs | 6 +++++ .../includes--inline-alert-warning.hbs | 6 +++++ .../30-inline-alert/inline-alert.config.yml | 22 +++++++++++++++++++ .../30-inline-alert/inline-alert.hbs | 6 +++++ 6 files changed, 53 insertions(+) create mode 100644 src/components/101-includes/includes--inline-alert-danger.hbs create mode 100644 src/components/101-includes/includes--inline-alert-info.hbs create mode 100644 src/components/101-includes/includes--inline-alert-success.hbs create mode 100644 src/components/101-includes/includes--inline-alert-warning.hbs create mode 100644 src/components/30-inline-alert/inline-alert.config.yml create mode 100644 src/components/30-inline-alert/inline-alert.hbs diff --git a/src/components/101-includes/includes--inline-alert-danger.hbs b/src/components/101-includes/includes--inline-alert-danger.hbs new file mode 100644 index 00000000..d71d8544 --- /dev/null +++ b/src/components/101-includes/includes--inline-alert-danger.hbs @@ -0,0 +1,6 @@ + \ No newline at end of file diff --git a/src/components/101-includes/includes--inline-alert-info.hbs b/src/components/101-includes/includes--inline-alert-info.hbs new file mode 100644 index 00000000..594c241f --- /dev/null +++ b/src/components/101-includes/includes--inline-alert-info.hbs @@ -0,0 +1,7 @@ + \ No newline at end of file diff --git a/src/components/101-includes/includes--inline-alert-success.hbs b/src/components/101-includes/includes--inline-alert-success.hbs new file mode 100644 index 00000000..1da02594 --- /dev/null +++ b/src/components/101-includes/includes--inline-alert-success.hbs @@ -0,0 +1,6 @@ + \ No newline at end of file diff --git a/src/components/101-includes/includes--inline-alert-warning.hbs b/src/components/101-includes/includes--inline-alert-warning.hbs new file mode 100644 index 00000000..a7d0e486 --- /dev/null +++ b/src/components/101-includes/includes--inline-alert-warning.hbs @@ -0,0 +1,6 @@ + \ No newline at end of file diff --git a/src/components/30-inline-alert/inline-alert.config.yml b/src/components/30-inline-alert/inline-alert.config.yml new file mode 100644 index 00000000..0d227177 --- /dev/null +++ b/src/components/30-inline-alert/inline-alert.config.yml @@ -0,0 +1,22 @@ +title: Inline alerts +status: "ready" +context: + type: "info" + message: "The Description tells users more about this stuff." + SVG: "\\@includes--inline-alert-info" +variants: + - name: "success" + context: + type: "success" + message: "First name is valid!" + SVG: "\\@includes--inline-alert-success" + - name: "warning" + context: + type: "warning" + message: "Your Password is weak." + SVG: "\\@includes--inline-alert-warning" + - name: "danger" + context: + type: "danger" + message: "The Username you entered is taken." + SVG: "\\@includes--inline-alert-danger" \ No newline at end of file diff --git a/src/components/30-inline-alert/inline-alert.hbs b/src/components/30-inline-alert/inline-alert.hbs new file mode 100644 index 00000000..c64d6566 --- /dev/null +++ b/src/components/30-inline-alert/inline-alert.hbs @@ -0,0 +1,6 @@ +
+ + {{>(lookup . 'SVG') }} + + {{ message }} +
\ No newline at end of file From 4509c5203834eaddb6c807af6dda8af86007e47c Mon Sep 17 00:00:00 2001 From: Rachel Date: Wed, 24 Jul 2019 10:38:08 -0400 Subject: [PATCH 24/43] Updated Cypress tests to find appropriate pages, and fixed alert ids/labels --- cypress/integration/alert_spec.js | 12 ++++++++++-- src/components/11-alerts/alerts.config.yml | 6 +++++- src/components/11-alerts/alerts.hbs | 4 ++-- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/cypress/integration/alert_spec.js b/cypress/integration/alert_spec.js index ef766f9e..d35c2b3d 100644 --- a/cypress/integration/alert_spec.js +++ b/cypress/integration/alert_spec.js @@ -5,11 +5,11 @@ const ALERT_CLOSE = ALERT_INFO + '>.rvt-alert__dismiss'; const DEV_SERVER = "http://localhost:3000"; describe('Rivet alert interactions', function() { - it('Visits the alert page', function() { + it('Visits the info alert page', function() { cy.visit(DEV_SERVER + '/components/preview/alerts--default'); }); - it('Should see the alert', function() { + it('Should see the info alert page', function() { cy.get(ALERT_INFO) .should('have.attr', 'aria-labelledby', 'information-alert-title') .and('be.visible'); @@ -23,6 +23,10 @@ describe('Rivet alert interactions', function() { cy.get(ALERT_INFO).should('not.exist'); }); + it('Visits the warning alert page', function() { + cy.visit(DEV_SERVER + '/components/preview/alerts--warning'); + }); + it('Should be able to dismiss with .dismiss() method', function() { cy.window().then(win => { win.Alert.dismiss('warning-alert-title'); @@ -31,6 +35,10 @@ describe('Rivet alert interactions', function() { cy.get(ALERT_WARNING).should('not.exist'); }); + it('Visits the success alert page', function() { + cy.visit(DEV_SERVER + '/components/preview/alerts--success'); + }); + it('Should be able to dismiss with .dismiss() method with DOM element', function() { cy.window().then(win => { var alert = win.document.querySelector( diff --git a/src/components/11-alerts/alerts.config.yml b/src/components/11-alerts/alerts.config.yml index 43ef0cad..6b10d002 100644 --- a/src/components/11-alerts/alerts.config.yml +++ b/src/components/11-alerts/alerts.config.yml @@ -2,21 +2,25 @@ title: Alerts & errors status: "ready" context: type: "info" + id: "information" title: "Scheduled System Maintenance" message: "This system will be unavailable on August 1st due to scheduled system maintenance. Please check back on August 2nd." variants: - name: "success" context: type: "success" + id: "success" title: "Thank you!" message: "We have received your application. Check your email in a few weeks to find out if you’ve been admitted." - name: "warning" context: type: "warning" + id: "warning" title: "Unsaved Changes" message: "Your changes have not been saved. To save your changes, click ‘Save my changes’ or click ‘Cancel’ to exit without saving." - name: "error" context: type: "error" + id: "error" title: "Incorrect User ID or Password" - message: "The user ID and password you entered do not match. Please check your entries and try again. Forgot your user ID or password?" \ No newline at end of file + message: "The user ID and password you entered do not match. Please check your entries and try again." \ No newline at end of file diff --git a/src/components/11-alerts/alerts.hbs b/src/components/11-alerts/alerts.hbs index 2d7d70d1..e8d7be0a 100644 --- a/src/components/11-alerts/alerts.hbs +++ b/src/components/11-alerts/alerts.hbs @@ -1,5 +1,5 @@ -
-

{{ title }}

+
+

{{ title }}

{{ message }}

{{> @includes--alert-close-button }}
From 83d68c4bb9d3361bb973b5e0c8689e9efd0babc6 Mon Sep 17 00:00:00 2001 From: Rachel Date: Wed, 24 Jul 2019 12:11:57 -0400 Subject: [PATCH 25/43] Fixed margin class on alerts --- src/components/11-alerts/alerts.hbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/11-alerts/alerts.hbs b/src/components/11-alerts/alerts.hbs index e8d7be0a..30371937 100644 --- a/src/components/11-alerts/alerts.hbs +++ b/src/components/11-alerts/alerts.hbs @@ -1,4 +1,4 @@ -
+

{{ title }}

{{ message }}

{{> @includes--alert-close-button }} From e3704a9c816f7182ff1cc05a83fdfbcb08434d52 Mon Sep 17 00:00:00 2001 From: Rachel Date: Wed, 24 Jul 2019 15:00:53 -0400 Subject: [PATCH 26/43] Fixed aria-hidden attribute --- src/components/29-timeline/timeline--centered-dates.hbs | 4 ++-- src/components/29-timeline/timeline--centered.hbs | 4 ++-- src/components/29-timeline/timeline--right-aligned.hbs | 4 ++-- src/components/29-timeline/timeline--right-dates.hbs | 4 ++-- src/components/29-timeline/timeline--standard-dates.hbs | 4 ++-- src/components/29-timeline/timeline.hbs | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/components/29-timeline/timeline--centered-dates.hbs b/src/components/29-timeline/timeline--centered-dates.hbs index 6d2f582e..7fbc5e74 100644 --- a/src/components/29-timeline/timeline--centered-dates.hbs +++ b/src/components/29-timeline/timeline--centered-dates.hbs @@ -1,7 +1,7 @@
-
+

Sample Item

@@ -12,7 +12,7 @@
-
+

Sample Item 2

diff --git a/src/components/29-timeline/timeline--centered.hbs b/src/components/29-timeline/timeline--centered.hbs index 6d95b2de..fffde4e8 100644 --- a/src/components/29-timeline/timeline--centered.hbs +++ b/src/components/29-timeline/timeline--centered.hbs @@ -1,7 +1,7 @@
-
+

Sample Item

@@ -12,7 +12,7 @@
-
+

Sample Item 2

diff --git a/src/components/29-timeline/timeline--right-aligned.hbs b/src/components/29-timeline/timeline--right-aligned.hbs index 23ffbe51..f5b29ec5 100644 --- a/src/components/29-timeline/timeline--right-aligned.hbs +++ b/src/components/29-timeline/timeline--right-aligned.hbs @@ -1,6 +1,6 @@
-
+

Sample Item

@@ -9,7 +9,7 @@
-
+

Sample Item 2

diff --git a/src/components/29-timeline/timeline--right-dates.hbs b/src/components/29-timeline/timeline--right-dates.hbs index c5a213a5..d884fae1 100644 --- a/src/components/29-timeline/timeline--right-dates.hbs +++ b/src/components/29-timeline/timeline--right-dates.hbs @@ -1,6 +1,6 @@
-
+

Sample Item

@@ -9,7 +9,7 @@
-
+

Sample Item 2

diff --git a/src/components/29-timeline/timeline--standard-dates.hbs b/src/components/29-timeline/timeline--standard-dates.hbs index 0aa3c988..a134916c 100644 --- a/src/components/29-timeline/timeline--standard-dates.hbs +++ b/src/components/29-timeline/timeline--standard-dates.hbs @@ -1,6 +1,6 @@
-
+

Sample Item

@@ -9,7 +9,7 @@
-
+

Sample Item 2

diff --git a/src/components/29-timeline/timeline.hbs b/src/components/29-timeline/timeline.hbs index 4ae92d99..a6cc653f 100644 --- a/src/components/29-timeline/timeline.hbs +++ b/src/components/29-timeline/timeline.hbs @@ -1,6 +1,6 @@
-
+

Sample Item

@@ -9,7 +9,7 @@
-
+

Sample Item 2

From 58736e5115f6d500cee0dbcee6e184deef28d7d8 Mon Sep 17 00:00:00 2001 From: Rachel Date: Wed, 24 Jul 2019 15:04:40 -0400 Subject: [PATCH 27/43] Refactored timeline heading to add font-size and weight using __heading class --- src/components/29-timeline/timeline--centered-dates.hbs | 4 ++-- src/components/29-timeline/timeline--centered.hbs | 4 ++-- src/components/29-timeline/timeline--right-aligned.hbs | 4 ++-- src/components/29-timeline/timeline--right-dates.hbs | 4 ++-- src/components/29-timeline/timeline--standard-dates.hbs | 4 ++-- src/components/29-timeline/timeline.hbs | 4 ++-- src/sass/components/_timeline.scss | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/components/29-timeline/timeline--centered-dates.hbs b/src/components/29-timeline/timeline--centered-dates.hbs index 7fbc5e74..5e2c2437 100644 --- a/src/components/29-timeline/timeline--centered-dates.hbs +++ b/src/components/29-timeline/timeline--centered-dates.hbs @@ -4,7 +4,7 @@
-

Sample Item

+

Sample Item

Spring 2019

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus in nulla ante. Suspendisse potenti. Donec efficitur, sem vitae dignissim viverra, nunc purus tempus nisi, feugiat ullamcorper tellus urna ut dui. Suspendisse potenti.

@@ -15,7 +15,7 @@
-

Sample Item 2

+

Sample Item 2

Summer 2019

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus in nulla ante. Suspendisse potenti. Donec efficitur, sem vitae dignissim viverra, nunc purus tempus nisi, feugiat ullamcorper tellus urna ut dui. Suspendisse potenti.

diff --git a/src/components/29-timeline/timeline--centered.hbs b/src/components/29-timeline/timeline--centered.hbs index fffde4e8..bac0379b 100644 --- a/src/components/29-timeline/timeline--centered.hbs +++ b/src/components/29-timeline/timeline--centered.hbs @@ -4,7 +4,7 @@
-

Sample Item

+

Sample Item

Spring 2019

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus in nulla ante. Suspendisse potenti. Donec efficitur, sem vitae dignissim viverra, nunc purus tempus nisi, feugiat ullamcorper tellus urna ut dui. Suspendisse potenti.

@@ -15,7 +15,7 @@
-

Sample Item 2

+

Sample Item 2

Summer 2019

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus in nulla ante. Suspendisse potenti. Donec efficitur, sem vitae dignissim viverra, nunc purus tempus nisi, feugiat ullamcorper tellus urna ut dui. Suspendisse potenti.

diff --git a/src/components/29-timeline/timeline--right-aligned.hbs b/src/components/29-timeline/timeline--right-aligned.hbs index f5b29ec5..c14eef12 100644 --- a/src/components/29-timeline/timeline--right-aligned.hbs +++ b/src/components/29-timeline/timeline--right-aligned.hbs @@ -3,7 +3,7 @@
-

Sample Item

+

Sample Item

Spring 2019

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus in nulla ante. Suspendisse potenti. Donec efficitur, sem vitae dignissim viverra, nunc purus tempus nisi, feugiat ullamcorper tellus urna ut dui. Suspendisse potenti.

@@ -12,7 +12,7 @@
-

Sample Item 2

+

Sample Item 2

Summer 2019

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus in nulla ante. Suspendisse potenti. Donec efficitur, sem vitae dignissim viverra, nunc purus tempus nisi, feugiat ullamcorper tellus urna ut dui. Suspendisse potenti.

diff --git a/src/components/29-timeline/timeline--right-dates.hbs b/src/components/29-timeline/timeline--right-dates.hbs index d884fae1..91f361dd 100644 --- a/src/components/29-timeline/timeline--right-dates.hbs +++ b/src/components/29-timeline/timeline--right-dates.hbs @@ -3,7 +3,7 @@
-

Sample Item

+

Sample Item

Spring 2019

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus in nulla ante. Suspendisse potenti. Donec efficitur, sem vitae dignissim viverra, nunc purus tempus nisi, feugiat ullamcorper tellus urna ut dui. Suspendisse potenti.

@@ -12,7 +12,7 @@
-

Sample Item 2

+

Sample Item 2

Summer 2019

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus in nulla ante. Suspendisse potenti. Donec efficitur, sem vitae dignissim viverra, nunc purus tempus nisi, feugiat ullamcorper tellus urna ut dui. Suspendisse potenti.

diff --git a/src/components/29-timeline/timeline--standard-dates.hbs b/src/components/29-timeline/timeline--standard-dates.hbs index a134916c..80131c49 100644 --- a/src/components/29-timeline/timeline--standard-dates.hbs +++ b/src/components/29-timeline/timeline--standard-dates.hbs @@ -3,7 +3,7 @@
-

Sample Item

+

Sample Item

Spring 2019

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus in nulla ante. Suspendisse potenti. Donec efficitur, sem vitae dignissim viverra, nunc purus tempus nisi, feugiat ullamcorper tellus urna ut dui. Suspendisse potenti.

@@ -12,7 +12,7 @@
-

Sample Item 2

+

Sample Item 2

Summer 2019

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus in nulla ante. Suspendisse potenti. Donec efficitur, sem vitae dignissim viverra, nunc purus tempus nisi, feugiat ullamcorper tellus urna ut dui. Suspendisse potenti.

diff --git a/src/components/29-timeline/timeline.hbs b/src/components/29-timeline/timeline.hbs index a6cc653f..a71697bb 100644 --- a/src/components/29-timeline/timeline.hbs +++ b/src/components/29-timeline/timeline.hbs @@ -3,7 +3,7 @@
-

Sample Item

+

Sample Item

Spring 2019

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus in nulla ante. Suspendisse potenti. Donec efficitur, sem vitae dignissim viverra, nunc purus tempus nisi, feugiat ullamcorper tellus urna ut dui. Suspendisse potenti.

@@ -12,7 +12,7 @@
-

Sample Item 2

+

Sample Item 2

Summer 2019

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus in nulla ante. Suspendisse potenti. Donec efficitur, sem vitae dignissim viverra, nunc purus tempus nisi, feugiat ullamcorper tellus urna ut dui. Suspendisse potenti.

diff --git a/src/sass/components/_timeline.scss b/src/sass/components/_timeline.scss index dfb17f20..101b3f94 100644 --- a/src/sass/components/_timeline.scss +++ b/src/sass/components/_timeline.scss @@ -58,7 +58,7 @@ border: none; } - & h2 { + &__heading { font-size: $ts-26; font-weight: $font-weight-bold; } From 23b602bb728d8590d18c80227c8bc74e66120c6d Mon Sep 17 00:00:00 2001 From: Rachel Date: Wed, 24 Jul 2019 15:09:16 -0400 Subject: [PATCH 28/43] Refactored __item-rightclass to correct modifier syntax (--right) --- .../29-timeline/timeline--centered-dates.hbs | 2 +- src/components/29-timeline/timeline--centered.hbs | 2 +- src/sass/components/_timeline.scss | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/components/29-timeline/timeline--centered-dates.hbs b/src/components/29-timeline/timeline--centered-dates.hbs index 5e2c2437..885c2d60 100644 --- a/src/components/29-timeline/timeline--centered-dates.hbs +++ b/src/components/29-timeline/timeline--centered-dates.hbs @@ -11,7 +11,7 @@
-
+
diff --git a/src/components/29-timeline/timeline--centered.hbs b/src/components/29-timeline/timeline--centered.hbs index bac0379b..1b1d11ab 100644 --- a/src/components/29-timeline/timeline--centered.hbs +++ b/src/components/29-timeline/timeline--centered.hbs @@ -11,7 +11,7 @@
-
+
diff --git a/src/sass/components/_timeline.scss b/src/sass/components/_timeline.scss index 101b3f94..0b6e9907 100644 --- a/src/sass/components/_timeline.scss +++ b/src/sass/components/_timeline.scss @@ -114,7 +114,7 @@ width: 100%; } - .#{$prefix}-timeline__item-right { + .#{$prefix}-timeline__item--right { margin-left: auto; } @@ -125,7 +125,7 @@ border-right-color: transparent; } - .#{$prefix}-timeline__item-right::after { + .#{$prefix}-timeline__item--right::after { margin-left: -$sm; left: unset; border-right-color: $color-black--100; @@ -137,7 +137,7 @@ left: 100%; } - .#{$prefix}-timeline__item-right .#{$prefix}-timeline__marker { + .#{$prefix}-timeline__item--right .#{$prefix}-timeline__marker { left: unset; margin-left: -$sm; } @@ -147,7 +147,7 @@ margin-right: $sm*.75; } - .#{$prefix}-timeline__item-right .#{$prefix}-timeline__content { + .#{$prefix}-timeline__item--right .#{$prefix}-timeline__content { margin-right: 0; margin-left: $sm; } @@ -162,7 +162,7 @@ margin-top: -$sm*3.15; } - .#{$prefix}-timeline__item-right .#{$prefix}-timeline__date--label { + .#{$prefix}-timeline__item--right .#{$prefix}-timeline__date--label { min-width: fit-content; min-height: fit-content; left: -$sm*7.5; From 245c8aa960fd0a4b9554cfd118be2e36414bcf62 Mon Sep 17 00:00:00 2001 From: Rachel Date: Wed, 24 Jul 2019 15:11:10 -0400 Subject: [PATCH 29/43] Removed unused __content-left class --- src/components/29-timeline/timeline--centered-dates.hbs | 2 +- src/components/29-timeline/timeline--centered.hbs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/29-timeline/timeline--centered-dates.hbs b/src/components/29-timeline/timeline--centered-dates.hbs index 885c2d60..5e8ada58 100644 --- a/src/components/29-timeline/timeline--centered-dates.hbs +++ b/src/components/29-timeline/timeline--centered-dates.hbs @@ -3,7 +3,7 @@
-
+

Sample Item

Spring 2019

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus in nulla ante. Suspendisse potenti. Donec efficitur, sem vitae dignissim viverra, nunc purus tempus nisi, feugiat ullamcorper tellus urna ut dui. Suspendisse potenti.

diff --git a/src/components/29-timeline/timeline--centered.hbs b/src/components/29-timeline/timeline--centered.hbs index 1b1d11ab..a624efa7 100644 --- a/src/components/29-timeline/timeline--centered.hbs +++ b/src/components/29-timeline/timeline--centered.hbs @@ -3,7 +3,7 @@
-
+

Sample Item

Spring 2019

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus in nulla ante. Suspendisse potenti. Donec efficitur, sem vitae dignissim viverra, nunc purus tempus nisi, feugiat ullamcorper tellus urna ut dui. Suspendisse potenti.

From 2c7ef302e41c2e376d631bdc4436bae82b29cafd Mon Sep 17 00:00:00 2001 From: Rachel Date: Wed, 24 Jul 2019 15:27:02 -0400 Subject: [PATCH 30/43] Changed breakpoint for labels --- src/sass/components/_timeline.scss | 70 +++++++++++++++--------------- 1 file changed, 34 insertions(+), 36 deletions(-) diff --git a/src/sass/components/_timeline.scss b/src/sass/components/_timeline.scss index 0b6e9907..6ba9cf33 100644 --- a/src/sass/components/_timeline.scss +++ b/src/sass/components/_timeline.scss @@ -94,6 +94,40 @@ } @include mq($breakpoint-md) { + .#{$prefix}-timeline { + &__date--label { + min-width: fit-content; + max-width: fit-content; + min-height: fit-content; + left: -$sm*7.5; + right: initial; + text-align: right; + position: absolute; + display: block; + top: $sm*.75; + margin-left: unset; + margin-top: unset; + margin-right: unset; + } + } + + .#{$prefix}-timeline--right { + .#{$prefix}-timeline__date--label { + min-width: fit-content; + max-width: fit-content; + min-height: fit-content; + left: unset; + right: -$sm*6; + text-align: left; + position: absolute; + display: block; + top: $sm*.75; + margin-left: unset; + margin-top: unset; + margin-right: unset; + } + } + .#{$prefix}-timeline--center { &::before { left: 50%; @@ -177,39 +211,3 @@ } } } - -@include mq($breakpoint-xl) { - .#{$prefix}-timeline { - &__date--label { - min-width: fit-content; - max-width: fit-content; - min-height: fit-content; - left: -$sm*7.5; - right: initial; - text-align: right; - position: absolute; - display: block; - top: $sm*.75; - margin-left: unset; - margin-top: unset; - margin-right: unset; - } - } - - .#{$prefix}-timeline--right { - .#{$prefix}-timeline__date--label { - min-width: fit-content; - max-width: fit-content; - min-height: fit-content; - left: unset; - right: -$sm*6; - text-align: left; - position: absolute; - display: block; - top: $sm*.75; - margin-left: unset; - margin-top: unset; - margin-right: unset; - } - } -} From 8507c7d3260b3b712837d5b27dc41df5013ba1c8 Mon Sep 17 00:00:00 2001 From: Rachel Date: Wed, 24 Jul 2019 15:31:41 -0400 Subject: [PATCH 31/43] Adjusted left for timeline date labels from 7.5rem to 7rem --- src/sass/components/_timeline.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sass/components/_timeline.scss b/src/sass/components/_timeline.scss index 6ba9cf33..afec6c78 100644 --- a/src/sass/components/_timeline.scss +++ b/src/sass/components/_timeline.scss @@ -99,7 +99,7 @@ min-width: fit-content; max-width: fit-content; min-height: fit-content; - left: -$sm*7.5; + left: -$sm*7; right: initial; text-align: right; position: absolute; From 875884ebae0ea98f0465e17dc253f53d98ae81d1 Mon Sep 17 00:00:00 2001 From: Rachel Date: Thu, 25 Jul 2019 12:55:35 -0400 Subject: [PATCH 32/43] Updated structure to reflect new recommendation --- src/components/{11-alerts => 11-alert}/README.md | 0 .../alert-inline/alert-inline.config.yml} | 2 ++ .../inline-alert.hbs => 11-alert/alert-inline/alert-inline.hbs} | 2 +- .../alerts.config.yml => 11-alert/alert/alert.config.yml} | 2 ++ .../{11-alerts/alerts.hbs => 11-alert/alert/alert.hbs} | 2 +- 5 files changed, 6 insertions(+), 2 deletions(-) rename src/components/{11-alerts => 11-alert}/README.md (100%) rename src/components/{30-inline-alert/inline-alert.config.yml => 11-alert/alert-inline/alert-inline.config.yml} (95%) rename src/components/{30-inline-alert/inline-alert.hbs => 11-alert/alert-inline/alert-inline.hbs} (68%) rename src/components/{11-alerts/alerts.config.yml => 11-alert/alert/alert.config.yml} (96%) rename src/components/{11-alerts/alerts.hbs => 11-alert/alert/alert.hbs} (59%) diff --git a/src/components/11-alerts/README.md b/src/components/11-alert/README.md similarity index 100% rename from src/components/11-alerts/README.md rename to src/components/11-alert/README.md diff --git a/src/components/30-inline-alert/inline-alert.config.yml b/src/components/11-alert/alert-inline/alert-inline.config.yml similarity index 95% rename from src/components/30-inline-alert/inline-alert.config.yml rename to src/components/11-alert/alert-inline/alert-inline.config.yml index 0d227177..facbe314 100644 --- a/src/components/30-inline-alert/inline-alert.config.yml +++ b/src/components/11-alert/alert-inline/alert-inline.config.yml @@ -1,5 +1,7 @@ title: Inline alerts +label: "Inline" status: "ready" +collated: true context: type: "info" message: "The Description tells users more about this stuff." diff --git a/src/components/30-inline-alert/inline-alert.hbs b/src/components/11-alert/alert-inline/alert-inline.hbs similarity index 68% rename from src/components/30-inline-alert/inline-alert.hbs rename to src/components/11-alert/alert-inline/alert-inline.hbs index c64d6566..04c9f7b3 100644 --- a/src/components/30-inline-alert/inline-alert.hbs +++ b/src/components/11-alert/alert-inline/alert-inline.hbs @@ -1,4 +1,4 @@ -
+
{{>(lookup . 'SVG') }} diff --git a/src/components/11-alerts/alerts.config.yml b/src/components/11-alert/alert/alert.config.yml similarity index 96% rename from src/components/11-alerts/alerts.config.yml rename to src/components/11-alert/alert/alert.config.yml index 6b10d002..41a802d5 100644 --- a/src/components/11-alerts/alerts.config.yml +++ b/src/components/11-alert/alert/alert.config.yml @@ -1,5 +1,7 @@ title: Alerts & errors +label: "Default" status: "ready" +collated: true context: type: "info" id: "information" diff --git a/src/components/11-alerts/alerts.hbs b/src/components/11-alert/alert/alert.hbs similarity index 59% rename from src/components/11-alerts/alerts.hbs rename to src/components/11-alert/alert/alert.hbs index 30371937..17bea024 100644 --- a/src/components/11-alerts/alerts.hbs +++ b/src/components/11-alert/alert/alert.hbs @@ -1,4 +1,4 @@ -
+

{{ title }}

{{ message }}

{{> @includes--alert-close-button }} From 1186a2c85befcf3102157207a58abd3b666f3b6b Mon Sep 17 00:00:00 2001 From: Rachel Date: Thu, 25 Jul 2019 12:59:05 -0400 Subject: [PATCH 33/43] Updated Cypress tests --- cypress/integration/alert_spec.js | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/cypress/integration/alert_spec.js b/cypress/integration/alert_spec.js index d35c2b3d..4d43500a 100644 --- a/cypress/integration/alert_spec.js +++ b/cypress/integration/alert_spec.js @@ -6,7 +6,7 @@ const DEV_SERVER = "http://localhost:3000"; describe('Rivet alert interactions', function() { it('Visits the info alert page', function() { - cy.visit(DEV_SERVER + '/components/preview/alerts--default'); + cy.visit(DEV_SERVER + '/components/preview/alert'); }); it('Should see the info alert page', function() { @@ -23,10 +23,6 @@ describe('Rivet alert interactions', function() { cy.get(ALERT_INFO).should('not.exist'); }); - it('Visits the warning alert page', function() { - cy.visit(DEV_SERVER + '/components/preview/alerts--warning'); - }); - it('Should be able to dismiss with .dismiss() method', function() { cy.window().then(win => { win.Alert.dismiss('warning-alert-title'); @@ -35,10 +31,6 @@ describe('Rivet alert interactions', function() { cy.get(ALERT_WARNING).should('not.exist'); }); - it('Visits the success alert page', function() { - cy.visit(DEV_SERVER + '/components/preview/alerts--success'); - }); - it('Should be able to dismiss with .dismiss() method with DOM element', function() { cy.window().then(win => { var alert = win.document.querySelector( From e6ae15cd1d68b4261511ae1367c23564cca5fa3a Mon Sep 17 00:00:00 2001 From: Rachel Date: Thu, 25 Jul 2019 13:33:40 -0400 Subject: [PATCH 34/43] Added standalone alert option --- .../11-alert/alert-inline/alert-inline.hbs | 2 +- .../alert-standalone.config.yml | 24 +++++++++++++++++++ .../alert-standalone/alert-standalone.hbs | 6 +++++ 3 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 src/components/11-alert/alert-standalone/alert-standalone.config.yml create mode 100644 src/components/11-alert/alert-standalone/alert-standalone.hbs diff --git a/src/components/11-alert/alert-inline/alert-inline.hbs b/src/components/11-alert/alert-inline/alert-inline.hbs index 04c9f7b3..c64d6566 100644 --- a/src/components/11-alert/alert-inline/alert-inline.hbs +++ b/src/components/11-alert/alert-inline/alert-inline.hbs @@ -1,4 +1,4 @@ -
+
{{>(lookup . 'SVG') }} diff --git a/src/components/11-alert/alert-standalone/alert-standalone.config.yml b/src/components/11-alert/alert-standalone/alert-standalone.config.yml new file mode 100644 index 00000000..3603b746 --- /dev/null +++ b/src/components/11-alert/alert-standalone/alert-standalone.config.yml @@ -0,0 +1,24 @@ +title: Standalone inline alerts +label: "Standalone" +status: "ready" +collated: true +context: + type: "info" + message: "The Description tells users more about this stuff." + SVG: "\\@includes--inline-alert-info" +variants: + - name: "success" + context: + type: "success" + message: "First name is valid!" + SVG: "\\@includes--inline-alert-success" + - name: "warning" + context: + type: "warning" + message: "Your Password is weak." + SVG: "\\@includes--inline-alert-warning" + - name: "danger" + context: + type: "danger" + message: "The Username you entered is taken." + SVG: "\\@includes--inline-alert-danger" \ No newline at end of file diff --git a/src/components/11-alert/alert-standalone/alert-standalone.hbs b/src/components/11-alert/alert-standalone/alert-standalone.hbs new file mode 100644 index 00000000..e3d3a1ef --- /dev/null +++ b/src/components/11-alert/alert-standalone/alert-standalone.hbs @@ -0,0 +1,6 @@ +
+ + {{>(lookup . 'SVG') }} + + {{ message }} +
\ No newline at end of file From 2d5a8a350c4f1720325ac36d6391b4a2fa5e22b0 Mon Sep 17 00:00:00 2001 From: Rachel Date: Thu, 25 Jul 2019 15:25:31 -0400 Subject: [PATCH 35/43] Updated method of handling text input alerts and created new folder for handling textarea separate from text inputs --- src/components/05-text-input/README.md | 1 + .../05-text-input/text-input.config.yml | 30 +++++++++++++++++++ src/components/05-text-input/text-input.hbs | 5 ++++ src/components/05-text-inputs/README.md | 1 - .../05-text-inputs/text-inputs.config.yml | 12 -------- src/components/05-text-inputs/text-inputs.hbs | 6 ---- src/components/30-textarea/README.md | 1 + .../30-textarea/textarea.config.yml | 30 +++++++++++++++++++ src/components/30-textarea/textarea.hbs | 5 ++++ 9 files changed, 72 insertions(+), 19 deletions(-) create mode 100644 src/components/05-text-input/README.md create mode 100644 src/components/05-text-input/text-input.config.yml create mode 100644 src/components/05-text-input/text-input.hbs delete mode 100644 src/components/05-text-inputs/README.md delete mode 100644 src/components/05-text-inputs/text-inputs.config.yml delete mode 100644 src/components/05-text-inputs/text-inputs.hbs create mode 100644 src/components/30-textarea/README.md create mode 100644 src/components/30-textarea/textarea.config.yml create mode 100644 src/components/30-textarea/textarea.hbs diff --git a/src/components/05-text-input/README.md b/src/components/05-text-input/README.md new file mode 100644 index 00000000..e194163d --- /dev/null +++ b/src/components/05-text-input/README.md @@ -0,0 +1 @@ +# Text input \ No newline at end of file diff --git a/src/components/05-text-input/text-input.config.yml b/src/components/05-text-input/text-input.config.yml new file mode 100644 index 00000000..090dca2e --- /dev/null +++ b/src/components/05-text-input/text-input.config.yml @@ -0,0 +1,30 @@ +title: "Text input" +status: "ready" +collated: true +context: + alert: false +variants: + - name: "disabled" + context: + modifier: "disabled" + alert: false + - name: "success" + context: + class: "success" + alert: true + alertVariant: "\\@alert-inline--success" + - name: "warning" + context: + class: "warning" + alert: true + alertVariant: "\\@alert-inline--warning" + - name: "danger" + context: + class: "danger" + alert: true + alertVariant: "\\@alert-inline--danger" + - name: "info" + context: + class: "info" + alert: true + alertVariant: "\\@alert-inline" \ No newline at end of file diff --git a/src/components/05-text-input/text-input.hbs b/src/components/05-text-input/text-input.hbs new file mode 100644 index 00000000..3eb35545 --- /dev/null +++ b/src/components/05-text-input/text-input.hbs @@ -0,0 +1,5 @@ + + +{{#if alert}} + {{render (lookup . 'alertVariant') merge=true }} +{{/if}} \ No newline at end of file diff --git a/src/components/05-text-inputs/README.md b/src/components/05-text-inputs/README.md deleted file mode 100644 index 578de378..00000000 --- a/src/components/05-text-inputs/README.md +++ /dev/null @@ -1 +0,0 @@ -# Text inputs \ No newline at end of file diff --git a/src/components/05-text-inputs/text-inputs.config.yml b/src/components/05-text-inputs/text-inputs.config.yml deleted file mode 100644 index 8e583cdc..00000000 --- a/src/components/05-text-inputs/text-inputs.config.yml +++ /dev/null @@ -1,12 +0,0 @@ -title: "Text inputs" -status: "ready" -context: - modifier: "" - class: "" - alert: false -variants: - - name: "disabled" - context: - modifier: "disabled" - alert: true - alertVariant: "\\@alerts" \ No newline at end of file diff --git a/src/components/05-text-inputs/text-inputs.hbs b/src/components/05-text-inputs/text-inputs.hbs deleted file mode 100644 index 132142eb..00000000 --- a/src/components/05-text-inputs/text-inputs.hbs +++ /dev/null @@ -1,6 +0,0 @@ - - - -{{#if alert}} - {{>(lookup . 'alertVariant') }} -{{/if}} \ No newline at end of file diff --git a/src/components/30-textarea/README.md b/src/components/30-textarea/README.md new file mode 100644 index 00000000..5cd6b31c --- /dev/null +++ b/src/components/30-textarea/README.md @@ -0,0 +1 @@ +# Textarea \ No newline at end of file diff --git a/src/components/30-textarea/textarea.config.yml b/src/components/30-textarea/textarea.config.yml new file mode 100644 index 00000000..0d7fcec7 --- /dev/null +++ b/src/components/30-textarea/textarea.config.yml @@ -0,0 +1,30 @@ +title: "Textarea" +status: "ready" +collated: true +context: + alert: false +variants: + - name: "disabled" + context: + modifier: "disabled" + alert: false + - name: "success" + context: + class: "success" + alert: true + alertVariant: "\\@alert-inline--success" + - name: "warning" + context: + class: "warning" + alert: true + alertVariant: "\\@alert-inline--warning" + - name: "danger" + context: + class: "danger" + alert: true + alertVariant: "\\@alert-inline--danger" + - name: "info" + context: + class: "info" + alert: true + alertVariant: "\\@alert-inline" \ No newline at end of file diff --git a/src/components/30-textarea/textarea.hbs b/src/components/30-textarea/textarea.hbs new file mode 100644 index 00000000..78812d44 --- /dev/null +++ b/src/components/30-textarea/textarea.hbs @@ -0,0 +1,5 @@ + + +{{#if alert}} + {{render (lookup . 'alertVariant') merge=true }} +{{/if}} \ No newline at end of file From 5f17b05daf51a630ef66a52f9af4a762447a6cc0 Mon Sep 17 00:00:00 2001 From: Rachel Date: Fri, 26 Jul 2019 10:32:53 -0400 Subject: [PATCH 36/43] Fixed ids and created example on the personal details form --- src/components/05-text-input/text-input.config.yml | 6 ++++++ src/components/05-text-input/text-input.hbs | 4 ++-- .../example-layouts--personal-details-form.hbs | 2 ++ src/components/30-textarea/textarea.config.yml | 6 ++++++ src/components/30-textarea/textarea.hbs | 4 ++-- 5 files changed, 18 insertions(+), 4 deletions(-) diff --git a/src/components/05-text-input/text-input.config.yml b/src/components/05-text-input/text-input.config.yml index 090dca2e..920c650f 100644 --- a/src/components/05-text-input/text-input.config.yml +++ b/src/components/05-text-input/text-input.config.yml @@ -2,29 +2,35 @@ title: "Text input" status: "ready" collated: true context: + id: "default" alert: false variants: - name: "disabled" context: + id: "disabled" modifier: "disabled" alert: false - name: "success" context: + id: "success" class: "success" alert: true alertVariant: "\\@alert-inline--success" - name: "warning" context: + id: "warning" class: "warning" alert: true alertVariant: "\\@alert-inline--warning" - name: "danger" context: + id: "danger" class: "danger" alert: true alertVariant: "\\@alert-inline--danger" - name: "info" context: + id: "info" class: "info" alert: true alertVariant: "\\@alert-inline" \ No newline at end of file diff --git a/src/components/05-text-input/text-input.hbs b/src/components/05-text-input/text-input.hbs index 3eb35545..9429a8a0 100644 --- a/src/components/05-text-input/text-input.hbs +++ b/src/components/05-text-input/text-input.hbs @@ -1,5 +1,5 @@ - - + + {{#if alert}} {{render (lookup . 'alertVariant') merge=true }} {{/if}} \ No newline at end of file diff --git a/src/components/102-example-layouts/example-layouts--personal-details-form.hbs b/src/components/102-example-layouts/example-layouts--personal-details-form.hbs index f931ddc6..1b2051e9 100644 --- a/src/components/102-example-layouts/example-layouts--personal-details-form.hbs +++ b/src/components/102-example-layouts/example-layouts--personal-details-form.hbs @@ -3,6 +3,8 @@

Contact form

Please fill out the form below and someone from our office will get contact You as soon as possible

+ {{render '@text-input--success' id="form" merge=true }} +
diff --git a/src/components/30-textarea/textarea.config.yml b/src/components/30-textarea/textarea.config.yml index 0d7fcec7..9684cf3e 100644 --- a/src/components/30-textarea/textarea.config.yml +++ b/src/components/30-textarea/textarea.config.yml @@ -2,29 +2,35 @@ title: "Textarea" status: "ready" collated: true context: + id: "default" alert: false variants: - name: "disabled" context: + id: "disabled" modifier: "disabled" alert: false - name: "success" context: + id: "success" class: "success" alert: true alertVariant: "\\@alert-inline--success" - name: "warning" context: + id: "warning" class: "warning" alert: true alertVariant: "\\@alert-inline--warning" - name: "danger" context: + id: "danger" class: "danger" alert: true alertVariant: "\\@alert-inline--danger" - name: "info" context: + id: "info" class: "info" alert: true alertVariant: "\\@alert-inline" \ No newline at end of file diff --git a/src/components/30-textarea/textarea.hbs b/src/components/30-textarea/textarea.hbs index 78812d44..e0972753 100644 --- a/src/components/30-textarea/textarea.hbs +++ b/src/components/30-textarea/textarea.hbs @@ -1,5 +1,5 @@ - - + + {{#if alert}} {{render (lookup . 'alertVariant') merge=true }} {{/if}} \ No newline at end of file From 23406ab546bbd6c12c0bcc445813436d3f20c300 Mon Sep 17 00:00:00 2001 From: Rachel Date: Fri, 26 Jul 2019 11:31:03 -0400 Subject: [PATCH 37/43] Removed explicit selector for div and updated to __row --- src/components/29-timeline/timeline--centered-dates.hbs | 4 ++-- src/components/29-timeline/timeline--centered.hbs | 4 ++-- src/sass/components/_timeline.scss | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/components/29-timeline/timeline--centered-dates.hbs b/src/components/29-timeline/timeline--centered-dates.hbs index 5e8ada58..a89ddda4 100644 --- a/src/components/29-timeline/timeline--centered-dates.hbs +++ b/src/components/29-timeline/timeline--centered-dates.hbs @@ -1,5 +1,5 @@
-
+
@@ -10,7 +10,7 @@
-
+
diff --git a/src/components/29-timeline/timeline--centered.hbs b/src/components/29-timeline/timeline--centered.hbs index a624efa7..f274e980 100644 --- a/src/components/29-timeline/timeline--centered.hbs +++ b/src/components/29-timeline/timeline--centered.hbs @@ -1,5 +1,5 @@
-
+
@@ -10,7 +10,7 @@
-
+
diff --git a/src/sass/components/_timeline.scss b/src/sass/components/_timeline.scss index afec6c78..f1be2a29 100644 --- a/src/sass/components/_timeline.scss +++ b/src/sass/components/_timeline.scss @@ -134,7 +134,7 @@ margin-left: 0; } - & > div { + .#{$prefix}-timeline__row { display: flex; flex-wrap: wrap; margin-right: -$sm*.75; From 267a552a5cead6736807629b2a90a2617140f163 Mon Sep 17 00:00:00 2001 From: Rachel Date: Fri, 26 Jul 2019 15:44:07 -0400 Subject: [PATCH 38/43] Set width for labels and positioned all labels exactly 24px from timeline --- src/sass/components/_timeline.scss | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/src/sass/components/_timeline.scss b/src/sass/components/_timeline.scss index f1be2a29..e6c5850c 100644 --- a/src/sass/components/_timeline.scss +++ b/src/sass/components/_timeline.scss @@ -96,10 +96,7 @@ @include mq($breakpoint-md) { .#{$prefix}-timeline { &__date--label { - min-width: fit-content; - max-width: fit-content; - min-height: fit-content; - left: -$sm*7; + left: -$sm*11.25; right: initial; text-align: right; position: absolute; @@ -108,16 +105,14 @@ margin-left: unset; margin-top: unset; margin-right: unset; + width: 10rem; } } .#{$prefix}-timeline--right { .#{$prefix}-timeline__date--label { - min-width: fit-content; - max-width: fit-content; - min-height: fit-content; left: unset; - right: -$sm*6; + right: -$sm*11.25; text-align: left; position: absolute; display: block; @@ -125,6 +120,7 @@ margin-left: unset; margin-top: unset; margin-right: unset; + width: 10rem; } } @@ -187,19 +183,18 @@ } .#{$prefix}-timeline__date--label { + left: initial; + right: -$sm*11.75; text-align: left; position: absolute; display: block; - left: initial; - right: -$sm*7; top: unset; margin-top: -$sm*3.15; + width: $sm*10; } .#{$prefix}-timeline__item--right .#{$prefix}-timeline__date--label { - min-width: fit-content; - min-height: fit-content; - left: -$sm*7.5; + left: -$sm*11.5; right: initial; text-align: right; position: absolute; @@ -208,6 +203,7 @@ margin-left: unset; margin-top: unset; margin-right: unset; + width: $sm*10; } } } From aebbcede3cd0de30032e792134cd9bd42dc990b5 Mon Sep 17 00:00:00 2001 From: Rachel Date: Fri, 26 Jul 2019 15:52:14 -0400 Subject: [PATCH 39/43] Replaced usage of unset with initial for IE11 --- src/sass/components/_timeline.scss | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/sass/components/_timeline.scss b/src/sass/components/_timeline.scss index e6c5850c..e36275b6 100644 --- a/src/sass/components/_timeline.scss +++ b/src/sass/components/_timeline.scss @@ -71,7 +71,7 @@ .#{$prefix}-timeline--right { &::before { - left: unset; + left: initial; right: $xxs; } @@ -102,24 +102,24 @@ position: absolute; display: block; top: $sm*.75; - margin-left: unset; - margin-top: unset; - margin-right: unset; + margin-left: initial; + margin-top: initial; + margin-right: initial; width: 10rem; } } .#{$prefix}-timeline--right { .#{$prefix}-timeline__date--label { - left: unset; + left: initial; right: -$sm*11.25; text-align: left; position: absolute; display: block; top: $sm*.75; - margin-left: unset; - margin-top: unset; - margin-right: unset; + margin-left: initial; + margin-top: initial; + margin-right: initial; width: 10rem; } } @@ -157,7 +157,7 @@ .#{$prefix}-timeline__item--right::after { margin-left: -$sm; - left: unset; + left: initial; border-right-color: $color-black--100; border-left-color: transparent; } @@ -168,7 +168,7 @@ } .#{$prefix}-timeline__item--right .#{$prefix}-timeline__marker { - left: unset; + left: initial; margin-left: -$sm; } @@ -188,7 +188,7 @@ text-align: left; position: absolute; display: block; - top: unset; + top: initial; margin-top: -$sm*3.15; width: $sm*10; } @@ -200,9 +200,9 @@ position: absolute; display: block; top: $sm*.75; - margin-left: unset; - margin-top: unset; - margin-right: unset; + margin-left: initial; + margin-top: initial; + margin-right: initial; width: $sm*10; } } From 6af081d6980ba32230b08a5c8fb671b67ca5b02b Mon Sep 17 00:00:00 2001 From: Rachel Date: Fri, 26 Jul 2019 16:02:01 -0400 Subject: [PATCH 40/43] Replaced initial with auto for IE11 fix --- src/sass/components/_timeline.scss | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/sass/components/_timeline.scss b/src/sass/components/_timeline.scss index e36275b6..27c1a8c8 100644 --- a/src/sass/components/_timeline.scss +++ b/src/sass/components/_timeline.scss @@ -71,7 +71,7 @@ .#{$prefix}-timeline--right { &::before { - left: initial; + left: auto; right: $xxs; } @@ -102,24 +102,24 @@ position: absolute; display: block; top: $sm*.75; - margin-left: initial; - margin-top: initial; - margin-right: initial; + margin-left: auto; + margin-top: auto; + margin-right: auto; width: 10rem; } } .#{$prefix}-timeline--right { .#{$prefix}-timeline__date--label { - left: initial; + left: auto; right: -$sm*11.25; text-align: left; position: absolute; display: block; top: $sm*.75; - margin-left: initial; - margin-top: initial; - margin-right: initial; + margin-left: auto; + margin-top: auto; + margin-right: auto; width: 10rem; } } @@ -157,7 +157,7 @@ .#{$prefix}-timeline__item--right::after { margin-left: -$sm; - left: initial; + left: auto; border-right-color: $color-black--100; border-left-color: transparent; } @@ -168,7 +168,7 @@ } .#{$prefix}-timeline__item--right .#{$prefix}-timeline__marker { - left: initial; + left: auto; margin-left: -$sm; } @@ -188,7 +188,7 @@ text-align: left; position: absolute; display: block; - top: initial; + top: auto; margin-top: -$sm*3.15; width: $sm*10; } @@ -200,9 +200,9 @@ position: absolute; display: block; top: $sm*.75; - margin-left: initial; - margin-top: initial; - margin-right: initial; + margin-left: auto; + margin-top: auto; + margin-right: auto; width: $sm*10; } } From f30f8af79f15cece2cba1469d6f080975c866d3e Mon Sep 17 00:00:00 2001 From: Rachel Date: Fri, 26 Jul 2019 16:06:54 -0400 Subject: [PATCH 41/43] Replaced use of initial (not where previously using unset) with auto --- src/sass/components/_timeline.scss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/sass/components/_timeline.scss b/src/sass/components/_timeline.scss index 27c1a8c8..63016a2a 100644 --- a/src/sass/components/_timeline.scss +++ b/src/sass/components/_timeline.scss @@ -97,7 +97,7 @@ .#{$prefix}-timeline { &__date--label { left: -$sm*11.25; - right: initial; + right: auto; text-align: right; position: absolute; display: block; @@ -183,7 +183,7 @@ } .#{$prefix}-timeline__date--label { - left: initial; + left: auto; right: -$sm*11.75; text-align: left; position: absolute; @@ -195,7 +195,7 @@ .#{$prefix}-timeline__item--right .#{$prefix}-timeline__date--label { left: -$sm*11.5; - right: initial; + right: auto; text-align: right; position: absolute; display: block; From cd2ec8755c2931e29da54fc696a43c4caaf395cd Mon Sep 17 00:00:00 2001 From: iubot Date: Tue, 30 Jul 2019 17:26:26 +0000 Subject: [PATCH 42/43] Circle CI: update package.json version. [skip ci] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a456ce37..cb09a35a 100755 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "rivet-uits", "description": "Indiana University design system", "homepage": "https://rivet.iu.edu", - "version": "1.6.0", + "version": "1.7.0-rc.217", "license": "BSD-3-Clause", "repository": { "type": "git", From 176a4cc3d5de1d096ed3df3f44d0955a91c84fad Mon Sep 17 00:00:00 2001 From: Zachary Todd Date: Wed, 31 Jul 2019 11:13:08 -0400 Subject: [PATCH 43/43] Updated package.json to version 1.7.0 [skip ci] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index cb09a35a..992630cb 100755 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "rivet-uits", "description": "Indiana University design system", "homepage": "https://rivet.iu.edu", - "version": "1.7.0-rc.217", + "version": "1.7.0", "license": "BSD-3-Clause", "repository": { "type": "git",