Merge branch 'master' into toggle-label

Author: youda97

.storybook/addons.js

@@ -19,6 +19,5 @@ import "zone.js/dist/zone";
 import '@storybook/addon-storysource/register';
 import "@storybook/addon-actions/register";
 import "@storybook/addon-links/register";
-import "@storybook/addon-notes/register";
 import "@storybook/addon-knobs/register";
 import '@storybook/addon-options/register';

.storybook/bootstrap.module.ts

@@ -28,7 +28,6 @@ addDecorator(
 
 // load global styles
 require("!style-loader!css-loader!postcss-loader!sass-loader!./preview.scss");
-require("!style-loader!css-loader!postcss-loader!sass-loader!./preview-experimental.scss");
 
 require("../src/index.stories");
 // automatically import all files ending in *.stories.ts

.storybook/config.js

@@ -14,79 +14,3 @@
 <script>
 	document.title = "Carbon Components Angular";
 </script>
-
-<style id="iframestyle">
-.sb-show-main:not(.welcome) {
-	padding: 3em;
-	display: flex;
-	flex-direction: column;
-	align-items: center;
-}
-.experimental .toggle-btn,
-.toggle-btn {
-	padding: 9px;
-	background: white;
-	border: none;
-	border-radius: 5px;
-	color: darkcyan;
-	transition: all 0.2s ease-out;
-	outline: 0;
-	cursor: pointer;
-}
-.experimental .experimental-selected,
-.experimental-selected {
-	background: darkcyan;
-	color: white;
-}
-</style>
-
-<script>
-function setExperimental(event) {
-	var frame = document.querySelector("#storybook-preview-iframe");
-	var classList = frame.contentDocument.body.classList;
-	if(event.target.previousElementSibling) {
-		classList.add("experimental");
-		classList.remove("carbon");
-		event.target.previousElementSibling.classList.remove("experimental-selected");
-	} else {
-		classList.remove("experimental");
-		classList.add("carbon");
-		event.target.nextElementSibling.classList.remove("experimental-selected");
-	}
-	event.target.classList.add("experimental-selected");
-};
-
-var experimentalToggleInterval = setInterval(function() {
-	var frame = document.querySelector("#storybook-preview-iframe");
-	if(!frame ||
-		!frame.contentDocument ||
-		!frame.contentDocument.getElementById("root")) {
-		return;
-	}
-
-	frame.contentDocument.head.appendChild(
-		document.getElementById("iframestyle")
-	);
-
-	clearInterval(experimentalToggleInterval);
-	frame.contentDocument.body.insertAdjacentHTML(
-		"beforeend",
-		`<div style="position: fixed; right: 15px; bottom: 15px">
-			<button
-				class="toggle-btn experimental-selected"
-				onclick="setExperimental(event)">
-				Standard
-			</button>
-			<button
-				class="toggle-btn"
-				onclick="setExperimental(event)">
-				Experimental
-			</button>
-		</div>
-	`);
-	frame.contentWindow.setExperimental = setExperimental;
-
-	var classList = frame.contentDocument.body.classList;
-	classList.add("carbon");
-}, 100);
-</script>

.storybook/experimental.component.ts

@@ -1,37 +1,12 @@
 $feature-flags: (
-	components-x: false,
 	ui-shell: true
 );
 
-$css--body: false; // we're providing our own body styles
-$css--reset: false; // prevent thousands of resets being included...
+@import '~carbon-components/scss/globals/scss/styles';
 
-.carbon {
-	@import '~carbon-components/scss/globals/scss/styles';
-	@import '~carbon-components/scss/globals/scss/css--typography';
-
-	// carbon body reset and styles
-	@include typography;
-	@include font-family;
-	//reset
-	color: $text-01;
-	background-color: $ui-02;
-	box-sizing: border-box;
-	margin: 0;
-	padding: 0;
-	border: 0;
-	font-size: 100%;
-	vertical-align: baseline;
-
-	& > *,
-	& > *:before,
-	& > *:after {
-		box-sizing: inherit;
-	}
-
-	ul {
-		list-style: none;
-		margin: 0;
-		padding: 0;
-	}
+.sb-show-main:not(.welcome) {
+	padding: 3em;
+	display: flex;
+	flex-direction: column;
+	align-items: center;
 }

.storybook/manager-head.html

@@ -0,0 +1,20 @@
+module.exports = {
+	"rules": {
+		"subject-max-length": [1, "always", 100],
+		"type-enum": [
+			1,
+			"always",
+			[
+				"feat",
+				"fix",
+				"docs",
+				"style",
+				"refactor",
+				"perf",
+				"test",
+				"chore",
+				"revert"
+			]
+		]
+	}
+};