Merge pull request igorprado#26 from igorprado/develop

Develop
riccio82 · Oct 15, 2015 · bebe3c4 · bebe3c4
2 parents 03eeafe + d0c3675
commit bebe3c4
Show file tree

Hide file tree

Showing 9 changed files with 35 additions and 21 deletions.
diff --git a/devServer.js b/devServer.js
@@ -8,7 +8,7 @@ var compiler = webpack(config);
 
 app.use(require('webpack-dev-middleware')(compiler, {
   noInfo: true,
-  publicPath: config.output.publicPath
+  publicPath: '/' + config.output.publicPath
 }));
 
 app.use(require('webpack-hot-middleware')(compiler));

diff --git a/example/build/app.css b/example/build/app.css
diff --git a/example/build/app.js b/example/build/app.js
diff --git a/example/build/c0864a9fc47915c685e86df172c37b55.png b/example/build/c0864a9fc47915c685e86df172c37b55.png
diff --git a/example/src/images/congruent_pentagon.png b/example/src/images/congruent_pentagon.png
diff --git a/example/src/scripts/App.jsx b/example/src/scripts/App.jsx
@@ -5,7 +5,7 @@ var NotificationGenerator = require('./NotificationGenerator');
 var NotificationSystemExample;
 
 // Styles
-console.log(require('styles/base'));
+require('styles/base');
 
 NotificationSystemExample = React.createClass({
 
@@ -76,7 +76,6 @@ NotificationSystemExample = React.createClass({
 
   _allowHTML: function(allow) {
     this.setState({ allowHTML: allow });
-    console.log(this.state);
   },
 
   _showTheMagic: function() {
@@ -105,17 +104,20 @@ NotificationSystemExample = React.createClass({
     return (
       <div className="app-container">
         <header style={ { minHeight: this.state.viewHeight } } className="header gradient">
-          <h1 className="title">React Notification System</h1>
-          <h2 className="subtitle">A complete and totally customizable notifications component for React</h2>
-          <h3 className="versions">(For React 0.14x and 0.13.x)</h3>
+          <div className="overlay"></div>
+          <div className="content">
+            <h1 className="title">React Notification System</h1>
+            <h2 className="subtitle">A complete and totally customizable notifications component for React</h2>
+            <h3 className="versions">(For React 0.14x and 0.13.x)</h3>
 
-          <div className="btn-show-magic-holder">
-            <button className="btn btn-outline btn-show-magic" onClick={ this._showTheMagic }>Show me what it can do!</button>
-            <small className="more-magic">Click twice for more awesomeness!</small>
-          </div>
-          <div className="github-buttons">
-            <a className="github-button" href="https://github.com/igorprado/react-notification-system" data-style="mega" data-icon="octicon-star" data-count-href="/igorprado/react-notification-system/stargazers" data-count-api="/repos/igorprado/react-notification-system#stargazers_count" data-count-aria-label="# stargazers on GitHub" aria-label="Star igorprado/react-notification-system on GitHub">Star</a>
-            <a className="github-button" href="https://github.com/igorprado/react-notification-system/fork" data-style="mega" data-icon="octicon-repo-forked" data-count-href="/igorprado/react-notification-system/network" data-count-api="/repos/igorprado/react-notification-system#forks_count" data-count-aria-label="# forks on GitHub" aria-label="Fork igorprado/react-notification-system on GitHub">Fork</a>
+            <div className="btn-show-magic-holder">
+              <button className="btn btn-outline btn-show-magic" onClick={ this._showTheMagic }>Show me what it can do!</button>
+              <small className="more-magic">Click twice for more awesomeness!</small>
+            </div>
+            <div className="github-buttons">
+              <a className="github-button" href="https://github.com/igorprado/react-notification-system" data-style="mega" data-icon="octicon-star" data-count-href="/igorprado/react-notification-system/stargazers" data-count-api="/repos/igorprado/react-notification-system#stargazers_count" data-count-aria-label="# stargazers on GitHub" aria-label="Star igorprado/react-notification-system on GitHub">Star</a>
+              <a className="github-button" href="https://github.com/igorprado/react-notification-system/fork" data-style="mega" data-icon="octicon-repo-forked" data-count-href="/igorprado/react-notification-system/network" data-count-api="/repos/igorprado/react-notification-system#forks_count" data-count-aria-label="# forks on GitHub" aria-label="Fork igorprado/react-notification-system on GitHub">Fork</a>
+            </div>
           </div>
         </header>
         <div className="wrapper">

diff --git a/example/src/styles/base.sass b/example/src/styles/base.sass
@@ -22,6 +22,18 @@ html, body
   text-align: center
   border-bottom: 6px solid $blue-green
 
+.overlay
+  background: url(../images/congruent_pentagon.png) top left repeat
+  position: absolute
+  top: 0
+  left: 0
+  width: 100%
+  height: 100%
+  opacity: 0.3
+
+.content
+  position: relative
+
 .fractal
   background: url(../images/footer_lodyas.png) top left repeat;
 

diff --git a/webpack.config.dev.js b/webpack.config.dev.js
@@ -12,7 +12,7 @@ module.exports = {
   output: {
     path: path.join(__dirname, 'example/build'),
     filename: 'app.js',
-    publicPath: '/build/'
+    publicPath: 'build/'
   },
   plugins: [
     new webpack.HotModuleReplacementPlugin(),

diff --git a/webpack.config.prod.js b/webpack.config.prod.js
@@ -17,7 +17,7 @@ module.exports = {
   output: {
     path: path.join(__dirname, 'example/build'),
     filename: 'app.js',
-    publicPath: '/build/'
+    publicPath: '../build/'
   },
   plugins: [
     new ExtractTextPlugin('app.css', { allChunks: true }),
@@ -49,7 +49,7 @@ module.exports = {
         if_return: true,
         join_vars: true,
         cascade: true,
-        drop_console: true
+        drop_console: false
       },
       output: {
         comments: false