fix(demo-env): cleaned up and added back demo.js script (#174)

* fix(demo-env): fixed demo environment * fix(demo-env): added back carbon components comments
carbon-design-system · Jun 13, 2017 · 1c1aeab · 1c1aeab
1 parent 1244639
commit 1c1aeab
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 374 deletions.
diff --git a/demo/README.md b/demo/README.md
@@ -6,22 +6,12 @@ Contributors and users can ignore this folder -- this is only for project mainta
 ```
 demo
 ├── README.md
-├── carbon-components.js
-├── carbon-components.js.map
-├── carbon-components.min.js
-├── carbon-components.min.js.map
+├── index.js
 ├── demo.css
 ├── scss
-│   ├── _demo-colors.scss
-│   ├── _demo-major-second.scss
-│   ├── _demo-typography.scss
 │   └── demo.scss
 └── views
-    ├── colors.html
     ├── demo-all.dust
-    ├── demo-es5.html
-    ├── typography-major-second.html
-    └── typography.html
 ```
 
 `views`: HTML files that are rendered when running `npm run dev` or `npm run serve`

diff --git a/demo/index.js b/demo/index.js
@@ -1,12 +1,10 @@
 import './polyfills/index';
 
-import ThemeSwitcher from './js/theme-switcher';
 import DemoSwitcher from './js/demo-switcher';
 
 export * from '../src/index';
 
 const init = () => {
-  ThemeSwitcher.init();
   DemoSwitcher.init();
 };
 

diff --git a/demo/js/theme-switcher.js b/demo/js/theme-switcher.js
diff --git a/demo/scss/demo.scss b/demo/scss/demo.scss
@@ -9,7 +9,6 @@
   padding: 1rem;
   margin-top: 5rem;
   transition: .2s;
-  // min-height: 2000px;
   background-color: $ui-02;
 
   &.flex-col {
@@ -48,13 +47,6 @@
   padding: 3em 1em 1em;
 }
 
-.theme-switcher {
-  margin: 1rem 0;
-  position: fixed;
-  top: 0;
-  right: 1rem;
-}
-
 .demo-switcher {
   &__container {
     display: flex;

diff --git a/demo/views/colors.html b/demo/views/colors.html
diff --git a/demo/views/demo-all.dust b/demo/views/demo-all.dust
@@ -23,7 +23,6 @@
 </head>
 
 <body class="bx--body">
-  <button class="bx--btn theme-switcher" data-theme-switcher>Theme Switcher</button>
   <div data-demo-switcher class="demo-switcher__container">
     <input id="flex-col" data-demo-col class="bx--radio" type="radio" value="col" name="radio">
     <label for="flex-col" data-demo-col class="bx--radio__label">
@@ -46,8 +45,14 @@
   <input type="text" class="offleft">
 
   <!-- Scripts -->
-  <script src="/carbon-components.min.js"></script>
-  <!-- <script src="/demo.js"></script> -->
+  <!-- <script src="/carbon-components.min.js"></script> -->
+  <script src="/demo.js"></script>
+  <!-- Disable Auto Init with this flag -->
+  <!-- true = JavaScript will not initialize automatically -->
+  <!-- false = JavaScript will initialize automatically -->
+  <script>
+    CarbonComponents.settings.disableAutoInit = false;
+  </script>
 </body>
 
 </html>
diff --git a/demo/views/demo-es5.html b/demo/views/demo-es5.html
diff --git a/demo/views/typography-major-second.html b/demo/views/typography-major-second.html