Skip to content

Commit

Permalink
Merge pull request #200 from comicrelief/198_update_jit_styles
Browse files Browse the repository at this point in the history 
JIT Import styles replace the core with just base-mixin
  • Loading branch information
@deniselashlley
deniselashlley authored Aug 15, 2018
2 parents c185794 + 84ed180 commit 03e725b
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 41 deletions.
2 changes: 1 addition & 1 deletion src/components/JustInTime/JustInTime.scss
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import "~@comicrelief/pattern-lab/sass/base/core";
@import "~@comicrelief/pattern-lab/sass/base/core/base-1-mixins";
@import "~@comicrelief/pattern-lab/sass/base/variables/grid";
@import "~@comicrelief/pattern-lab/sass/base/variables/colours";
@import "~@comicrelief/pattern-lab/sass/base/variables/typography";
Expand Down
76 changes: 36 additions & 40 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.0.0-beta.53.tgz#1f45eb617bf9463d482b2c04d349d9e4edbf4892"

"@comicrelief/pattern-lab@*":
version "7.47.12"
resolved "https://registry.yarnpkg.com/@comicrelief/pattern-lab/-/pattern-lab-7.47.12.tgz#fc74e26e07f0d8d8262ea45b78f3ddddfcce072f"
version "7.47.13"
resolved "https://registry.yarnpkg.com/@comicrelief/pattern-lab/-/pattern-lab-7.47.13.tgz#75dae5aebe9061263398db4cb54f756ff035571b"
dependencies:
susy "^2.2.12"

Expand All @@ -38,8 +38,8 @@
resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.0.tgz#50c1e2260ac0ed9439a181de3725a0168d59c48a"

"@octokit/rest@^15.2.0":
version "15.9.5"
resolved "https://registry.yarnpkg.com/@octokit/rest/-/rest-15.9.5.tgz#e356d202bd0b517e381f705ad77d98ccb84e0c65"
version "15.9.6"
resolved "https://registry.yarnpkg.com/@octokit/rest/-/rest-15.9.6.tgz#992a8b0fe17ac85f572e5b57d00ea5493be010ee"
dependencies:
before-after-hook "^1.1.0"
btoa-lite "^1.0.0"
Expand Down Expand Up @@ -375,8 +375,8 @@
react-treebeard "^2.1.0"

"@types/node@*":
version "10.5.8"
resolved "https://registry.yarnpkg.com/@types/node/-/node-10.5.8.tgz#6f14ccecad1d19332f063a6a764f8907801fece0"
version "10.7.0"
resolved "https://registry.yarnpkg.com/@types/node/-/node-10.7.0.tgz#d384b2c8625414ab2aa18fdf989c288d6a7a8202"

JSONStream@^1.0.4, JSONStream@^1.3.3:
version "1.3.4"
Expand Down Expand Up @@ -2417,12 +2417,12 @@ caniuse-api@^1.5.2:
lodash.uniq "^4.5.0"

caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639:
version "1.0.30000876"
resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000876.tgz#0cbd78ad84900196982e5145c26170f6d6a93fd7"
version "1.0.30000877"
resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000877.tgz#29ea435fdbe8a671cc5b027a75e28a816c17c340"

caniuse-lite@^1.0.30000748, caniuse-lite@^1.0.30000792, caniuse-lite@^1.0.30000805, caniuse-lite@^1.0.30000844:
version "1.0.30000876"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000876.tgz#69fc1b696a35fd91089061aa916f677ee7057ada"
version "1.0.30000877"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000877.tgz#f189673b86ecc06436520e3e391de6a13ca923b4"

capture-exit@^1.2.0:
version "1.2.0"
Expand Down Expand Up @@ -2532,8 +2532,8 @@ chownr@^1.0.1, chownr@~1.0.1:
resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.0.1.tgz#e2a75042a9551908bebd25b8523d5f9769d79181"

ci-info@^1.0.0:
version "1.1.3"
resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.1.3.tgz#710193264bb05c77b8c90d02f5aaf22216a667b2"
version "1.3.0"
resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.3.0.tgz#ea8219b0355a58692b762baf1cdd76ceb4503283"

cidr-regex@^2.0.8:
version "2.0.9"
Expand Down Expand Up @@ -3459,11 +3459,10 @@ defaults@^1.0.3:
clone "^1.0.2"

define-properties@^1.1.2:
version "1.1.2"
resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.2.tgz#83a73f2fea569898fb737193c8f873caf6d45c94"
version "1.1.3"
resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
dependencies:
foreach "^2.0.5"
object-keys "^1.0.8"
object-keys "^1.0.12"

define-property@^0.2.5:
version "0.2.5"
Expand Down Expand Up @@ -3781,8 +3780,8 @@ ee-first@1.1.1:
resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"

electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.30, electron-to-chromium@^1.3.47:
version "1.3.57"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.57.tgz#61b2446f16af26fb8873210007a7637ad644c82d"
version "1.3.58"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.58.tgz#8267a4000014e93986d9d18c65a8b4022ca75188"

elliptic@^6.0.0:
version "6.4.1"
Expand Down Expand Up @@ -4116,9 +4115,10 @@ eslint-plugin-jsx-a11y@5, eslint-plugin-jsx-a11y@5.1.1:
jsx-ast-utils "^1.4.0"

