Merge branch 'UI_PageLayout' into UI_PageLayout

catkrahl · May 17, 2019 · cc8d2fa · cc8d2fa
2 parents 2207a5a + d80f733
commit cc8d2fa
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 17,872 deletions.
diff --git a/src/UI/templates/default/Layout/standardpage.less b/src/UI/templates/default/Layout/standardpage.less
@@ -362,19 +362,22 @@ footer {
 	}
 
 	.il-header-locator {
-		.open>.dropdown-toogle.btn-default:hover,
-		button.dropdown-toggle {
+		.dropdown-toggle {
 			background-color: transparent;
 			border: none;
 			color: @gray;
 			font-size: 1.5rem;
 			&:before {
-			    content: " \e604";
+			    content: " \e606";
 			    font-family: "il-icons";
 			    font-size: 1.8rem;
 			    margin-right: 10px;
 			}
 		}
+		.open .dropdown-toggle:before {
+			content: " \e604";
+		}
+
 		span.caret {
 			display: none;
 		}

diff --git a/src/UI/templates/default/MainControls/mainbar.less b/src/UI/templates/default/MainControls/mainbar.less
@@ -2,6 +2,7 @@
 .il-maincontrols-mainbar {
 	.btn-bulky {
 		font-size: @il-mainbar-btn-label-size;
+		line-height: @il-mainbar-btn-label-size * 1.11111111;
 	}
 	.bulky-label {
 		white-space: normal;
@@ -59,9 +60,14 @@
 			outline: none;
 		}
 		.bulky-label {
-			white-space: normal;
+			display: -webkit-box;
 			margin-top: @il-mainbar-bulky-label-margin-top;
-    		display: block;
+			white-space: normal;
+			word-break: break-word;
+    		padding: 0 2px;
+			overflow: hidden;
+			-webkit-line-clamp: 2;
+		    -webkit-box-orient: vertical;
 		}
 	}
 	&.engaged {
@@ -88,6 +94,13 @@
 			filter: invert(35%);
 		}
 	}
+	.btn-bulky.engaged {
+		background-color: lighten(@brand-primary, 10%);
+		color: @il-mainbar-btn-color;
+		img {
+			filter: invert(100%);
+		}
+	}
 }
 
 .il-mainbar-tools-entries {
@@ -140,6 +153,9 @@
 		height: auto;
 		padding: 0 20px;
 		width: auto;
+		&:focus {
+			outline: none;
+		}
 	}
 }
 
@@ -201,10 +217,16 @@
 		   border: 0;
 		   height: @il-mainbar-small-btn-height;
 		   width: @il-mainbar-small-btn-width;
+		   .icon.small {
+			   height: @icon-size-xsmall;
+			   width: @icon-size-xsmall;
+		   }
 	   }
 	}
 	.il-mainbar-tools-entries {
 		&.engaged {
+			background: -webkit-linear-gradient(top, #f2f2f2 0%,#f2f2f2 @il-mainbar-small-btn-height,#CCCCCC (@il-mainbar-small-btn-height + 1),#ffffff (@il-mainbar-small-btn-height + 1));
+			background: linear-gradient(to bottom, #f2f2f2 0%,#f2f2f2 @il-mainbar-small-btn-height,#CCCCCC (@il-mainbar-small-btn-height + 1),#ffffff (@il-mainbar-small-btn-height + 1));
 			height: @il-mainbar-small-btn-height + @il-mainbar-remove-tools-btn-height;
 			.il-mainbar-remove-tool {
 				top: @il-mainbar-small-btn-height;

diff --git a/src/UI/templates/default/MainControls/metabar.less b/src/UI/templates/default/MainControls/metabar.less
@@ -104,7 +104,7 @@
 	right: 20px;
 	top: @il-metabar-entry-height;
 	@media only screen and (max-width: @grid-float-breakpoint-max) {
-		min-width: 260px;
+		width: 100%;
 		top: @il-metabar-small-entry-height;
 		right: 0;
 	}

diff --git a/src/UI/templates/default/MainControls/tpl.mainbar.html b/src/UI/templates/default/MainControls/tpl.mainbar.html
@@ -22,7 +22,6 @@
 				{BUTTON}
 				<!-- END tool_trigger_item -->
 			</div>
-
 			<!-- BEGIN tool_removal -->
 			<div class="il-mainbar-remove-tool">
 				{REMOVE_TOOL}