Skip to content

B
bootstrap
Commit e24bd40b authored by Mark Otto's avatar Mark Otto
Browse files
Options

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

Conflicts:
	bootstrap.css
parents b8511568 25519bac
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 11 deletions
bootstrap.css
View file @ e24bd40b
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Designed and built with all the love in the world @twitter by @mdo and @fat. * 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, article,
aside, aside,
......
docs/base-css.html
View file @ e24bd40b
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
<link rel="apple-touch-icon" sizes="114x114" href="images/apple-touch-icon-114x114.png"> <link rel="apple-touch-icon" sizes="114x114" href="images/apple-touch-icon-114x114.png">
</head> </head>
<body> <body data-spy="scroll" data-target=".subnav" data-offset="50">
<!-- Navbar <!-- Navbar
================================================== --> ================================================== -->
......
docs/components.html
View file @ e24bd40b
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
<link rel="apple-touch-icon" sizes="114x114" href="images/apple-touch-icon-114x114.png"> <link rel="apple-touch-icon" sizes="114x114" href="images/apple-touch-icon-114x114.png">
</head> </head>
<body> <body data-spy="scroll" data-target=".subnav" data-offset="50">
<!-- Navbar <!-- Navbar
================================================== --> ================================================== -->
......
docs/download.html
View file @ e24bd40b
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
<link rel="apple-touch-icon" sizes="114x114" href="images/apple-touch-icon-114x114.png"> <link rel="apple-touch-icon" sizes="114x114" href="images/apple-touch-icon-114x114.png">
</head> </head>
<body> <body data-spy="scroll" data-target=".subnav" data-offset="50">
<!-- Navbar <!-- Navbar
================================================== --> ================================================== -->
......
docs/examples.html
View file @ e24bd40b
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
<link rel="apple-touch-icon" sizes="114x114" href="images/apple-touch-icon-114x114.png"> <link rel="apple-touch-icon" sizes="114x114" href="images/apple-touch-icon-114x114.png">
</head> </head>
<body> <body data-spy="scroll" data-target=".subnav" data-offset="50">
<!-- Navbar <!-- Navbar
================================================== --> ================================================== -->
......
docs/index.html
View file @ e24bd40b
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
<link rel="apple-touch-icon" sizes="114x114" href="images/apple-touch-icon-114x114.png"> <link rel="apple-touch-icon" sizes="114x114" href="images/apple-touch-icon-114x114.png">
</head> </head>
<body> <body data-spy="scroll" data-target=".subnav" data-offset="50">
<!-- Navbar <!-- Navbar
================================================== --> ================================================== -->
......
docs/javascript.html
View file @ e24bd40b
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
<link rel="apple-touch-icon" sizes="114x114" href="images/apple-touch-icon-114x114.png"> <link rel="apple-touch-icon" sizes="114x114" href="images/apple-touch-icon-114x114.png">
</head> </head>
<body> <body data-spy="scroll" data-target=".subnav" data-offset="50">
<!-- Navbar <!-- Navbar
================================================== --> ================================================== -->
......
docs/less.html
View file @ e24bd40b
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
<link rel="apple-touch-icon" sizes="114x114" href="images/apple-touch-icon-114x114.png"> <link rel="apple-touch-icon" sizes="114x114" href="images/apple-touch-icon-114x114.png">
</head> </head>
<body> <body data-spy="scroll" data-target=".subnav" data-offset="50">
<!-- Navbar <!-- Navbar
================================================== --> ================================================== -->
......
docs/scaffolding.html
View file @ e24bd40b
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
<link rel="apple-touch-icon" sizes="114x114" href="images/apple-touch-icon-114x114.png"> <link rel="apple-touch-icon" sizes="114x114" href="images/apple-touch-icon-114x114.png">
</head> </head>
<body> <body data-spy="scroll" data-target=".subnav" data-offset="50">
<!-- Navbar <!-- Navbar
================================================== --> ================================================== -->
......
docs/templates/layout.mustache
View file @ e24bd40b
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
<link rel="apple-touch-icon" sizes="114x114" href="images/apple-touch-icon-114x114.png"> <link rel="apple-touch-icon" sizes="114x114" href="images/apple-touch-icon-114x114.png">
</head> </head>
<body> <body data-spy="scroll" data-target=".subnav" data-offset="50">
<!-- Navbar <!-- Navbar
================================================== --> ================================================== -->
......
docs/upgrading.html
View file @ e24bd40b
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
<link rel="apple-touch-icon" sizes="114x114" href="images/apple-touch-icon-114x114.png"> <link rel="apple-touch-icon" sizes="114x114" href="images/apple-touch-icon-114x114.png">
</head> </head>
<body> <body data-spy="scroll" data-target=".subnav" data-offset="50">
<!-- Navbar <!-- Navbar
================================================== --> ================================================== -->
......
Markdown is supported
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