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.

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

v4: Navbar improvements #19890

Merged
merged 41 commits into from Oct 19, 2016
Commits
Jump to file or symbol
Failed to load files and symbols.
+12 −19
Diff settings

Always

Just for now

Viewing a subset of changes. View all

Iterate over breakpoints to generate .navbar-toggleable classes

- Moves .navbar-brand margin and float to media queries
- Replaces the static media queries with an each loop to generate all the needed classes
  • Loading branch information...
mdo committed Oct 17, 2016
commit 6e8ce0c7dc84c9373f6d760b82bea575cd5358b8
View
@@ -68,10 +68,9 @@
//
.navbar-brand {
float: left;
display: block;
padding-top: $navbar-brand-padding-y;
padding-bottom: $navbar-brand-padding-y;
margin-right: 1rem;
font-size: $font-size-lg;
@include hover-focus {
@@ -132,24 +131,18 @@
}
// scss-lint:disable ImportantRule
// Custom override for
.navbar-toggleable {
&-xs {
@include clearfix;
@include media-breakpoint-up(sm) {
display: block !important;
}
}
&-sm {
@include clearfix;
@include media-breakpoint-up(md) {
display: block !important;
}
}
&-md {
@include clearfix;
@include media-breakpoint-up(lg) {
display: block !important;
@each $breakpoint in map-keys($grid-breakpoints) {
&-#{$breakpoint} {
@include clearfix;
@include media-breakpoint-up($breakpoint) {
display: block !important;
.navbar-brand {
float: left;
margin-right: 1rem;
}
}
}
}
}
ProTip! Use n and p to navigate between commits in a pull request.