more cleanup

ivansfdc · ivansfdc · commit 4b71fa19e0e8 · 2015-09-24T19:04:41.000-07:00
diff --git a/demo/App.js b/demo/App.js
@@ -5,14 +5,12 @@ import Router from 'react-router';
 const { Route, DefaultRoute, RouteHandler, Link } = Router;
 
 
-require('./index.scss')
+require('./index.css')
 
 export default class App extends Component {
   render() {
     return (
-    <BaseLayout>
         <RouteHandler/>
-    </BaseLayout>
     );
   }
 }
diff --git a/demo/index.css b/demo/index.css
@@ -1,13 +1,9 @@
-@import "./prism.scss";
+@import "./prism.css";
 /*
 @import "./../salesforce-lightning-design-system-v0.8.0/scss/index.scss";
 */
 
 
-html,body {
-  height: inherit;
-}
-
 /*
 .header {
   box-shadow: $shadow-header;
diff --git a/demo/layout/base.jsx b/demo/layout/base.jsx
@@ -26,7 +26,7 @@ module.exports = React.createClass( {
 
   render () {
     return (
-      <div >
+      <div>
 
 
 
diff --git a/demo/pages/HomePage.jsx b/demo/pages/HomePage.jsx
@@ -57,7 +57,7 @@ export default class HomePage extends Component {
             </SLDSGrid>
           </div>
         </div>
-        <main className="stage-main slds-grid slds-wrap slds-grow slds-scrollable--y" role="main">
+        <main className="stage-main slds-grid slds-wrap slds-grow" role="main">
           <div className="region region--main slds-grow slds-size--1-of-1 slds-medium-size--1-of-2 slds-large-size--8-of-12 slds-col-rule--right slds-p-around--large">
 
 
diff --git a/demo/prism.css b/demo/prism.css
diff --git a/index.html b/index.html
@@ -9,13 +9,13 @@
 
     <link rel="stylesheet" type="text/css" href="demo/static/bundle.css">
 
-    <link rel="stylesheet" type="text/css" href="demo/assets/styles/salesforce-lightning-design-system.css">
+    <link rel="stylesheet" type="text/css" href="demo/assets/styles/salesforce-lightning-design-system-vf.css">
 
   </head>
 
 
 
-  <body>
+  <body class='slds'>
     <div id='root'>
     </div>
     <script src="demo/demo_assets/prism.js"></script>
diff --git a/package.json b/package.json
@@ -42,7 +42,6 @@
     "file-loader": "^0.8.4",
     "raw-loader": "^0.5.1",
     "react-hot-loader": "^1.2.7",
-    "sass-loader": "^1.0.0",
     "style-loader": "^0.9.0",
     "url-loader": "^0.5.6",
     "webpack": "^1.9.6",
@@ -54,6 +53,7 @@
     "classnames": "^2.1.3",
     "lodash": "^3.10.0",
     "react-dom": "^0.14.0-beta3",
+    "react-modal": "^0.5.0",
     "react-onclickoutside": "^0.3.0",
     "tether": "^1.1.0",
     "tether-drop": "^1.2.2"
diff --git a/webpack.config.js b/webpack.config.js
@@ -35,10 +35,12 @@ module.exports = {
         test: /\.css$/,
         loader: ExtractTextPlugin.extract("style-loader", "css-loader")
       },
+/*
       {
         test: /\.scss$/,
           loader: ExtractTextPlugin.extract('style-loader', 'css!sass')
       },
+*/
       {
         test: /\.(woff|woff2|svg)$/,
         loader: 'url-loader?limit=100000'
diff --git a/webpack.dev.config.js b/webpack.dev.config.js
@@ -37,10 +37,12 @@ module.exports = {
         test: /\.css$/,
         loader: ExtractTextPlugin.extract("style-loader", "css-loader")
       },
+/*
       {
         test: /\.scss$/,
           loader: ExtractTextPlugin.extract('style-loader', 'css!sass')
       },
+*/
       {
         test: /\.(woff|woff2|svg)$/,
         loader: 'url-loader?limit=100000'

Original file line number	Diff line number	Diff line change
`@@ -5,14 +5,12 @@ import Router from 'react-router';`
`5`	`5`	`const { Route, DefaultRoute, RouteHandler, Link } = Router;`
`6`	`6`
`7`	`7`
`8`		`-require('./index.scss')`
	`8`	`+require('./index.css')`
`9`	`9`
`10`	`10`	`export default class App extends Component {`
`11`	`11`	`render() {`
`12`	`12`	`return (`
`13`		`- <BaseLayout>`
`14`	`13`	`<RouteHandler/>`
`15`		`- </BaseLayout>`
`16`	`14`	`);`
`17`	`15`	`}`
`18`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,10 +35,12 @@ module.exports = {`
`35`	`35`	`test: /\.css$/,`
`36`	`36`	`loader: ExtractTextPlugin.extract("style-loader", "css-loader")`
`37`	`37`	`},`
	`38`	`+/*`
`38`	`39`	`{`
`39`	`40`	`test: /\.scss$/,`
`40`	`41`	`loader: ExtractTextPlugin.extract('style-loader', 'css!sass')`
`41`	`42`	`},`
	`43`	`+*/`
`42`	`44`	`{`
`43`	`45`	`test: /\.(woff\|woff2\|svg)$/,`
`44`	`46`	`loader: 'url-loader?limit=100000'`
Original file line number	Diff line number	Diff line change
`@@ -37,10 +37,12 @@ module.exports = {`
`37`	`37`	`test: /\.css$/,`
`38`	`38`	`loader: ExtractTextPlugin.extract("style-loader", "css-loader")`
`39`	`39`	`},`
	`40`	`+/*`
`40`	`41`	`{`
`41`	`42`	`test: /\.scss$/,`
`42`	`43`	`loader: ExtractTextPlugin.extract('style-loader', 'css!sass')`
`43`	`44`	`},`
	`45`	`+*/`
`44`	`46`	`{`
`45`	`47`	`test: /\.(woff\|woff2\|svg)$/,`
`46`	`48`	`loader: 'url-loader?limit=100000'`