Skip to content

B
bootstrap
Commit 7a799af9 authored by Mark Otto's avatar Mark Otto
Browse files
Options

fixes and grunt

parent 4bba2d0e
Expand all Show whitespace changes
Inline Side-by-side
Showing with 123 additions and 94 deletions
dist/css/bootstrap.css.map
View file @ 7a799af9
This diff was suppressed by a .gitattributes entry.
docs/assets/js/customize.min.js
View file @ 7a799af9
This diff is collapsed.
docs/assets/js/raw-files.min.js
View file @ 7a799af9
This source diff could not be displayed because it is too large. You can view the blob instead.
docs/assets/js/src/customizer.js
View file @ 7a799af9
......@@ -11,7 +11,7 @@
window.onload = function () { // wait for load in a dumb way because B-0
'use strict';
var cw = '/*!\n' +
' * Bootstrap v3.3.1 (http://getbootstrap.com)\n' +
' * Bootstrap v3.3.0 (http://getbootstrap.com)\n' +
' * Copyright 2011-' + new Date().getFullYear() + ' Twitter, Inc.\n' +
' * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)\n' +
' */\n\n'
......@@ -22,8 +22,8 @@ window.onload = function () { // wait for load in a dumb way because B-0
function showError(msg, err) {
$('<div id="bsCustomizerAlert" class="bs-customizer-alert">' +
'<div class="container">' +
'<a href="#bsCustomizerAlert" data-dismiss="alert" class="close pull-right" aria-label="Close" role="button"><span aria-hidden="true">&times;</span></a>' +
'<p class="bs-customizer-alert-text"><span class="glyphicon glyphicon-warning-sign" aria-hidden="true"></span><span class="sr-only">Warning:</span>' + msg + '</p>' +
'<a href="#bsCustomizerAlert" data-dismiss="alert" class="close pull-right">&times;</a>' +
'<p class="bs-customizer-alert-text"><span class="glyphicon glyphicon-warning-sign"></span>' + msg + '</p>' +
(err.extract ? '<pre class="bs-customizer-alert-extract">' + err.extract.join('\n') + '</pre>' : '') +
'</div>' +
'</div>').appendTo('body').alert()
......@@ -32,7 +32,7 @@ window.onload = function () { // wait for load in a dumb way because B-0
function showSuccess(msg) {
$('<div class="bs-callout bs-callout-info">' +
'<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>' + msg +
'<button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>' + msg +
'</div>').insertAfter('.bs-customize-download')
}
......@@ -50,7 +50,7 @@ window.onload = function () { // wait for load in a dumb way because B-0
}
function showAlert(type, msg, insertAfter) {
$('<div class="alert alert-' + type + '">' + msg + '<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button></div>')
$('<div class="alert alert-' + type + '">' + msg + '<button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button></div>')
.insertAfter(insertAfter)
}
......@@ -293,11 +293,13 @@ window.onload = function () { // wait for load in a dumb way because B-0
})
var bsLessSource = preamble + generateLESS('bootstrap.less', lessFileIncludes, vars)
var themeLessSource = preamble + generateLESS('theme.less', lessFileIncludes, vars)
var prefixer = autoprefixer({ browsers: __configBridge.autoprefixerBrowsers })
$.when(
compileLESS(bsLessSource, 'bootstrap', result),
compileLESS(themeLessSource, 'bootstrap-theme', result)
).done(function () {
for (var key in result) {
result[key] = prefixer.process(result[key]).css
......
docs/components/tables.md
View file @ 7a799af9
This diff is collapsed.
docs/dist/css/bootstrap.css
View file @ 7a799af9
/*!
* Bootstrap v3.3.0 (http://getbootstrap.com)
* Bootstrap v3.3.1 (http://getbootstrap.com)
* Copyright 2011-2014 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/
......@@ -1806,7 +1806,21 @@ fieldset[disabled] .checkbox label {
padding-right: 0;
padding-left: 0;
}
.input-sm,
.input-sm {
height: 2.025rem;
padding: .3rem .75rem;
font-size: .85rem;
line-height: 1.5;
border-radius: .2rem;
}
select.input-sm {
height: 2.025rem;
line-height: 2.025rem;
}
textarea.input-sm,
select[multiple].input-sm {
height: auto;
}
.form-group-sm .form-control {
height: 2.025rem;
padding: .3rem .75rem;
......@@ -1814,18 +1828,29 @@ fieldset[disabled] .checkbox label {
line-height: 1.5;
border-radius: .2rem;
}
select.input-sm,
select.form-group-sm .form-control {
height: 2.025rem;
line-height: 2.025rem;
}
textarea.input-sm,
textarea.form-group-sm .form-control,
select[multiple].input-sm,
select[multiple].form-group-sm .form-control {
height: auto;
}
.input-lg,
.input-lg {
height: 3.3125rem;
padding: .75rem 1.5rem;
font-size: 1.25rem;
line-height: 1.33;
border-radius: .3rem;
}
select.input-lg {
height: 3.3125rem;
line-height: 3.3125rem;
}
textarea.input-lg,
select[multiple].input-lg {
height: auto;
}
.form-group-lg .form-control {
height: 3.3125rem;
padding: .75rem 1.5rem;
......@@ -1833,14 +1858,11 @@ select[multiple].form-group-sm .form-control {
line-height: 1.33;
border-radius: .3rem;
}
select.input-lg,
select.form-group-lg .form-control {
height: 3.3125rem;
line-height: 3.3125rem;
}
textarea.input-lg,
textarea.form-group-lg .form-control,
select[multiple].input-lg,
select[multiple].form-group-lg .form-control {
height: auto;
}
......@@ -2627,7 +2649,7 @@ tbody.collapse.in {
.navbar-fixed-bottom .dropdown .dropdown-menu {
top: auto;
bottom: 100%;
margin-bottom: 1px;
margin-bottom: 2px;
}
@media (min-width: 48em) {
.navbar-right .dropdown-menu {
......@@ -2660,10 +2682,6 @@ tbody.collapse.in {
.btn-group-vertical > .btn.active {
z-index: 2;
}
.btn-group > .btn:focus,
.btn-group-vertical > .btn:focus {
outline: 0;
}
.btn-group .btn + .btn,
.btn-group .btn + .btn-group,
.btn-group .btn-group + .btn,
......@@ -4322,6 +4340,14 @@ a.badge:focus {
.media:first-child {
margin-top: 0;
}
.media,
.media-body {
overflow: hidden;
zoom: 1;
}
.media-object {
display: block;
}
.media-right,
.media > .pull-right {
padding-left: 10px;
......@@ -5035,6 +5061,7 @@ button.close {
height: 20px;
margin-top: -10px;
font-family: serif;
line-height: 1;
}
.carousel-control .icon-prev {
left: 50%;
......
docs/dist/css/bootstrap.css.map
View file @ 7a799af9
This diff was suppressed by a .gitattributes entry.
docs/dist/css/bootstrap.min.css
View file @ 7a799af9
This source diff could not be displayed because it is too large. You can view the blob instead.
docs/javascript/tabs.md
View file @ 7a799af9
......@@ -7,8 +7,8 @@ title: Tabs
Add quick, dynamic tab functionality to transition through panes of local content, even via dropdown menus.
<div class="bs-example bs-example-tabs">
<ul id="myTab" class="nav nav-tabs" role="tabpanel">
<div class="bs-example bs-example-tabs" role="tabpanel">
<ul id="myTab" class="nav nav-tabs" role="tablist">
<li role="presentation" class="active">
<a href="#home" id="home-tab" role="tab" data-toggle="tab" aria-controls="home" aria-expanded="true">Home</a>
</li>
......
docs/layout/responsive-utilities.md
View file @ 7a799af9
......@@ -36,28 +36,28 @@ Use a single or combination of the available classes for toggling content across
</thead>
<tbody>
<tr>
<th scope="rowspan"><code>.visible-xs-*</code></th>
<th scope="row"><code>.visible-xs-*</code></th>
<td class="is-visible">Visible</td>
<td class="is-hidden">Hidden</td>
<td class="is-hidden">Hidden</td>
<td class="is-hidden">Hidden</td>
</tr>
<tr>
<th scope="rowspan"><code>.visible-sm-*</code></th>
<th scope="row"><code>.visible-sm-*</code></th>
<td class="is-hidden">Hidden</td>
<td class="is-visible">Visible</td>
<td class="is-hidden">Hidden</td>
<td class="is-hidden">Hidden</td>
</tr>
<tr>
<th scope="rowspan"><code>.visible-md-*</code></th>
<th scope="row"><code>.visible-md-*</code></th>
<td class="is-hidden">Hidden</td>
<td class="is-hidden">Hidden</td>
<td class="is-visible">Visible</td>
<td class="is-hidden">Hidden</td>
</tr>
<tr>
<th scope="rowspan"><code>.visible-lg-*</code></th>
<th scope="row"><code>.visible-lg-*</code></th>
<td class="is-hidden">Hidden</td>
<td class="is-hidden">Hidden</td>
<td class="is-hidden">Hidden</td>
......@@ -66,28 +66,28 @@ Use a single or combination of the available classes for toggling content across
</tbody>
<tbody>
<tr>
<th scope="rowspan"><code>.hidden-xs</code></th>
<th scope="row"><code>.hidden-xs</code></th>
<td class="is-hidden">Hidden</td>
<td class="is-visible">Visible</td>
<td class="is-visible">Visible</td>
<td class="is-visible">Visible</td>
</tr>
<tr>
<th scope="rowspan"><code>.hidden-sm</code></th>
<th scope="row"><code>.hidden-sm</code></th>
<td class="is-visible">Visible</td>
<td class="is-hidden">Hidden</td>
<td class="is-visible">Visible</td>
<td class="is-visible">Visible</td>
</tr>
<tr>
<th scope="rowspan"><code>.hidden-md</code></th>
<th scope="row"><code>.hidden-md</code></th>
<td class="is-visible">Visible</td>
<td class="is-visible">Visible</td>
<td class="is-hidden">Hidden</td>
<td class="is-visible">Visible</td>
</tr>
<tr>
<th scope="rowspan"><code>.hidden-lg</code></th>
<th scope="row"><code>.hidden-lg</code></th>
<td class="is-visible">Visible</td>
<td class="is-visible">Visible</td>
<td class="is-visible">Visible</td>
......
grunt/bs-raw-files-generator.js
View file @ 7a799af9
......@@ -31,7 +31,7 @@ module.exports = function generateRawFilesJs(grunt, banner) {
if (!banner) {
banner = '';
}
var dirs = ['js', 'less', 'fonts'];
var dirs = ['js', 'less'];
var files = banner + dirs.map(getFiles).reduce(function (combined, file) {
return combined + file;
}, '');
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment