Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#512 management bar does not look correctly when contains only a search #535

Merged
merged 2 commits into from
Feb 9, 2018
Merged

#512 management bar does not look correctly when contains only a search #535

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4c83874
Update: (Fixes #512) `navbar-size` mixin should set height on `.navba…
pat270 Feb 8, 2018
5bf5c8e
Site: (#512) Management Bar added examples of Management Bars with on…
pat270 Feb 8, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
156 changes: 125 additions & 31 deletions packages/clay/src/content/management-bar.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,16 +59,16 @@ <h3>Navbar Management Bar</h3>
<div class="input-group-item">
<input class="form-control input-group-inset input-group-inset-after" placeholder="Search for..." type="text">
<span class="input-group-inset-item input-group-inset-item-after">
<button class="btn btn-unstyled navbar-breakpoint-d-none" type="button">
<svg aria-hidden="true" class="lexicon-icon lexicon-icon-times">
<use xlink:href="{{rootPath}}/images/icons/icons.svg#times" />
</svg>
</button>
<button class="btn btn-unstyled navbar-breakpoint-d-block" type="button">
<button class="btn btn-unstyled" type="submit">
<svg aria-hidden="true" class="lexicon-icon lexicon-icon-search">
<use xlink:href="{{rootPath}}/images/icons/icons.svg#search" />
</svg>
</button>
<button class="btn btn-unstyled d-none" type="button">
<svg aria-hidden="true" class="lexicon-icon lexicon-icon-times">
<use xlink:href="{{rootPath}}/images/icons/icons.svg#times" />
</svg>
</button>
</span>
</div>
</div>
Expand Down Expand Up @@ -177,16 +177,16 @@ <h3>Navbar Management Bar</h3>
<div class="input-group-item">
<input class="form-control input-group-inset input-group-inset-after" placeholder="Search for..." type="text">
<span class="input-group-inset-item input-group-inset-item-after">
<button class="btn btn-unstyled navbar-breakpoint-d-none" type="button">
<svg aria-hidden="true" class="lexicon-icon lexicon-icon-times">
<use xlink:href="{{rootPath}}/images/icons/icons.svg#times" />
</svg>
</button>
<button class="btn btn-unstyled navbar-breakpoint-d-block" type="button">
<button class="btn btn-unstyled" type="submit">
<svg aria-hidden="true" class="lexicon-icon lexicon-icon-search">
<use xlink:href="{{rootPath}}/images/icons/icons.svg#search" />
</svg>
</button>
<button class="btn btn-unstyled d-none" type="button">
<svg aria-hidden="true" class="lexicon-icon lexicon-icon-times">
<use xlink:href="{{rootPath}}/images/icons/icons.svg#times" />
</svg>
</button>
</span>
</div>
</div>
Expand Down Expand Up @@ -410,16 +410,16 @@ <h3>Navbar Overlay</h3>
<div class="input-group-item">
<input class="form-control input-group-inset input-group-inset-after" placeholder="Search for..." type="text">
<span class="input-group-inset-item input-group-inset-item-after">
<button class="btn btn-unstyled navbar-breakpoint-d-none" type="button">
<svg aria-hidden="true" class="lexicon-icon lexicon-icon-times">
<use xlink:href="{{rootPath}}/images/icons/icons.svg#times" />
</svg>
</button>
<button class="btn btn-unstyled navbar-breakpoint-d-block" type="button">
<button class="btn btn-unstyled" type="submit">
<svg aria-hidden="true" class="lexicon-icon lexicon-icon-search">
<use xlink:href="{{rootPath}}/images/icons/icons.svg#search" />
</svg>
</button>
<button class="btn btn-unstyled d-none" type="button">
<svg aria-hidden="true" class="lexicon-icon lexicon-icon-times">
<use xlink:href="{{rootPath}}/images/icons/icons.svg#times" />
</svg>
</button>
</span>
</div>
</div>
Expand Down Expand Up @@ -500,6 +500,81 @@ <h3>Navbar Overlay</h3>
</div>
</div>

<div class="clay-site-open-overlay clay-site-row-spacer row">
<div class="col-md-12">
<h3>Management Bar with only Search (Collapses in Mobile)</h3>

<nav class="management-bar management-bar-light navbar navbar-expand-md">
<div class="container-fluid container-fluid-max-xl">
<div class="navbar-form navbar-form-autofit navbar-overlay navbar-overlay-sm-down">
<div class="container-fluid container-fluid-max-xl">
<form role="search">
<div class="input-group">
<div class="input-group-item">
<input class="form-control input-group-inset input-group-inset-after" placeholder="Search for..." type="text">
<span class="input-group-inset-item input-group-inset-item-after">
<button class="btn btn-unstyled" type="submit">
<svg aria-hidden="true" class="lexicon-icon lexicon-icon-search">
<use xlink:href="{{rootPath}}/images/icons/icons.svg#search" />
</svg>
</button>
<button class="btn btn-unstyled d-none" type="button">
<svg aria-hidden="true" class="lexicon-icon lexicon-icon-times">
<use xlink:href="{{rootPath}}/images/icons/icons.svg#times" />
</svg>
</button>
</span>
</div>
</div>
</form>
</div>
</div>
<ul class="navbar-nav navbar-nav-last">
<li class="nav-item navbar-breakpoint-d-none">
<a class="nav-link nav-link-monospaced" href="#1" role="button">
<svg aria-hidden="true" class="lexicon-icon lexicon-icon-search">
<use xlink:href="{{rootPath}}/images/icons/icons.svg#search" />
</svg>
</a>
</li>
</ul>
</div>
</nav>
</div>
</div>

<div class="clay-site-open-overlay clay-site-row-spacer row">
<div class="col-md-12">
<h3>Management Bar with only Search (Always Open)</h3>

<nav class="management-bar management-bar-light navbar navbar-expand-md">
<div class="container-fluid container-fluid-max-xl">
<div class="navbar-form navbar-form-autofit">
<form role="search">
<div class="input-group">
<div class="input-group-item">
<input class="form-control input-group-inset input-group-inset-after" placeholder="Search for..." type="text">
<span class="input-group-inset-item input-group-inset-item-after">
<button class="btn btn-unstyled" type="submit">
<svg aria-hidden="true" class="lexicon-icon lexicon-icon-search">
<use xlink:href="{{rootPath}}/images/icons/icons.svg#search" />
</svg>
</button>
<button class="btn btn-unstyled d-none" type="button">
<svg aria-hidden="true" class="lexicon-icon lexicon-icon-times">
<use xlink:href="{{rootPath}}/images/icons/icons.svg#times" />
</svg>
</button>
</span>
</div>
</div>
</form>
</div>
</div>
</nav>
</div>
</div>

<div class="clay-site-open-overlay clay-site-row-spacer row">
<div class="col-md-12">
<h3>With Buttons</h3>
Expand Down Expand Up @@ -548,16 +623,16 @@ <h3>With Buttons</h3>
<div class="input-group-item">
<input class="form-control input-group-inset input-group-inset-after" placeholder="Search for..." type="text">
<span class="input-group-inset-item input-group-inset-item-after">
<button class="btn btn-unstyled navbar-breakpoint-d-none" type="button">
<svg aria-hidden="true" class="lexicon-icon lexicon-icon-times">
<use xlink:href="{{rootPath}}/images/icons/icons.svg#times" />
</svg>
</button>
<button class="btn btn-unstyled navbar-breakpoint-d-block" type="button">
<button class="btn btn-unstyled" type="submit">
<svg aria-hidden="true" class="lexicon-icon lexicon-icon-search">
<use xlink:href="{{rootPath}}/images/icons/icons.svg#search" />
</svg>
</button>
<button class="btn btn-unstyled d-none" type="button">
<svg aria-hidden="true" class="lexicon-icon lexicon-icon-times">
<use xlink:href="{{rootPath}}/images/icons/icons.svg#times" />
</svg>
</button>
</span>
</div>
</div>
Expand Down Expand Up @@ -673,16 +748,16 @@ <h3>With Buttons</h3>
<div class="input-group-item">
<input class="form-control input-group-inset input-group-inset-after" placeholder="Search for..." type="text">
<span class="input-group-inset-item input-group-inset-item-after">
<button class="btn btn-unstyled navbar-breakpoint-d-none" type="button">
<svg aria-hidden="true" class="lexicon-icon lexicon-icon-times">
<use xlink:href="{{rootPath}}/images/icons/icons.svg#times" />
</svg>
</button>
<button class="btn btn-unstyled navbar-breakpoint-d-block" type="button">
<button class="btn btn-unstyled" type="submit">
<svg aria-hidden="true" class="lexicon-icon lexicon-icon-search">
<use xlink:href="{{rootPath}}/images/icons/icons.svg#search" />
</svg>
</button>
<button class="btn btn-unstyled d-none" type="button">
<svg aria-hidden="true" class="lexicon-icon lexicon-icon-times">
<use xlink:href="{{rootPath}}/images/icons/icons.svg#times" />
</svg>
</button>
</span>
</div>
</div>
Expand Down Expand Up @@ -800,7 +875,7 @@ <h3>With Buttons</h3>
$(this).closest('.navbar').find('.navbar-overlay-sm-down').addClass('show');
});

