Skip to content

Commit

Permalink
Merge pull request #639 from carloslancha/revert-electric-clay-compon…
Browse files Browse the repository at this point in the history
…ents

Revert "Use electric-clay-components instead of electric-quartz-components"
  • Loading branch information
matuzalemsteles authored Feb 26, 2018
2 parents 1068fbf + d0ef11d commit 50c44c7
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion packages/claycss.com/electric.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ if (clayPath) {
}

const excludedComponents = /.*pagination/;
const metalComponents = ['electric-clay-components']
const metalComponents = ['electric-quartz-components']
.concat(fs.readdirSync('../').filter(f => f.match(/^clay-.*/) && !f.match(excludedComponents)));
const pathSrc = 'src';
const ignoreDirs = ['components', 'layouts', 'pages', 'partials', 'styles'];
Expand Down
2 changes: 1 addition & 1 deletion packages/claycss.com/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"concurrently": "^3.5.0",
"countries-list": "^2.0.0",
"electric-cli": "^3.0.1",
"electric-clay-components": "^3.0.1",
"electric-quartz-components": "alpha",
"gulp": "^3.9.1",
"gulp-sass": "^3.1.0",
"gulp-storage": "^1.0.6",
Expand Down
18 changes: 9 additions & 9 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3822,9 +3822,9 @@ ejs@^2.3.1:
version "2.5.7"
resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.5.7.tgz#cc872c168880ae3c7189762fd5ffc00896c9518a"

electric-base-components@^3.0.2:
version "3.0.2"
resolved "https://registry.yarnpkg.com/electric-base-components/-/electric-base-components-3.0.2.tgz#837602b8180f35270856fc6ed3a2669e9015e20f"
electric-base-components@alpha:
version "2.0.0-alpha.10"
resolved "https://registry.yarnpkg.com/electric-base-components/-/electric-base-components-2.0.0-alpha.10.tgz#c02d8e4f150a1fad36adb941177514b33192f8c7"
dependencies:
metal-affix "^2.0.0"
metal-ajax "^2.0.3"
Expand All @@ -3835,12 +3835,6 @@ electric-base-components@^3.0.2:
metal-toggler "^2.0.0"
metal-tooltip "^2.0.3"

electric-clay-components@^3.0.1:
version "3.0.1"
resolved "https://registry.yarnpkg.com/electric-clay-components/-/electric-clay-components-3.0.1.tgz#093bb0e437b109f041092915ce3daf693f9764b8"
dependencies:
electric-base-components "^3.0.2"

electric-cli@^3.0.1:
version "3.0.1"
resolved "https://registry.yarnpkg.com/electric-cli/-/electric-cli-3.0.1.tgz#01594affe3a3998b909a2b256ad7a62787a98e30"
Expand All @@ -3855,6 +3849,12 @@ electric-cli@^3.0.1:
update-notifier "^2.1.0"
yargs "^6.6.0"

electric-quartz-components@alpha:
version "2.0.0-alpha.3"
resolved "https://registry.yarnpkg.com/electric-quartz-components/-/electric-quartz-components-2.0.0-alpha.3.tgz#b073728a5646008973d17b9a0681be3aa3d252c3"
dependencies:
electric-base-components alpha

electric@^3.0.1:
version "3.0.1"
resolved "https://registry.yarnpkg.com/electric/-/electric-3.0.1.tgz#83224924b5f8b0fbf9d256bef5fa824157a3089e"
Expand Down

0 comments on commit 50c44c7

Please sign in to comment.