Merge branch 'v3' into greenkeeper/uikit-3.0.0-beta.21

.babelrc

@@ -1,3 +1,8 @@
 {
-  "presets" : ["react", "es2015", "stage-0"]
+  "presets" : ["react", "es2015", "stage-0"],
+  "plugins": [
+    ["babel-plugin-inline-import", {
+      "extensions": [".svg"]
+    }]
+  ]
 }

.npmignore

@@ -1 +1,7 @@
+.coverage
+.out
+.storybook
+src
 test
+assets.json
+guard.js

.storybook/Logo.js

@@ -1,22 +1,11 @@
-import src from './static/logo.svg'
-
-const linkStyle = Object.freeze({
-  height: '40px',
-  overflow: 'hidden',
-  paddingRight: 0,
-  paddingLeft: 0,
-  marginLeft: '-15px',
-})
+const src = require('./static/logo.svg')
 
 const logoStyle = Object.freeze({
-  height: '70px',
-  marginTop: '-15px',
-  opacity: 0.9,
-  width: '82px',
+  height: '64px',
 })
 
-const Logo = () => <a className="uk-navbar-brand" style={linkStyle}>
-  <img role="presentation" src={src} style={logoStyle} title="UIkit React Logo" />
+const Logo = () => <a className="uk-navbar-item uk-logo">
+  <img alt="UIkit React Logo" src={src} style={logoStyle} />
 </a>
 
 export default Logo

.storybook/config.js

@@ -1,4 +1,4 @@
-import './uikit.less'
+import 'uikit/src/less/uikit.theme.less'
 
 import infoAddon from '@kadira/react-storybook-addon-info'
 import { configure, setAddon, addDecorator } from '@kadira/storybook'
@@ -8,26 +8,36 @@ import Logo from './Logo'
 setAddon(infoAddon)
 
 addDecorator((fn, { kind, story }) => <div>
-  <nav className="tm-navbar uk-navbar uk-navbar-attached">
-    <Logo />
-    <ul className="uk-navbar-nav">
-      <li className="uk-active">
-        <a className="uk-navbar-nav-subtitle">
-          {kind}
-          <div>{story}</div>
-        </a>
-      </li>
-    </ul>
-    <div className="uk-navbar-content">
-      <iframe
-        frameBorder="0"
-        height="20px"
-        scrolling="0"
-        src="https://ghbtns.com/github-btn.html?user=stipsan&repo=uikit-react&type=star&count=true"
-        width="170px"
-      />
+  <nav className="uk-navbar-container uk-navbar">
+    <div className="uk-navbar-left">
+      <ul className="uk-navbar-nav">
+        <li className="uk-active">
+          <a>
+            <div>
+              {kind}
+              <div className="uk-navbar-subtitle">{story}</div>
+            </div>
+          </a>
+        </li>
+      </ul>
+    </div>
+    <div className="uk-navbar-center">
+      <Logo />
+      <div className="uk-navbar-center-right">
+        <div>
+          <div className="uk-flex uk-flex-middle" style={{ height: '80px' }}>
+            <iframe
+              frameBorder="0"
+              height="20px"
+              scrolling="0"
+              src="https://ghbtns.com/github-btn.html?user=stipsan&repo=uikit-react&type=star&count=true"
+              width="170px"
+            />
+          </div>
+        </div>
+      </div>
     </div>
-    <div className="uk-navbar-flip">
+    <div className="uk-navbar-right">
       <ul className="uk-navbar-nav">
         <li>
           <a
@@ -50,8 +60,9 @@ function loadStories() {
   require('../src/stories/Button')
   require('../src/stories/Dropdown')
   require('../src/stories/Modal')
-  require('../src/stories/Notify')
+  require('../src/stories/Notification')
   require('../src/stories/Input')
+  require('../src/stories/Icon')
 }
 
 configure(loadStories, module)