Merge pull request #321 from webpack/develop

Deploy

Author: SpaceK33z

antwar.config.js

@@ -37,6 +37,16 @@ module.exports = {
         );
       }
     ),
+    'get-started': section(
+      'Get-Started',
+      function() {
+        return require.context(
+          'json-loader!yaml-frontmatter-loader!./content/get-started',
+          false,
+          /^\.\/.*\.md$/
+        )
+      }
+    ),
     concepts: section(
       'Concepts',
       function() {

assets/cube.png

@@ -8,6 +8,7 @@ export default ({contributors}) => {
 
   return (
     <div className="contributors">
+      <hr />
       <h3>Contributors:</h3>
       <div className="contributors__list">
         {

assets/icon-square-big.svg

@@ -59,7 +59,10 @@
   display:block;
   height:35px;
 
-  img { height:100%; width:auto; }
+  img { 
+    width:auto;
+    height:100%; 
+  }
 }
 
 .footer__link {

assets/icon-square-small.svg

@@ -1,7 +1,7 @@
 import React from 'react';
 import Link from '../link/link';
 import Container from '../container/container';
-import CubeImg from '../../assets/cube.png';
+import Icon from '../../assets/icon-square-small.svg';
 import './footer-style';
 
 export default (props) => {
@@ -12,16 +12,17 @@ export default (props) => {
           <Link className="footer__link" to="/get-started">Get Started</Link>
           <Link className="footer__link" to="/analyze">Analyze</Link>
           <Link className="footer__link" to="/contribute">Contribute</Link>
-          <Link className="footer__link" to="/comparison">Comparison</Link>
+          <Link className="footer__link" to="/get-started/why-webpack#comparison">Comparison</Link>
         </section>
 
         <section className="footer__middle">
           <Link to="/" className="footer__icon">
-            <img src={ CubeImg } />
+            <img src={ Icon } />
           </Link>
         </section>
 
         <section className="footer__right">
+          <Link className="footer__link" to="/branding">Branding</Link>
           <Link className="footer__link" to="//gitter.im/webpack/webpack">Support</Link>
           <Link className="footer__link" to="https://github.com/webpack/webpack/releases">Changelog</Link>
           <Link className="footer__link" to="/license">License</Link>

assets/logo-on-dark-bg.svg

@@ -1,13 +1,13 @@
 import React from 'react';
-import CubeImg from '../../assets/cube.png';
+import Icon from '../../assets/icon-square-small.svg';
 import './logo-style';
 
 export default props => {
   let { light } = props;
 
   return (
-    <span className={ `logo${light ? ' logo--light' : ''}` }>
-      <img className="logo__icon" src={ CubeImg } />
+    <span className={ `logo ${light ? 'logo--light' : ''}` }>
+      <img className="logo__icon" src={ Icon } />
       <span className="logo__text">webpack</span>
     </span>
   );