rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-11-29 11:24:18 +01:00
Code Issues Actions Packages Releases Activity

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

Browse Source
This commit is contained in:
Mark Otto 2012-07-17 19:11:51 -07:00
commit 16fa610ea4
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/assets/js/bootstrap.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
docs/getting-started.html
View File

@ -216,10 +216,10 @@
<title>Bootstrap 101 Template</title> <title>Bootstrap 101 Template</title>
<!-- Bootstrap --> <!-- Bootstrap -->
<link href="css/bootstrap.min.css" rel="stylesheet"> <link href="css/bootstrap.min.css" rel="stylesheet">
<script src="js/bootstrap.min.js"></script>
</head> </head>
<body> <body>
<h1>Hello, world!</h1> <h1>Hello, world!</h1>
<script src="js/bootstrap.min.js"></script>
</body> </body>
</html> </html>
</pre> </pre>

2
docs/templates/pages/getting-started.mustache vendored
View File

@ -145,10 +145,10 @@
&lt;title&gt;Bootstrap 101 Template&lt;/title&gt; &lt;title&gt;Bootstrap 101 Template&lt;/title&gt;
&lt;!-- Bootstrap --&gt; &lt;!-- Bootstrap --&gt;
&lt;link href="css/bootstrap.min.css" rel="stylesheet"&gt; &lt;link href="css/bootstrap.min.css" rel="stylesheet"&gt;
&lt;script src="js/bootstrap.min.js"&gt;&lt;/script&gt;
&lt;/head&gt; &lt;/head&gt;
&lt;body&gt; &lt;body&gt;
&lt;h1&gt;Hello, world!&lt;/h1&gt; &lt;h1&gt;Hello, world!&lt;/h1&gt;
&lt;script src="js/bootstrap.min.js"&gt;&lt;/script&gt;
&lt;/body&gt; &lt;/body&gt;
&lt;/html&gt; &lt;/html&gt;
</pre> </pre>