Permalink
Browse files

fix(slider): updated main.js and main.scss to fix conflicts with mast…

…er branch
  • Loading branch information...
Freihofner, Katrin Freihofner, Katrin
Freihofner, Katrin authored and Freihofner, Katrin committed Sep 28, 2016
1 parent d488574 commit 4dc7263215a3b5b96bb4d41be441edd38895bc02
Showing with 17 additions and 11 deletions.
  1. +3 −0 src/main.js
  2. +14 −11 src/main.scss
View
@@ -1,4 +1,7 @@
require('./js-common-components/toggler');
require('./js-common-components/closest');
require('./expandable/expandable');
require('./inputfield/inputfield');
require('./tabs/tabs');
require('./slider/slider');
View
@@ -1,31 +1,34 @@
@import "base/base";
@import "base/typography";
@import "base/inputs"; // TODO: only include with inputfields@custombild
/** Structural -- Layouts **/
@import "layout/layout";
@import "layout/islands";
/** Components **/
@import "icons/icons";
@import "pagination/pagination";
@import "unordered-list/unordered-list";
@import "navbar/navbar";
@import "header/header";
@import "footer/footer";
@import "media/media";
@import "inputfield/inputfield";
@import "textarea/textarea";
@import "expandable/expandable";
@import "sidebar/sidebar";
@import "breadcrumbs/breadcrumbs";
@import "tile/tile";
@import "button/button";
@import "pagination/pagination";
@import "icons/icons";
@import "footer/footer";
@import "switch/switch";
@import "checkbox/checkbox";
@import "table/table";
@import "tabs/tabs";
@import "tile/tile";
@import "table-expandable/table-expandable";
@import "tag/tag";
@import "checkbox/checkbox";
@import "radiobutton/radiobutton";
@import "inputfield/inputfield";
@import "textarea/textarea";
@import "slider/slider";
@import "switch/switch";
@import "tabs/tabs";
@import "slider/slider"
/** Trumps **/
@import "trumps/hide-mq";

0 comments on commit 4dc7263

Please sign in to comment.