Skip to content
GitLab
Commit 1b8cd2d8 authored by Mark Otto's avatar Mark Otto
Browse files

Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

parents 2f704776 e787e5fc
Hide whitespace changes
Inline Side-by-side
Showing
with 10 additions and 10 deletions
+10 -10
docs/examples/carousel.html
+ 2
- 2
View file @ 1b8cd2d8
...@@ -236,11 +236,11 @@ body { ...@@ -236,11 +236,11 @@ body {
<div class="navbar navbar-inverse navbar-static-top"> <div class="navbar navbar-inverse navbar-static-top">
<div class="container"> <div class="container">
<a class="navbar-toggle" data-toggle="collapse" data-target=".nav-collapse"> <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".nav-collapse">
<span class="icon-bar"></span> <span class="icon-bar"></span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
</a> </button>
<a class="navbar-brand" href="#">Project name</a> <a class="navbar-brand" href="#">Project name</a>
<div class="nav-collapse collapse"> <div class="nav-collapse collapse">
<ul class="nav navbar-nav"> <ul class="nav navbar-nav">
......
docs/examples/jumbotron.html
+ 2
- 2
View file @ 1b8cd2d8
...@@ -39,11 +39,11 @@ title: Jumbotron template ...@@ -39,11 +39,11 @@ title: Jumbotron template
<div class="navbar navbar-inverse navbar-fixed-top"> <div class="navbar navbar-inverse navbar-fixed-top">
<div class="container"> <div class="container">
<a class="navbar-toggle" data-toggle="collapse" data-target=".nav-collapse"> <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".nav-collapse">
<span class="icon-bar"></span> <span class="icon-bar"></span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
</a> </button>
<a class="navbar-brand" href="#">Project name</a> <a class="navbar-brand" href="#">Project name</a>
<div class="nav-collapse collapse"> <div class="nav-collapse collapse">
<ul class="nav navbar-nav"> <ul class="nav navbar-nav">
......
docs/examples/navbar-fixed-top.html
+ 2
- 2
View file @ 1b8cd2d8
...@@ -20,11 +20,11 @@ title: Fixed navbar template ...@@ -20,11 +20,11 @@ title: Fixed navbar template
<!-- Fixed navbar --> <!-- Fixed navbar -->
<div class="navbar navbar-fixed-top"> <div class="navbar navbar-fixed-top">
<div class="container"> <div class="container">
<a class="navbar-toggle" data-toggle="collapse" data-target=".nav-collapse"> <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".nav-collapse">
<span class="icon-bar"></span> <span class="icon-bar"></span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
</a> </button>
<a class="navbar-brand" href="#">Project name</a> <a class="navbar-brand" href="#">Project name</a>
<div class="nav-collapse collapse"> <div class="nav-collapse collapse">
<ul class="nav navbar-nav"> <ul class="nav navbar-nav">
......
docs/examples/navbar-static-top.html
+ 2
- 2
View file @ 1b8cd2d8
...@@ -16,11 +16,11 @@ title: Static navbar template ...@@ -16,11 +16,11 @@ title: Static navbar template
<!-- Static navbar --> <!-- Static navbar -->
<div class="navbar navbar-static-top"> <div class="navbar navbar-static-top">
<div class="container"> <div class="container">
<a class="navbar-toggle" data-toggle="collapse" data-target=".nav-collapse"> <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".nav-collapse">
<span class="icon-bar"></span> <span class="icon-bar"></span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
</a> </button>
<a class="navbar-brand" href="#">Project name</a> <a class="navbar-brand" href="#">Project name</a>
<div class="nav-collapse collapse"> <div class="nav-collapse collapse">
<ul class="nav navbar-nav"> <ul class="nav navbar-nav">
......
docs/examples/navbar.html
+ 2
- 2
View file @ 1b8cd2d8
...@@ -22,11 +22,11 @@ title: Navbar template ...@@ -22,11 +22,11 @@ title: Navbar template
<!-- Static navbar --> <!-- Static navbar -->
<div class="navbar"> <div class="navbar">
<div class="container"> <div class="container">
<a class="navbar-toggle" data-toggle="collapse" data-target=".nav-collapse"> <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".nav-collapse">
<span class="icon-bar"></span> <span class="icon-bar"></span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
</a> </button>
<a class="navbar-brand" href="#">Project name</a> <a class="navbar-brand" href="#">Project name</a>
<div class="nav-collapse collapse"> <div class="nav-collapse collapse">
<ul class="nav navbar-nav"> <ul class="nav navbar-nav">
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment