Skip to content

Commit 4542bbf

Browse files
committed
Update loader-core, uncomment composition
1 parent e58aae7 commit 4542bbf

File tree

6 files changed

+10
-10
lines changed

6 files changed

+10
-10
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"homepage": "https://github.com/css-modules/browserify-demo",
2525
"devDependencies": {
2626
"browserify": "^10.2.3",
27-
"css-modulesify": "git://github.com/css-modules/css-modulesify#c0bfe993de60ba63cd7215956d67104ada74ec27",
27+
"css-modulesify": "git://github.com/css-modules/css-modulesify#c440bbb203b1966c8c764546f8ed292bb19e0322",
2828
"gh-pages": "git://github.com/markdalgleish/gh-pages#cli-message",
2929
"http-server": "^0.8.0",
3030
"hyperscript": "^1.4.6",
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
.root {
2-
/*composes: box from "../../../shared/styles/layout.css";*/
2+
composes: box from "../../../shared/styles/layout.css";
33
border-color: red;
44
}
55

66
.text {
7-
/*composes: heading from "../../../shared/styles/typography.css";*/
7+
composes: heading from "../../../shared/styles/typography.css";
88
color: red;
99
}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
.root {
2-
/*composes: box from "../../../shared/styles/layout.css";*/
2+
composes: box from "../../../shared/styles/layout.css";
33
border-color: blue;
44
}
55

66
.text {
7-
/*composes: heading from "../../../shared/styles/typography.css";*/
7+
composes: heading from "../../../shared/styles/typography.css";
88
color: blue;
99
}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
.root {
2-
/*composes: box from "../../shared/styles/layout.css";*/
2+
composes: box from "../../shared/styles/layout.css";
33
border-style: dotted;
44
border-color: green;
55
}
66

77
.text {
8-
/*composes: heading from "../../shared/styles/typography.css";*/
8+
composes: heading from "../../shared/styles/typography.css";
99
font-weight: 200;
1010
color: green;
1111
}

src/components/5-ScopedAnimations/ScopedAnimations.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
}
44

55
.ball {
6-
/*composes: bounce from "../../shared/styles/animations.css";*/
6+
composes: bounce from "../../shared/styles/animations.css";
77
width: 40px;
88
height: 40px;
99
border-radius: 20px;

src/components/App.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ module.exports = h('div', { className: styles.app }, [
4646

4747
h('hr', { className: styles.hr }),
4848

49-
h('h2', { className: styles.incomplete }, 'Class Composition (INCOMPLETE)'),
49+
h('h2', 'Class Composition'),
5050
h('p', [
5151
'Both of the components below have ',
5252
h('strong', 'locally scoped CSS'),
@@ -74,7 +74,7 @@ module.exports = h('div', { className: styles.app }, [
7474

7575
h('hr', { className: styles.hr }),
7676

77-
h('h2', { className: styles.incomplete }, 'Scoped Animations (INCOMPLETE)'),
77+
h('h2', 'Scoped Animations'),
7878
h('p', [
7979
'CSS Modules even provide ',
8080
h('strong', 'locally scoped animations'),

0 commit comments

Comments
 (0)