Skip to content

Commit 3f50a30

Browse files
secondtruthsecondtruth
authored
Merge pull request #9 from epreston/patch-7
Wrap Bootstrap Rows in Container Tags
2 parents 7fd1b32 + 00dfc43 commit 3f50a30

File tree

12 files changed

+6132
-6102
lines changed

12 files changed

+6132
-6102
lines changed

‎css/startmin.css‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ body {
1313
}
1414

1515
#page-wrapper {
16-
padding: 30px 15px 0 15px;
16+
padding-top: 30px;
1717
min-height: 568px;
1818
background-color: #fff;
1919
}
@@ -22,7 +22,7 @@ body {
2222
#page-wrapper {
2323
position: inherit;
2424
margin-left: 250px;
25-
padding: 30px 30px 0 30px;
25+
padding: 30px 15px 0 15px;
2626
border-left: 1px solid #e7e7e7;
2727
}
2828
}

‎pages/buttons.html‎

Lines changed: 173 additions & 170 deletions
Large diffs are not rendered by default.

‎pages/flot.html‎

Lines changed: 88 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -236,111 +236,114 @@
236236
</nav>
237237

238238
<div id="page-wrapper">
239-
<div class="row">
240-
<div class="col-lg-12">
241-
<h1 class="page-header">Flot</h1>
239+
<div class="container-fluid">
240+
<div class="row">
241+
<div class="col-lg-12">
242+
<h1 class="page-header">Flot</h1>
243+
</div>
244+
<!-- /.col-lg-12 -->
242245
</div>
243-
<!-- /.col-lg-12 -->
244-
</div>
245-
<!-- /.row -->
246-
<div class="row">
247-
<div class="col-lg-12">
248-
<div class="panel panel-default">
249-
<div class="panel-heading">
250-
Line Chart Example
251-
</div>
252-
<!-- /.panel-heading -->
253-
<div class="panel-body">
254-
<div class="flot-chart">
255-
<div class="flot-chart-content" id="flot-line-chart"></div>
246+
<!-- /.row -->
247+
<div class="row">
248+
<div class="col-lg-12">
249+
<div class="panel panel-default">
250+
<div class="panel-heading">
251+
Line Chart Example
256252
</div>
253+
<!-- /.panel-heading -->
254+
<div class="panel-body">
255+
<div class="flot-chart">
256+
<div class="flot-chart-content" id="flot-line-chart"></div>
257+
</div>
258+
</div>
259+
<!-- /.panel-body -->
257260
</div>
258-
<!-- /.panel-body -->
261+
<!-- /.panel -->
259262
</div>
260-
<!-- /.panel -->
261-
</div>
262-
<!-- /.col-lg-12 -->
263-
<div class="col-lg-6">
264-
<div class="panel panel-default">
265-
<div class="panel-heading">
266-
Pie Chart Example
267-
</div>
268-
<!-- /.panel-heading -->
269-
<div class="panel-body">
270-
<div class="flot-chart">
271-
<div class="flot-chart-content" id="flot-pie-chart"></div>
263+
<!-- /.col-lg-12 -->
264+
<div class="col-lg-6">
265+
<div class="panel panel-default">
266+
<div class="panel-heading">
267+
Pie Chart Example
272268
</div>
269+
<!-- /.panel-heading -->
270+
<div class="panel-body">
271+
<div class="flot-chart">
272+
<div class="flot-chart-content" id="flot-pie-chart"></div>
273+
</div>
274+
</div>
275+
<!-- /.panel-body -->
273276
</div>
274-
<!-- /.panel-body -->
277+
<!-- /.panel -->
275278
</div>
276-
<!-- /.panel -->
277-
</div>
278-
<!-- /.col-lg-6 -->
279-
<div class="col-lg-6">
280-
<div class="panel panel-default">
281-
<div class="panel-heading">
282-
Multiple Axes Line Chart Example
283-
</div>
284-
<!-- /.panel-heading -->
285-
<div class="panel-body">
286-
<div class="flot-chart">
287-
<div class="flot-chart-content" id="flot-line-chart-multi"></div>
279+
<!-- /.col-lg-6 -->
280+
<div class="col-lg-6">
281+
<div class="panel panel-default">
282+
<div class="panel-heading">
283+
Multiple Axes Line Chart Example
284+
</div>
285+
<!-- /.panel-heading -->
286+
<div class="panel-body">
287+
<div class="flot-chart">
288+
<div class="flot-chart-content" id="flot-line-chart-multi"></div>
289+
</div>
288290
</div>
291+
<!-- /.panel-body -->
289292
</div>
290-
<!-- /.panel-body -->
293+
<!-- /.panel -->
291294
</div>
292-
<!-- /.panel -->
293-
</div>
294-
<!-- /.col-lg-6 -->
295-
<div class="col-lg-6">
296-
<div class="panel panel-default">
297-
<div class="panel-heading">
298-
Moving Line Chart Example
299-
</div>
300-
<!-- /.panel-heading -->
301-
<div class="panel-body">
302-
<div class="flot-chart">
303-
<div class="flot-chart-content" id="flot-line-chart-moving"></div>
295+
<!-- /.col-lg-6 -->
296+
<div class="col-lg-6">
297+
<div class="panel panel-default">
298+
<div class="panel-heading">
299+
Moving Line Chart Example
300+
</div>
301+
<!-- /.panel-heading -->
302+
<div class="panel-body">
303+
<div class="flot-chart">
304+
<div class="flot-chart-content" id="flot-line-chart-moving"></div>
305+
</div>
304306
</div>
307+
<!-- /.panel-body -->
305308
</div>
306-
<!-- /.panel-body -->
309+
<!-- /.panel -->
307310
</div>
308-
<!-- /.panel -->
309-
</div>
310-
<!-- /.col-lg-6 -->
311-
<div class="col-lg-6">
312-
<div class="panel panel-default">
313-
<div class="panel-heading">
314-
Bar Chart Example
315-
</div>
316-
<!-- /.panel-heading -->
317-
<div class="panel-body">
318-
<div class="flot-chart">
319-
<div class="flot-chart-content" id="flot-bar-chart"></div>
311+
<!-- /.col-lg-6 -->
312+
<div class="col-lg-6">
313+
<div class="panel panel-default">
314+
<div class="panel-heading">
315+
Bar Chart Example
320316
</div>
317+
<!-- /.panel-heading -->
318+
<div class="panel-body">
319+
<div class="flot-chart">
320+
<div class="flot-chart-content" id="flot-bar-chart"></div>
321+
</div>
322+
</div>
323+
<!-- /.panel-body -->
321324
</div>
322-
<!-- /.panel-body -->
325+
<!-- /.panel -->
323326
</div>
324-
<!-- /.panel -->
325-
</div>
326-
<!-- /.col-lg-6 -->
327-
<div class="col-lg-12">
328-
<div class="panel panel-default">
329-
<div class="panel-heading">
330-
Flot Charts Usage
331-
</div>
332-
<!-- /.panel-heading -->
333-
<div class="panel-body">
334-
<p>Flot is a pure JavaScript plotting library for jQuery, with a focus on simple usage, attractive looks, and interactive features. In SB Admin, we are using the most recent version of Flot along with a few plugins to enhance the user experience. The Flot plugins being used are the tooltip plugin for hoverable tooltips, and the resize plugin for fully responsive charts. The documentation for Flot Charts is available on their website, <a target="_blank" href="http://www.flotcharts.org/">http://www.flotcharts.org/</a>.</p>
335-
<a target="_blank" class="btn btn-default btn-lg btn-block" href="http://www.flotcharts.org/">View Flot Charts Documentation</a>
327+
<!-- /.col-lg-6 -->
328+
<div class="col-lg-12">
329+
<div class="panel panel-default">
330+
<div class="panel-heading">
331+
Flot Charts Usage
332+
</div>
333+
<!-- /.panel-heading -->
334+
<div class="panel-body">
335+
<p>Flot is a pure JavaScript plotting library for jQuery, with a focus on simple usage, attractive looks, and interactive features. In SB Admin, we are using the most recent version of Flot along with a few plugins to enhance the user experience. The Flot plugins being used are the tooltip plugin for hoverable tooltips, and the resize plugin for fully responsive charts. The documentation for Flot Charts is available on their website, <a target="_blank" href="http://www.flotcharts.org/">http://www.flotcharts.org/</a>.</p>
336+
<a target="_blank" class="btn btn-default btn-lg btn-block" href="http://www.flotcharts.org/">View Flot Charts Documentation</a>
337+
</div>
338+
<!-- /.panel-body -->
336339
</div>
337-
<!-- /.panel-body -->
340+
<!-- /.panel -->
338341
</div>
339-
<!-- /.panel -->
342+
<!-- /.col-lg-6 -->
340343
</div>
341-
<!-- /.col-lg-6 -->
344+
<!-- /.row -->
342345
</div>
343-
<!-- /.row -->
346+
<!-- /.container-fluid -->
344347
</div>
345348
<!-- /#page-wrapper -->
346349

0 commit comments

Comments
 (0)