aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2016-09-11 21:57:38 -0700
committerMark Otto <[email protected]>2016-09-11 21:57:38 -0700
commit818d1f53a51b2c4888fde639c19298b1b3b74063 (patch)
treec07584e5f315eb4fd3795f3cad32b5a7268d25e0
parente2b04b948ceaa69d443ce31d88b20ac5b9112be2 (diff)
parentd125860464d2a47f957193440097b502acf95832 (diff)
downloadbootstrap-818d1f53a51b2c4888fde639c19298b1b3b74063.tar.xz
bootstrap-818d1f53a51b2c4888fde639c19298b1b3b74063.zip
Merge branch 'v4-hamburger-fix2' of https://github.com/patrickhlauke/bootstrap into patrickhlauke-v4-hamburger-fix2
Diffstat
-rw-r--r--docs/_includes/nav-home.html4
-rw-r--r--docs/components/navbar.md8
-rw-r--r--docs/examples/album/index.html4
-rw-r--r--docs/examples/dashboard/index.html7
-rw-r--r--docs/examples/navbar-top-fixed/index.html4
-rw-r--r--docs/examples/navbar-top/index.html4
-rw-r--r--docs/examples/navbar/index.html4
-rw-r--r--docs/examples/sticky-footer-navbar/index.html4
-rw-r--r--scss/_navbar.scss8
9 files changed, 16 insertions, 31 deletions
diff --git a/docs/_includes/nav-home.html b/docs/_includes/nav-home.html
index 0436e2dbe..a5a3088c7 100644
--- a/docs/_includes/nav-home.html
+++ b/docs/_includes/nav-home.html
@@ -27,9 +27,7 @@
<nav>
<div class="clearfix">
- <button class="navbar-toggler pull-xs-right hidden-sm-up" type="button" data-toggle="collapse" data-target="#bd-main-nav" aria-controls="bd-main-nav" aria-expanded="false" aria-label="Toggle navigation">
- &#9776;
- </button>
+ <button class="navbar-toggler pull-xs-right hidden-sm-up" type="button" data-toggle="collapse" data-target="#bd-main-nav" aria-controls="bd-main-nav" aria-expanded="false" aria-label="Toggle navigation"></button>
<a class="navbar-brand hidden-sm-up" href="{{ site.baseurl }}/">
Bootstrap
</a>
diff --git a/docs/components/navbar.md b/docs/components/navbar.md
index 98e48fa77..10f445e8f 100644
--- a/docs/components/navbar.md
+++ b/docs/components/navbar.md
@@ -241,9 +241,7 @@ Our collapse plugin allows you to use a `<button>` or `<a>` to toggle hidden con
{% example html %}
<nav class="navbar navbar-light bg-faded">
- <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#exCollapsingNavbar" aria-controls="exCollapsingNavbar" aria-expanded="false" aria-label="Toggle navigation">
- &#9776;
- </button>
+ <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#exCollapsingNavbar" aria-controls="exCollapsingNavbar" aria-expanded="false" aria-label="Toggle navigation"></button>
<div class="collapse" id="exCollapsingNavbar">
<div class="bg-inverse p-a-1">
<h4>Collapsed content</h4>
@@ -257,9 +255,7 @@ For more complex navbar patterns, like those used in Bootstrap v3, use the `.nav
{% example html %}
<nav class="navbar navbar-light bg-faded">
- <button class="navbar-toggler hidden-sm-up" type="button" data-toggle="collapse" data-target="#exCollapsingNavbar2" aria-controls="exCollapsingNavbar2" aria-expanded="false" aria-label="Toggle navigation">
- &#9776;
- </button>
+ <button class="navbar-toggler hidden-sm-up" type="button" data-toggle="collapse" data-target="#exCollapsingNavbar2" aria-controls="exCollapsingNavbar2" aria-expanded="false" aria-label="Toggle navigation"></button>
<div class="collapse navbar-toggleable-xs" id="exCollapsingNavbar2">
<a class="navbar-brand" href="#">Responsive navbar</a>
<ul class="nav navbar-nav">
diff --git a/docs/examples/album/index.html b/docs/examples/album/index.html
index ccf8d035b..b35c246a3 100644
--- a/docs/examples/album/index.html
+++ b/docs/examples/album/index.html
@@ -37,9 +37,7 @@
</div>
<div class="navbar navbar-static-top navbar-dark bg-inverse">
<div class="container-fluid">
- <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar-header">
- &#9776;
- </button>
+ <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar-header" aria-controls="navbar-header" aria-expanded="false" aria-label="Toggle navigation"></button>
<a href="#" class="navbar-brand">Album</a>
</div>
</div>
diff --git a/docs/examples/dashboard/index.html b/docs/examples/dashboard/index.html
index 5a80654ff..6ddc6cf75 100644
--- a/docs/examples/dashboard/index.html
+++ b/docs/examples/dashboard/index.html
@@ -21,12 +21,7 @@
<body>
<nav class="navbar navbar-dark navbar-fixed-top bg-inverse">
- <button type="button" class="navbar-toggler hidden-sm-up" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
- <span class="sr-only">Toggle navigation</span>
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- </button>
+ <button type="button" class="navbar-toggler hidden-sm-up" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar" aria-label="Toggle navigation"></button>
<a class="navbar-brand" href="#">Project name</a>
<div id="navbar">
<nav class="nav navbar-nav pull-xs-left">
diff --git a/docs/examples/navbar-top-fixed/index.html b/docs/examples/navbar-top-fixed/index.html
index bda85c409..7739b9e46 100644
--- a/docs/examples/navbar-top-fixed/index.html
+++ b/docs/examples/navbar-top-fixed/index.html
@@ -27,9 +27,7 @@
</div>
</div>
<div class="navbar navbar-light bg-faded navbar-static-top">
- <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar-header">
- &#9776;
- </button>
+ <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar-header" aria-controls="navbar-header" aria-expanded="false" aria-label="Toggle navigation"></button>
</div>
</div>
diff --git a/docs/examples/navbar-top/index.html b/docs/examples/navbar-top/index.html
index 52c61098f..b9dab943b 100644
--- a/docs/examples/navbar-top/index.html
+++ b/docs/examples/navbar-top/index.html
@@ -26,9 +26,7 @@
</div>
</div>
<div class="navbar navbar-light bg-faded navbar-static-top m-b-1">
- <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar-header">
- &#9776;
- </button>
+ <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar-header" aria-controls="navbar-header" aria-expanded="false" aria-label="Toggle navigation"></button>
</div>
<div class="container">
diff --git a/docs/examples/navbar/index.html b/docs/examples/navbar/index.html
index d0beae127..f69139ee2 100644
--- a/docs/examples/navbar/index.html
+++ b/docs/examples/navbar/index.html
@@ -22,9 +22,7 @@
<div class="container">
<nav class="navbar navbar-light bg-faded">
- <button class="navbar-toggler hidden-sm-up" type="button" data-toggle="collapse" data-target="#navbar-header" aria-controls="navbar-header">
- &#9776;
- </button>
+ <button class="navbar-toggler hidden-sm-up" type="button" data-toggle="collapse" data-target="#navbar-header" aria-controls="navbar-header" aria-expanded="false" aria-label="Toggle navigation"></button>
<div class="collapse navbar-toggleable-xs" id="navbar-header">
<a class="navbar-brand" href="#">Navbar</a>
<ul class="nav navbar-nav">
diff --git a/docs/examples/sticky-footer-navbar/index.html b/docs/examples/sticky-footer-navbar/index.html
index aa8b8c5c8..efe9b4c64 100644
--- a/docs/examples/sticky-footer-navbar/index.html
+++ b/docs/examples/sticky-footer-navbar/index.html
@@ -30,9 +30,7 @@
</div>
<nav class="navbar navbar-light navbar-static-top bg-faded">
<div class="container">
- <button class="navbar-toggler hidden-sm-up" type="button" data-toggle="collapse" data-target="#exCollapsingNavbar2">
- &#9776;
- </button>
+ <button class="navbar-toggler hidden-sm-up" type="button" data-toggle="collapse" data-target="#exCollapsingNavbar2" aria-expanded="false" aria-controls="exCollapsingNavbar2" aria-label="Toggle navigation"></button>
<div class="collapse navbar-toggleable-xs" id="exCollapsingNavbar2">
<a class="navbar-brand" href="#">Sticky footer</a>
<ul class="nav navbar-nav">
diff --git a/scss/_navbar.scss b/scss/_navbar.scss
index 881af0db6..353e6958e 100644
--- a/scss/_navbar.scss
+++ b/scss/_navbar.scss
@@ -105,10 +105,16 @@
// Bootstrap JavaScript plugin.
.navbar-toggler {
+ box-sizing: content-box;
+ width: 1em;
+ height: 1em;
padding: .5rem .75rem;
font-size: $font-size-lg;
line-height: 1;
- background: none;
+ background: url(data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20viewBox%3D%220%200%2016%2016%22%3E%3Crect%20y%3D%222%22%20width%3D%2216%22%20height%3D%221%22%2F%3E%3Crect%20y%3D%227%22%20width%3D%2216%22%20height%3D%221%22%2F%3E%3Crect%20y%3D%2212%22%20width%3D%2216%22%20height%3D%221%22%2F%3E%3C%2Fsvg%3E) no-repeat 50% 50%;
+ background-clip: content-box;
+ background-origin: content-box;
+ background-size: 1em 1em;
border: $border-width solid transparent;
@include border-radius($btn-border-radius);
generated by cgit v1.2.3 (git 2.25.1) at 2026-06-28 11:43:21 +0000