$('.clay-site-open-overlay .input-group-inset-item .btn-unstyled').on('click', function(event) {
$('.clay-site-open-overlay .input-group-inset-item .btn-unstyled[type="button"]').on('click', function(event) {
$(this).closest('.navbar-overlay-sm-down').removeClass('show');
});

Expand All @@ -811,4 +886,23 @@ <h3>With Buttons</h3>
$('.clay-site-close-overlay-up').on('click', function(event) {
$(this).closest('.navbar-overlay-up').removeClass('show');
});

$('.form-control').on('input', function(event) {
var value = $(this).val() === '';
var closeButton = $(this).closest('.input-group').find('[type="button"]');

if (value) {
closeButton.addClass('d-none');
}
else {
closeButton.removeClass('d-none');
}
});

$('.input-group').delegate('[type="submit"] + [type="button"]', 'click', function(event) {
var formControl = $(this).closest('.input-group').find('.form-control');
formControl.val('');
$(this).addClass('d-none');
formControl.focus();
});
</script>
4 changes: 4 additions & 0 deletions packages/clay/src/scss/components/_navbar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,10 @@
}
}

.navbar-nav-last {
margin-left: auto;
}

.navbar-title {
font-size: $navbar-title-font-size;
font-weight: $navbar-title-font-weight;
Expand Down
8 changes: 8 additions & 0 deletions packages/clay/src/scss/mixins/_navbar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}
Expand Down