Merge pull request #14 from nhaagen/UI_PageLayout2018

some slate-styles
catkrahl · Dec 17, 2018 · 4b2972e · 4b2972e
2 parents ec93b64 + 776f0fa
commit 4b2972e
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 1 deletion.
diff --git a/src/UI/examples/MainControls/Mainbar/mainbar.php b/src/UI/examples/MainControls/Mainbar/mainbar.php
@@ -61,7 +61,7 @@ function getSomeEntries($f)
 	$slate = $f->maincontrols()->slate()->legacy('Tool 2', $symbol, 'tool 2');
 	$tools['tool2'] = $slate;
 	$symbol = $f->icon()->custom('./src/UI/examples/Layout/Page/Standard/icon-sb-navigation.svg', '')->withSize('medium');
-	$slate = $f->maincontrols()->slate()->legacy('Tool 3', $symbol, 'tool 3');
+	$slate = $f->maincontrols()->slate()->legacy('Tool 3', $symbol, loremIpsum());
 	$tools['tool3'] = $slate;
 	return [$entries, $tools];
 }

diff --git a/src/UI/templates/default/MainControls/Slate/slate.less b/src/UI/templates/default/MainControls/Slate/slate.less
@@ -4,11 +4,13 @@
 
 .il-maincontrols-slate {
 	&.engaged {
+		/*
 		// quick solution, better use flex or grid
 		display: flex;
 		flex-direction: column;
 		height: 100%;
 		position: relative;
+		*/
 	}
 	&.disengaged {
 		display:none;

diff --git a/src/UI/templates/default/MainControls/mainbar.less b/src/UI/templates/default/MainControls/mainbar.less
@@ -119,3 +119,26 @@
 		width: auto;
 	}
 }
+
+/*
+.il-maincontrols-slate-content {
+	height: 0px;
+
+	.il-maincontrols-slate-content {
+		height: 200px !important;
+
+	}
+}
+*/
+
+.il-mainbar-slates > .il-maincontrols-slate.engaged {
+		display: flex;
+		flex-direction: column;
+		height: 100%;
+		position: relative;
+
+}
+
+.il-mainbar-slates > .il-maincontrols-slate.engaged > .il-maincontrols-slate-content {
+	height: 0px;
+}