eslint-plugin-react@7:
version "7.10.0"
resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.10.0.tgz#af5c1fef31c4704db02098f9be18202993828b50"
version "7.11.1"
resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.11.1.tgz#c01a7af6f17519457d6116aa94fc6d2ccad5443c"
dependencies:
array-includes "^3.0.3"
doctrine "^2.1.0"
has "^1.0.3"
jsx-ast-utils "^2.0.1"
Expand Down Expand Up @@ -4588,8 +4588,8 @@ fd-slicer@~1.0.1:
pend "~1.2.0"

figgy-pudding@^3.0.0, figgy-pudding@^3.1.0, figgy-pudding@^3.2.0:
version "3.2.0"
resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.2.0.tgz#464626b73d7b0fc045a99753d191b0785957ff73"
version "3.2.1"
resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.2.1.tgz#946bdc2515abad5190027113778595462b668eb3"

figures@^1.3.5:
version "1.7.0"
Expand Down Expand Up @@ -4768,8 +4768,8 @@ flush-write-stream@^1.0.0:
readable-stream "^2.0.4"

follow-redirects@^1.0.0, follow-redirects@^1.3.0:
version "1.5.4"
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.4.tgz#86d1bb946f24cb988d660aaa2ca2478c0772ead1"
version "1.5.5"
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.5.tgz#3c143ca599a2e22e62876687d68b23d55bad788b"
dependencies:
debug "^3.1.0"

Expand All @@ -4793,10 +4793,6 @@ for-own@^1.0.0:
dependencies:
for-in "^1.0.1"

foreach@^2.0.5:
version "2.0.5"
resolved "https://registry.yarnpkg.com/foreach/-/foreach-2.0.5.tgz#0bee005018aeb260d0a3af3ae658dd0136ec1b99"

forever-agent@~0.6.1:
version "0.6.1"
resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
Expand Down Expand Up @@ -7888,8 +7884,8 @@ negotiator@0.6.1:
resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9"

neo-async@^2.5.0:
version "2.5.1"
resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.5.1.tgz#acb909e327b1e87ec9ef15f41b8a269512ad41ee"
version "2.5.2"
resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.5.2.tgz#489105ce7bc54e709d736b195f82135048c50fcc"

nerf-dart@^1.0.0:
version "1.0.0"
Expand All @@ -7912,8 +7908,8 @@ nice-try@^1.0.4:
resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.4.tgz#d93962f6c52f2c1558c0fbda6d512819f1efe1c4"

nise@^1.3.3:
version "1.4.2"
resolved "https://registry.yarnpkg.com/nise/-/nise-1.4.2.tgz#a9a3800e3994994af9e452333d549d60f72b8e8c"
version "1.4.3"
resolved "https://registry.yarnpkg.com/nise/-/nise-1.4.3.tgz#d1996e8d15256ceff1a0a1596e0c72bff370e37c"
dependencies:
"@sinonjs/formatio" "^2.0.0"
just-extend "^1.1.27"
Expand Down Expand Up @@ -7969,7 +7965,7 @@ node-forge@0.7.5:
version "0.7.5"
resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.7.5.tgz#6c152c345ce11c52f465c2abd957e8639cd674df"

node-gyp@^3.6.2, node-gyp@^3.7.0, node-gyp@^3.8.0:
node-gyp@^3.7.0, node-gyp@^3.8.0:
version "3.8.0"
resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-3.8.0.tgz#540304261c330e80d0d5edce253a68cb3964218c"
dependencies:
Expand Down Expand Up @@ -8140,17 +8136,17 @@ npm-install-checks@~3.0.0:
semver "^2.3.0 || 3.x || 4 || 5"

npm-lifecycle@^2.0.3:
version "2.0.3"
resolved "https://registry.yarnpkg.com/npm-lifecycle/-/npm-lifecycle-2.0.3.tgz#696bedf1143371163e9cc16fe872357e25d8d90e"
version "2.1.0"
resolved "https://registry.yarnpkg.com/npm-lifecycle/-/npm-lifecycle-2.1.0.tgz#1eda2eedb82db929e3a0c50341ab0aad140ed569"
dependencies:
byline "^5.0.0"
graceful-fs "^4.1.11"
node-gyp "^3.6.2"
node-gyp "^3.8.0"
resolve-from "^4.0.0"
slide "^1.1.6"
uid-number "0.0.6"
umask "^1.1.0"
which "^1.3.0"
which "^1.3.1"

npm-logical-tree@^1.2.1:
version "1.2.1"
Expand Down Expand Up @@ -8411,7 +8407,7 @@ object-is@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.0.1.tgz#0aa60ec9989a0b3ed795cf4d06f62cf1ad6539b6"

object-keys@^1.0.11, object-keys@^1.0.8:
object-keys@^1.0.11, object-keys@^1.0.12:
version "1.0.12"
resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.0.12.tgz#09c53855377575310cca62f55bb334abff7b3ed2"

Expand Down Expand Up @@ -12030,8 +12026,8 @@ uglifyjs-webpack-plugin@^0.4.6:
webpack-sources "^1.0.1"

uglifyjs-webpack-plugin@^1.2.4:
version "1.2.7"
resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.2.7.tgz#57638dd99c853a1ebfe9d97b42160a8a507f9d00"
version "1.3.0"
resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.3.0.tgz#75f548160858163a08643e086d5fefe18a5d67de"
dependencies:
cacache "^10.0.4"
find-cache-dir "^1.0.0"
Expand Down

0 comments on commit 03e725b

Please sign in to comment.