rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-01-17 09:52:29 +01:00
Code Issues Actions Packages Releases Activity

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

Browse Source 
Conflicts:
	bootstrap.css
This commit is contained in:
Mark Otto 2012-01-25 11:27:29 -08:00
commit e24bd40b4a
11 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bootstrap.css vendored
View File

@ -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,

2
docs/base-css.html
View File

@ -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
================================================== --> ================================================== -->

2
docs/components.html
View File

@ -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
================================================== --> ================================================== -->

2
docs/download.html
View File

@ -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
================================================== --> ================================================== -->

2
docs/examples.html
View File

@ -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
================================================== --> ================================================== -->

2
docs/index.html
View File

@ -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
================================================== --> ================================================== -->

2
docs/javascript.html
View File

@ -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
================================================== --> ================================================== -->

2
docs/less.html
View File

@ -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
================================================== --> ================================================== -->

2
docs/scaffolding.html
View File

@ -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
================================================== --> ================================================== -->

2
docs/templates/layout.mustache vendored
View File

@ -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
================================================== --> ================================================== -->

2
docs/upgrading.html
View File

@ -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
================================================== --> ================================================== -->