Merge branch 'master' into uikit-3

# Conflicts: # package.json # yarn.lock
stipsan · Mar 15, 2017 · c6af910 · c6af910
2 parents d66ccb8 + b8a0a1a
commit c6af910
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/.storybook/config.js b/.storybook/config.js
@@ -42,6 +42,12 @@ addDecorator((fn, { kind, story }) => <div>
     </div>
   </nav>
   <div className="uk-margin-top uk-margin-left uk-margin-right uk-margin-bottom">
+    <a
+      href={`javascript:
+    var script = document.createElement('script');
+    script.setAttribute('src', 'https://getuikit.com/migrate.min.js');
+    document.body.appendChild(script);
+  `}>test</a>
     {fn()}
   </div>
 </div>)

diff --git a/.storybook/uikit.less b/.storybook/uikit.less
@@ -3,12 +3,12 @@
 //@import "~uikit/themes/@{theme}/uikit";
 
 //@import "~uikit/src/less/components/autocomplete";
-@import "~uikit/src/less/uikit";
-@import "~uikit/src/less/components/form";
-@import "~uikit/src/less/components/button";
-@import "~uikit/src/less/components/dropdown";
-@import "~uikit/src/less/components/drop";
-@import "~uikit/src/less/components/notification";
+@import "~uikit/src/less/uikit.theme.less";
+// @import "~uikit/src/less/components/form";
+// @import "~uikit/src/less/components/button";
+// @import "~uikit/src/less/components/dropdown";
+// @import "~uikit/src/less/components/drop";
+// @import "~uikit/src/less/components/notification";
 //@import "~uikit/dist/less/components/notify";
 
 //@import "~uikit/themes/@{theme}/autocomplete";

diff --git a/src/Dropdown.js b/src/Dropdown.js
@@ -47,7 +47,7 @@ export default class Dropdown extends Component {
     remainTime: 800,
     delay: 0,
     component: 'div',
-    className: 'uk-button-dropdown',
+    className: 'uk-inline',
     link: '',
   }