aboutsummaryrefslogtreecommitdiff
path: root/scss
diff options
context:
space:
mode:
authorGijs Boddeus <[email protected]>2017-10-05 08:38:59 +0200
committerGitHub <[email protected]>2017-10-05 08:38:59 +0200
commit8f483dc4322cc12849eda65246edfb47b5aaad0b (patch)
tree34e7256c7beee1c880819d871d3728ae10d0aa9d /scss
parentb14250f1963538f441322f4499bf677c5fc7263d (diff)
parent7b715ee7e846d0e53d9839b91254676f3795f3bd (diff)
downloadbootstrap-8f483dc4322cc12849eda65246edfb47b5aaad0b.tar.xz
bootstrap-8f483dc4322cc12849eda65246edfb47b5aaad0b.zip
Merge branch 'v4-dev' into yiq-function-update
Diffstat (limited to 'scss')
-rw-r--r--scss/_navbar.scss26
1 files changed, 7 insertions, 19 deletions
diff --git a/scss/_navbar.scss b/scss/_navbar.scss
index a0ccc06fb..6b023e82e 100644
--- a/scss/_navbar.scss
+++ b/scss/_navbar.scss
@@ -74,13 +74,6 @@
position: static;
float: none;
}
-
- .dropdown-toggle {
- &::after {
- border-top: $caret-width solid;
- border-bottom: 0;
- }
- }
}
@@ -151,18 +144,6 @@
padding-right: 0;
padding-left: 0;
}
-
- .dropup {
- .dropdown-menu {
- position: absolute;
- top: auto;
- bottom: 100%;
- }
-
- .dropdown-toggle {
- @include caret(up);
- }
- }
}
@include media-breakpoint-up($next) {
@@ -203,6 +184,13 @@
.navbar-toggler {
display: none;
}
+
+ .dropup {
+ .dropdown-menu {
+ top: auto;
+ bottom: 100%;
+ }
+ }
}
}
}