Skip to content

Commit 0d8c85d

Browse files
mdomdo
committed
docs for 3.3.2
1 parent 8fbe580 commit 0d8c85d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+4303
-2540
lines changed

‎about/index.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949

5050
</head>
5151
<body>
52-
<a class="sr-only sr-only-focusable" href="#content">Skip to main content</a>
52+
<a id="skippy" class="sr-only sr-only-focusable" href="#content"><div class="container"><span class="skiplink-text">Skip to main content</span></div></a>
5353

5454
<!-- Docs master nav -->
5555
<header class="navbar navbar-static-top bs-docs-nav" id="top" role="banner">
@@ -334,7 +334,7 @@ <h2>Colors</h2>
334334
<p>Maintained by the <a href="https://github.com/orgs/twbs/people">core team</a> with the help of <a href="https://github.com/twbs/bootstrap/graphs/contributors">our contributors</a>.</p>
335335
<p>Code licensed under <a href="https://github.com/twbs/bootstrap/blob/master/LICENSE" target="_blank">MIT</a>, documentation under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>
336336
<ul class="bs-docs-footer-links text-muted">
337-
<li>Currently v3.3.1</li>
337+
<li>Currently v3.3.2</li>
338338
<li>&middot;</li>
339339
<li><a href="https://github.com/twbs/bootstrap">GitHub</a></li>
340340
<li>&middot;</li>
@@ -358,7 +358,7 @@ <h2>Colors</h2>
358358
<!-- Bootstrap core JavaScript
359359
================================================== -->
360360
<!-- Placed at the end of the document so the pages load faster -->
361-
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
361+
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
362362

363363

364364
<script src="../dist/js/bootstrap.min.js"></script>

‎assets/css/docs.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎assets/css/src/docs.css

Lines changed: 44 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,26 @@ body {
8989
}
9090

9191

92+
/*
93+
* Fancy skip link
94+
*
95+
* Make it look a bit less "bare bones"
96+
*/
97+
98+
#skippy {
99+
display: block;
100+
padding: 1em;
101+
color: #fff;
102+
background-color: #6f5499;
103+
outline: 0;
104+
}
105+
106+
#skippy .skiplink-text {
107+
padding: .5em;
108+
outline: 1px dotted;
109+
}
110+
111+
92112
/*
93113
* Main navigation
94114
*
@@ -137,14 +157,13 @@ body {
137157
padding-top: 40px;
138158
padding-bottom: 40px;
139159
margin-top: 100px;
140-
color: #777;
160+
color: #767676;
141161
text-align: center;
142162
border-top: 1px solid #e5e5e5;
143163
}
144164
.bs-docs-footer-links {
145165
padding-left: 0;
146166
margin-top: 20px;
147-
color: #999;
148167
}
149168
.bs-docs-footer-links li {
150169
display: inline;
@@ -555,7 +574,7 @@ body {
555574
padding: 4px 20px;
556575
font-size: 13px;
557576
font-weight: 500;
558-
color: #999;
577+
color: #767676;
559578
}
560579
.bs-docs-sidebar .nav > li > a:hover,
561580
.bs-docs-sidebar .nav > li > a:focus {
@@ -710,22 +729,22 @@ h1[id] {
710729

711730
/* Variations */
712731
.bs-callout-danger {
713-
border-left-color: #d9534f;
732+
border-left-color: #ce4844;
714733
}
715734
.bs-callout-danger h4 {
716-
color: #d9534f;
735+
color: #ce4844;
717736
}
718737
.bs-callout-warning {
719-
border-left-color: #f0ad4e;
738+
border-left-color: #aa6708;
720739
}
721740
.bs-callout-warning h4 {
722-
color: #f0ad4e;
741+
color: #aa6708;
723742
}
724743
.bs-callout-info {
725-
border-left-color: #5bc0de;
744+
border-left-color: #1b809e;
726745
}
727746
.bs-callout-info h4 {
728-
color: #5bc0de;
747+
color: #1b809e;
729748
}
730749

731750

