mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-15 11:59:39 +03:00
Code Activity

merge in v3.2.0 changes; nuke a dupe _gh_pages dir

Browse Source
This commit is contained in:
Mark Otto
2014-06-26 09:46:59 -07:00
parent ed14e5132b
commit 2c3d8ce134
73 changed files with 2979 additions and 11634 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/grid/grid.css
-5
View File
@@ -1,8 +1,3 @@
.container {
padding-right: 15px;
padding-left: 15px;
}
h4 {
margin-top: 25px;
}
examples/grid/index.html
+8 -4
View File
@@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="description" content="">
<meta name="author" content="">
<link rel="shortcut icon" href="../../assets/ico/favicon.ico">
<link rel="icon" href="../../favicon.ico">
<title>Grid Template for Bootstrap</title>
@@ -16,13 +16,17 @@
<!-- Custom styles for this template -->
<link href="grid.css" rel="stylesheet">
<!-- Just for debugging purposes. Don't actually copy this line! -->
<!-- Just for debugging purposes. Don't actually copy these 2 lines! -->
<!--[if lt IE 9]><script src="../../assets/js/ie8-responsive-file-warning.js"></script><![endif]-->
<script src="../../assets/js/ie-emulation-modes-warning.js"></script>
<!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
<script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
<script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
<![endif]-->
</head>