mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-17 19:21:23 +03:00
Code Activity

Merge branch '3.0.0-wip' into bs3_homepage

Browse Source 
Conflicts:
	customize.html
	examples/justified-nav/justified-nav.css
This commit is contained in:
Mark Otto
2013-08-18 19:02:42 -07:00
parent 578a14e14a 5bd2d7ed7e
commit 9dcae610e9
59 changed files with 3196 additions and 417 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/jumbotron-narrow/index.html
+6 -1
View File
@@ -14,6 +14,12 @@
<!-- Custom styles for this template -->
<link href="jumbotron-narrow.css" rel="stylesheet">
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="../../assets/js/html5shiv.js"></script>
<script src="../../assets/js/respond.min.js"></script>
<![endif]-->
</head>
<body>
@@ -68,6 +74,5 @@
<!-- Bootstrap core JavaScript
================================================== -->
<!-- Placed at the end of the document so the pages load faster -->
<script src="../../assets/js/respond.min.js"></script>
</body>
</html>