Update extends to composes, keep commented out

markdalgleish · markdalgleish · commit 86e6d30ffb4a · 2015-06-09T07:24:47.000+10:00
diff --git a/package.json b/package.json
@@ -24,7 +24,7 @@
   "homepage": "https://github.com/css-modules/browserify-demo",
   "devDependencies": {
     "browserify": "^10.2.3",
-    "css-modulesify": "^0.1.2",
+    "css-modulesify": "git://github.com/css-modules/css-modulesify#c0bfe993de60ba63cd7215956d67104ada74ec27",
     "gh-pages": "git://github.com/markdalgleish/gh-pages#cli-message",
     "http-server": "^0.8.0",
     "hyperscript": "^1.4.6",
diff --git a/src/components/3-ClassInheritance/StyleVariantA/StyleVariantA.css b/src/components/3-ClassInheritance/StyleVariantA/StyleVariantA.css
@@ -1,9 +1,9 @@
 .root {
-  /*extends: box from "../../../shared/styles/layout.css";*/
+  /*composes: box from "../../../shared/styles/layout.css";*/
   border-color: red;
 }
 
 .text {
-  /*extends: heading from "../../../shared/styles/typography.css";*/
+  /*composes: heading from "../../../shared/styles/typography.css";*/
   color: red;
 }
diff --git a/src/components/3-ClassInheritance/StyleVariantB/StyleVariantB.css b/src/components/3-ClassInheritance/StyleVariantB/StyleVariantB.css
@@ -1,9 +1,9 @@
 .root {
-  /*extends: box from "../../../shared/styles/layout.css";*/
+  /*composes: box from "../../../shared/styles/layout.css";*/
   border-color: blue;
 }
 
 .text {
-  /*extends: heading from "../../../shared/styles/typography.css";*/
+  /*composes: heading from "../../../shared/styles/typography.css";*/
   color: blue;
 }
diff --git a/src/components/4-InheritanceOverrides/InheritanceOverrides.css b/src/components/4-InheritanceOverrides/InheritanceOverrides.css
@@ -1,11 +1,11 @@
 .root {
-  /*extends: box from "../../shared/styles/layout.css";*/
+  /*composes: box from "../../shared/styles/layout.css";*/
   border-style: dotted;
   border-color: green;
 }
 
 .text {
-  /*extends: heading from "../../shared/styles/typography.css";*/
+  /*composes: heading from "../../shared/styles/typography.css";*/
   font-weight: 200;
   color: green;
 }
diff --git a/src/components/5-ScopedAnimations/ScopedAnimations.css b/src/components/5-ScopedAnimations/ScopedAnimations.css
@@ -3,7 +3,7 @@
 }
 
 .ball {
-  /*extends: bounce from "../../shared/styles/animations.css";*/
+  /*composes: bounce from "../../shared/styles/animations.css";*/
   width: 40px;
   height: 40px;
   border-radius: 20px;

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,9 @@`
`1`	`1`	`.root {`
`2`		`- /extends: box from "../../../shared/styles/layout.css";/`
	`2`	`+ /composes: box from "../../../shared/styles/layout.css";/`
`3`	`3`	`border-color: red;`
`4`	`4`	`}`
`5`	`5`
`6`	`6`	`.text {`
`7`		`- /extends: heading from "../../../shared/styles/typography.css";/`
	`7`	`+ /composes: heading from "../../../shared/styles/typography.css";/`
`8`	`8`	`color: red;`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,11 @@`
`1`	`1`	`.root {`
`2`		`- /extends: box from "../../shared/styles/layout.css";/`
	`2`	`+ /composes: box from "../../shared/styles/layout.css";/`
`3`	`3`	`border-style: dotted;`
`4`	`4`	`border-color: green;`
`5`	`5`	`}`
`6`	`6`
`7`	`7`	`.text {`
`8`		`- /extends: heading from "../../shared/styles/typography.css";/`
	`8`	`+ /composes: heading from "../../shared/styles/typography.css";/`
`9`	`9`	`font-weight: 200;`
`10`	`10`	`color: green;`
`11`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`}`
`4`	`4`
`5`	`5`	`.ball {`
`6`		`- /extends: bounce from "../../shared/styles/animations.css";/`
	`6`	`+ /composes: bounce from "../../shared/styles/animations.css";/`
`7`	`7`	`width: 40px;`
`8`	`8`	`height: 40px;`
`9`	`9`	`border-radius: 20px;`