@@ -956,7 +975,7 @@ h1[id] {
956975

957976
/* Typography */
958977
.bs-example-type .table .type-info {
959-
color: #999;
978+
color: #767676;
960979
vertical-align: middle;
961980
}
962981
.bs-example-type .table td {
@@ -1147,6 +1166,16 @@ h1[id] {
11471166
overflow: auto;
11481167
}
11491168

1169+
/* Simple collapse example */
1170+
#collapseExample .well {
1171+
margin-bottom: 0;
1172+
}
1173+
1174+
/* Don't wrap event names in Events tables in JS plugin docs */
1175+
.bs-events-table > thead > tr > th:first-child,
1176+
.bs-events-table > tbody > tr > td:first-child {
1177+
white-space: nowrap;
1178+
}
11501179

11511180
/*
11521181
* Code snippets
@@ -1402,10 +1431,12 @@ h1[id] {
14021431
border: 2px dashed #eee;
14031432
border-radius: 4px;
14041433
}
1405-
.bs-dropzone h2 {
1406-
margin-top: 0;
1434+
.bs-dropzone .import-header {
14071435
margin-bottom: 5px;
14081436
}
1437+
.bs-dropzone .glyphicon-download-alt {
1438+
font-size: 40px;
1439+
}
14091440
.bs-dropzone hr {
14101441
width: 100px;
14111442
}
@@ -1450,10 +1481,6 @@ h1[id] {
14501481
color: #fff;
14511482
background-color: #563d7c;
14521483
}
1453-
.bs-brand-item .svg {
1454-
width: 144px;
1455-
height: 144px;
1456-
}
14571484

14581485
/* Heading content within */
14591486
.bs-brand-item h1,
@@ -1513,7 +1540,7 @@ h1[id] {
15131540
display: block;
15141541
padding: 5px 8px;
15151542
font-size: 12px;
1516-
color: #777;
1543+
color: #767676;
15171544
cursor: pointer;
15181545
background-color: #fff;
15191546
border: 1px solid #e1e1e8;

‎assets/js/customize.min.js

Lines changed: 11 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎assets/js/docs.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎assets/js/raw-files.min.js

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎assets/js/src/customizer.js

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
window.onload = function () { // wait for load in a dumb way because B-0
1212
'use strict';
1313
var cw = '/*!\n' +
14-
' * Bootstrap v3.3.1 (http://getbootstrap.com)\n' +
14+
' * Bootstrap v3.3.2 (http://getbootstrap.com)\n' +
1515
' * Copyright 2011-' + new Date().getFullYear() + ' Twitter, Inc.\n' +
1616
' * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)\n' +
1717
' */\n\n'
@@ -24,7 +24,8 @@ window.onload = function () { // wait for load in a dumb way because B-0
2424
'<div class="container">' +
2525
'<a href="#bsCustomizerAlert" data-dismiss="alert" class="close pull-right" aria-label="Close" role="button"><span aria-hidden="true">&times;</span></a>' +
2626
'<p class="bs-customizer-alert-text"><span class="glyphicon glyphicon-warning-sign" aria-hidden="true"></span><span class="sr-only">Warning:</span>' + msg + '</p>' +
27-
(err.extract ? '<pre class="bs-customizer-alert-extract">' + err.extract.join('\n') + '</pre>' : '') +
27+
(err.message ? $('<p></p>').text('Error: ' + err.message)[0].outerHTML : '') +
28+
(err.extract ? $('<pre class="bs-customizer-alert-extract"></pre>').text(err.extract.join('\n'))[0].outerHTML : '') +
2829
'</div>' +
2930
'</div>').appendTo('body').alert()
3031
throw err
@@ -38,7 +39,7 @@ window.onload = function () { // wait for load in a dumb way because B-0
3839

3940
function showCallout(msg, showUpTop) {
4041
var callout = $('<div class="bs-callout bs-callout-danger">' +
41-
'<h4>Attention!</h4>' +
42+
'<h4>Attention!</h4>' +
4243
'<p>' + msg + '</p>' +
4344
'</div>')
4445

@@ -258,12 +259,17 @@ window.onload = function () { // wait for load in a dumb way because B-0
258259
filename: baseFilename + '.css'
259260
})
260261

261-
parser.parse(lessSource, function (err, tree) {
262-
if (err) {
263-
return promise.reject(err)
262+
parser.parse(lessSource, function (parseErr, tree) {
263+
if (parseErr) {
264+
return promise.reject(parseErr)
265+
}
266+
try {
267+
intoResult[baseFilename + '.css'] = cw + tree.toCSS()
268+
intoResult[baseFilename + '.min.css'] = cw + tree.toCSS({ compress: true })
269+
}
270+
catch (compileErr) {
271+
return promise.reject(compileErr)
264272
}
265-
intoResult[baseFilename + '.css'] = cw + tree.toCSS()
266-
intoResult[baseFilename + '.min.css'] = cw + tree.toCSS({ compress: true })
267273
promise.resolve()
268274
})
269275

@@ -306,7 +312,7 @@ window.onload = function () { // wait for load in a dumb way because B-0
306312
}
307313
promise.resolve(result)
308314
}).fail(function (err) {
309-
showError('<strong>Ruh roh!</strong> Could not parse less files.', err)
315+
showError('<strong>Ruh roh!</strong> Problem parsing or compiling Less files.', err)
310316
promise.reject()
311317
})
312318

0 commit comments

Comments
 (0)