Update: (Fixes #512) navbar-size mixin should set height on `.navba…

…r-form` so a navbar variant with only form will be the correct height Update: Navbar added `.navbar-nav-last` for aligning single `.navbar-nav` on the right side
liferay · Feb 8, 2018 · 4c83874 · 4c83874
1 parent bcfe6b2
commit 4c83874
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/packages/clay/src/scss/components/_navbar.scss b/packages/clay/src/scss/components/_navbar.scss
@@ -43,6 +43,10 @@
 	}
 }
 
+.navbar-nav-last {
+	margin-left: auto;
+}
+
 .navbar-title {
 	font-size: $navbar-title-font-size;
 	font-weight: $navbar-title-font-weight;

diff --git a/packages/clay/src/scss/mixins/_navbar.scss b/packages/clay/src/scss/mixins/_navbar.scss
@@ -226,6 +226,7 @@
 							}
 
 							.navbar-form {
+								height: $height-mobile - $border-bottom-width - $border-top-width;
 								padding-bottom: $link-padding-y-mobile;
 								padding-left: $link-padding-x-mobile;
 								padding-right: $link-padding-x-mobile;
@@ -262,9 +263,16 @@
 
 						.navbar-form {
 							@if ($scaling-navbar) {
+								height: $height - $border-bottom-width - $border-top-width;
 								padding-left: $link-padding-x;
 								padding-right: $link-padding-x;
 
+								> .container,
+								> .container-fluid {
+									padding-left: 0;
+									padding-right: 0;
+								}
+
 								.form-control {
 									height: $form-control-height;
 								}