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

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

Conflicts:
	bootstrap.css
parents b8511568 25519bac
7 merge requests!14752.0 wip,!1403warningText and warningBackground docs fix,!13512.0 wip - relative font sizes,!1315[2.0-wip] Fix mustache glob when building,!1268[wip-2.0] IE 7/8 Typehead JS fix,!12362.0 wip - Fix for issue #1202,!1219Removed dotted outline on navbar dropdown menu
Hide whitespace changes
Inline Side-by-side
Showing
with 11 additions and 11 deletions
+11 -11
bootstrap.css
+ 1
- 1
View file @ e24bd40b
......@@ -6,7 +6,7 @@
* http://www.apache.org/licenses/LICENSE-2.0
*
* Designed and built with all the love in the world @twitter by @mdo and @fat.
* Date: Wed Jan 25 11:24:56 PST 2012
* Date: Wed Jan 25 11:27:15 PST 2012
*/
article,
aside,
......
docs/base-css.html
+ 1
- 1
View file @ e24bd40b
......@@ -25,7 +25,7 @@
<link rel="apple-touch-icon" sizes="114x114" href="images/apple-touch-icon-114x114.png">
</head>
<body>
<body data-spy="scroll" data-target=".subnav" data-offset="50">
<!-- Navbar
================================================== -->
......
docs/components.html
+ 1
- 1
View file @ e24bd40b
......@@ -25,7 +25,7 @@
<link rel="apple-touch-icon" sizes="114x114" href="images/apple-touch-icon-114x114.png">
</head>
<body>
<body data-spy="scroll" data-target=".subnav" data-offset="50">
<!-- Navbar
================================================== -->
......
docs/download.html
+ 1
- 1
View file @ e24bd40b
......@@ -25,7 +25,7 @@
<link rel="apple-touch-icon" sizes="114x114" href="images/apple-touch-icon-114x114.png">
</head>
<body>
<body data-spy="scroll" data-target=".subnav" data-offset="50">
<!-- Navbar
================================================== -->
......
docs/examples.html
+ 1
- 1
View file @ e24bd40b
......@@ -25,7 +25,7 @@
<link rel="apple-touch-icon" sizes="114x114" href="images/apple-touch-icon-114x114.png">
</head>
<body>
<body data-spy="scroll" data-target=".subnav" data-offset="50">
<!-- Navbar
================================================== -->
......
docs/index.html
+ 1
- 1
View file @ e24bd40b
......@@ -25,7 +25,7 @@
<link rel="apple-touch-icon" sizes="114x114" href="images/apple-touch-icon-114x114.png">
</head>
<body>
<body data-spy="scroll" data-target=".subnav" data-offset="50">
<!-- Navbar
================================================== -->
......
docs/javascript.html
+ 1
- 1
View file @ e24bd40b
......@@ -25,7 +25,7 @@
<link rel="apple-touch-icon" sizes="114x114" href="images/apple-touch-icon-114x114.png">
</head>
<body>
<body data-spy="scroll" data-target=".subnav" data-offset="50">
<!-- Navbar
================================================== -->
......
docs/less.html
+ 1
- 1
View file @ e24bd40b
......@@ -25,7 +25,7 @@
<link rel="apple-touch-icon" sizes="114x114" href="images/apple-touch-icon-114x114.png">
</head>
<body>
<body data-spy="scroll" data-target=".subnav" data-offset="50">
<!-- Navbar
================================================== -->
......
docs/scaffolding.html
+ 1
- 1
View file @ e24bd40b
......@@ -25,7 +25,7 @@
<link rel="apple-touch-icon" sizes="114x114" href="images/apple-touch-icon-114x114.png">
</head>
<body>
<body data-spy="scroll" data-target=".subnav" data-offset="50">
<!-- Navbar
================================================== -->
......
docs/templates/layout.mustache
+ 1
- 1
View file @ e24bd40b
......@@ -25,7 +25,7 @@
<link rel="apple-touch-icon" sizes="114x114" href="images/apple-touch-icon-114x114.png">
</head>
<body>
<body data-spy="scroll" data-target=".subnav" data-offset="50">
<!-- Navbar
================================================== -->
......
docs/upgrading.html
+ 1
- 1
View file @ e24bd40b
......@@ -25,7 +25,7 @@
<link rel="apple-touch-icon" sizes="114x114" href="images/apple-touch-icon-114x114.png">
</head>
<body>
<body data-spy="scroll" data-target=".subnav" data-offset="50">
<!-- Navbar
================================================== -->
......
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