Skip to content

Commit 1abcb38

Browse files
DavertMikDavertMik
committed
Merge pull request Codeception#81 from cjaoude/master
Correcting Bootstrap container usage.
2 parents 889a405 + 101846a commit 1abcb38

File tree

10 files changed

+570
-702
lines changed

10 files changed

+570
-702
lines changed

‎_layouts/bootstrap.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,16 @@
1111
<meta name="viewport" content="width=device-width, initial-scale=1">
1212
<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
1313

14+
{% if page.meta %}
15+
{{ page.meta }}
16+
{% endif %}
17+
1418
<!-- CSS -->
15-
<link href='http://fonts.googleapis.com/css?family=Philosopher&amp;subset=latin' rel='stylesheet' type='text/css'>
1619
<link href="//netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap.min.css" rel="stylesheet">
17-
1820
<link rel="stylesheet" href="/css/codeception.css">
1921
<link rel="stylesheet" href="/css/contributors.css">
2022
<link rel="stylesheet" type="text/css" media="screen" href="/css/syntax.css">
23+
2124
<!-- SCRIPTS -->
2225
<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.8.1/jquery.min.js" type="text/javascript"></script>
2326
<script src="//netdna.bootstrapcdn.com/bootstrap/3.0.0/js/bootstrap.min.js"></script>
@@ -95,10 +98,7 @@
9598
</div> <!-- /.container -->
9699
</nav>
97100

98-
<!-- CONTENT -->
99-
<div class="container">
100-
{{ content }}
101-
</div>
101+
{{ content }}
102102

103103
<div id="footer">
104104
<div class="container">

‎_layouts/doc.html

Lines changed: 26 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,35 @@
11
---
22
layout: bootstrap
33
---
4-
5-
<div class="row">
6-
<div class="col-sm-8 col-lg-8">
7-
<div class="content page">
8-
<div>
9-
4+
<div class="container">
5+
<div class="row">
6+
<div class="col-sm-8">
7+
<div class="content page">
108
<div id="page">
119
{{ content }}
12-
</div>
10+
</div> <!-- /#page -->
11+
</div> <!-- /.content page -->
12+
</div> <!-- /.col -->
13+
<div class="col-sm-4">
14+
<div id="searchable">
15+
<div>
16+
<input type="search" class="search" placeholder="live search...">
1317
</div>
14-
15-
</div>
16-
</div>
17-
<div class="col-sm-4 col-lg-4">
18-
19-
<div id="searchable">
20-
<input type="search" class="search" placeholder="live search...">
21-
<br>
22-
<!-- toc.js generated nav... -->
23-
<div id="toc" class="nav"></div>
24-
</div> <!-- /#searchable -->
25-
26-
<script type="text/javascript">
27-
$(document).ready(function () {
28-
$('#toc').toc({
29-
'selectors': 'h2,h3,h4',
30-
'prefix': 'toc',
31-
'container': '#page',
18+
<!-- toc.js generated nav... -->
19+
<div id="toc" class="nav"></div>
20+
</div> <!-- /#searchable -->
21+
22+
<script type="text/javascript">
23+
$(document).ready(function () {
24+
$('#toc').toc({
25+
'selectors': 'h2,h3,h4',
26+
'prefix': 'toc',
27+
'container': '#page',
3228
//custom function for anchor name
3329
'anchorName': function(i, heading, prefix) {
3430
return $(heading).text().replace(/\s/g, '-').replace(/[^\w-]/g, '');
3531
},
3632
});
37-
3833
// List.js
3934
$('#toc > ul').addClass('list');
4035
$('#toc ul.list li a').addClass('searchitem');
@@ -43,9 +38,8 @@
4338
};
4439
var userList = new List('searchable', options);
4540
// end List.js
46-
47-
}); // docrdy
48-
</script>
49-
50-
</div>
51-
</div>
41+
}); // docrdy
42+
</script>
43+
</div> <!-- /.col -->
44+
</div> <!-- /.row -->
45+
</div> <!-- /.container -->

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy