Skip to content

B
bootstrap
Commit 37933a9e authored by Mark Otto's avatar Mark Otto
Browse files
Options

Merge branch 'master' of github.com:twbs/bootstrap 

Conflicts:
	dist/css/bootstrap.min.css
parents 5d1707a2 c62426da
Show whitespace changes
Inline Side-by-side
Showing with 41 additions and 51 deletions
Gruntfile.js
View file @ 37933a9e
......@@ -8,10 +8,10 @@ module.exports = function(grunt) {
// Metadata.
pkg: grunt.file.readJSON('package.json'),
banner: '/**\n' +
banner: '/*!\n' +
'* Bootstrap v<%= pkg.version %> by @fat and @mdo\n' +
'* Copyright <%= grunt.template.today("yyyy") %> <%= pkg.author %>\n' +
'* Licensed under <%= _.pluck(pkg.licenses, "url").join(", ") %>.\n' +
'* Licensed under <%= _.pluck(pkg.licenses, "url").join(", ") %>\n' +
'*\n' +
'* Designed and built with all the love in the world by @mdo and @fat.\n' +
'*/\n',
......@@ -73,7 +73,8 @@ module.exports = function(grunt) {
recess: {
options: {
compile: true
compile: true,
banner: '<%= banner %>'
},
bootstrap: {
src: ['less/bootstrap.less'],
......
css.html
View file @ 37933a9e
......@@ -74,7 +74,7 @@ base_url: "../"
<p class="lead">Bootstrap includes a responsive, mobile first fluid grid system that appropriately scales up to 12 columns as the device or viewport size increases. It includes <a href="#grid-example-basic">predefined classes</a> for easy layout options, as well as powerful <a href="#grid-less">mixins for generating more semantic layouts</a>.</p>
<h3 id="grid-media-queries">Media queries</h3>
<p>We use the following media queries to create the key breakpoints in our grid system.</p>
<p>We use the following media queries in our LESS files to create the key breakpoints in our grid system.</p>
{% highlight css %}
/* Extra small devices (phones, less than 768px) */
/* No media query since this is the default in Bootstrap */
......
dist/css/bootstrap.css
View file @ 37933a9e
/*!
* Bootstrap v3.0.0
*
* Copyright 2013 Twitter, Inc
* Licensed under the Apache License v2.0
* http://www.apache.org/licenses/LICENSE-2.0
*
* Designed and built with all the love in the world by @mdo and @fat.
*/
/*! normalize.css v2.1.0 | MIT License | git.io/normalize */
article,
......@@ -703,14 +693,15 @@ blockquote:after {
}
address {
display: block;
margin-bottom: 20px;
font-style: normal;
line-height: 1.428571429;
}
code,
pre {
kdb,
pre,
samp {
font-family: Monaco, Menlo, Consolas, "Courier New", monospace;
}
......@@ -6286,7 +6277,8 @@ body.modal-open,
@media screen and (min-width: 768px) {
.carousel-control .glyphicons-chevron-left,
.carousel-control .glyphicons-chevron-right .icon-prev,
.carousel-control .glyphicons-chevron-right,
.carousel-control .icon-prev,
.carousel-control .icon-next {
width: 30px;
height: 30px;
......
dist/css/bootstrap.min.css
View file @ 37933a9e
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/js/bootstrap.js
View file @ 37933a9e
/**
/*!
* Bootstrap v3.0.0 by @fat and @mdo
* Copyright 2013 Twitter Inc.
* Licensed under http://www.apache.org/licenses/LICENSE-2.0.
* Copyright 2013 Twitter, Inc.
* Licensed under http://www.apache.org/licenses/LICENSE-2.0
*
* Designed and built with all the love in the world by @mdo and @fat.
*/
......
dist/js/bootstrap.min.js
View file @ 37933a9e
/**
/*!
* Bootstrap v3.0.0 by @fat and @mdo
* Copyright 2013 Twitter Inc.
* Licensed under http://www.apache.org/licenses/LICENSE-2.0.
* Copyright 2013 Twitter, Inc.
* Licensed under http://www.apache.org/licenses/LICENSE-2.0
*
* Designed and built with all the love in the world by @mdo and @fat.
*/
......
examples/carousel/index.html
View file @ 37933a9e
......@@ -79,7 +79,7 @@
<div class="carousel-caption">
<h1>Example headline.</h1>
<p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p>
<p><a class="btn btn-large btn-primary" href="#" role="button">Sign up today</a></p>
<p><a class="btn btn-lg btn-primary" href="#" role="button">Sign up today</a></p>
</div>
</div>
</div>
......@@ -89,7 +89,7 @@
<div class="carousel-caption">
<h1>Another example headline.</h1>
<p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p>
<p><a class="btn btn-large btn-primary" href="#" role="button">Learn more</a></p>
<p><a class="btn btn-lg btn-primary" href="#" role="button">Learn more</a></p>
</div>
</div>
</div>
......@@ -99,7 +99,7 @@
<div class="carousel-caption">
<h1>One more for good measure.</h1>
<p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p>
<p><a class="btn btn-large btn-primary" href="#" role="button">Browse gallery</a></p>
<p><a class="btn btn-lg btn-primary" href="#" role="button">Browse gallery</a></p>
</div>
</div>
</div>
......
getting-started.html
View file @ 37933a9e
......@@ -397,6 +397,10 @@ bootstrap/
<td><code>.input-large</code></td>
<td><code>.input-lg</code></td>
</tr>
<tr>
<td><code>.control-group</code></td>
<td><code>.form-group</code></td>
</tr>
<tr>
<td><code>.checkbox.inline</code> <code>.radio.inline</code></td>
<td><code>.checkbox-inline</code> <code>.radio-inline</code></td>
......@@ -594,6 +598,16 @@ bootstrap/
<td><code>.row-fluid</code></td>
<td><code>.row</code> (no more fixed grid)</td>
</tr>
<tr>
<td>Controls wrapper</td>
<td><code>.controls</code></td>
<td class="text-muted">N/A</td>
</tr>
<tr>
<td>Controls row</td>
<td><code>.controls-row</code></td>
<td><code>.row</code> or <code>.form-group</code></td>
</tr>
<tr>
<td>Navbar inner</td>
<td><code>.navbar-inner</code></td>
......@@ -617,7 +631,7 @@ bootstrap/
<tr>
<td>Nav lists</td>
<td><code>.nav-list</code> <code>.nav-header</code></td>
<td>No direct equivalent, but <a href="../components/#list-group">List groups</a> and <a href="../javascript/#collapse"><code>.panel-group</code>s</a> are similar.</td>
<td>No direct equivalent, but <a href="../components/#list-group">list groups</a> and <a href="../javascript/#collapse"><code>.panel-group</code>s</a> are similar.</td>
</tr>
</tbody>
</table>
......
less/bootstrap.less
View file @ 37933a9e
/*!
* Bootstrap v3.0.0
*
* Copyright 2013 Twitter, Inc
* Licensed under the Apache License v2.0
* http://www.apache.org/licenses/LICENSE-2.0
*
* Designed and built with all the love in the world by @mdo and @fat.
*/
// Core variables and mixins
@import "variables.less";
@import "mixins.less";
......
less/carousel.less
View file @ 37933a9e
......@@ -195,7 +195,7 @@
// Scale up the controls a smidge
.carousel-control {
.glyphicons-chevron-left,
.glyphicons-chevron-right
.glyphicons-chevron-right,
.icon-prev,
.icon-next {
width: 30px;
......
less/code.less
View file @ 37933a9e
......@@ -5,7 +5,9 @@
// Inline and block code styles
code,
pre {
kdb,
pre,
samp {
font-family: @font-family-monospace;
}
......
less/forms.less
View file @ 37933a9e
......@@ -355,7 +355,7 @@ input[type="checkbox"],
}
// Only right align form labels here when the columns stop stacking
@media (min-width: @screen-sm) {
@media (min-width: @screen-sm-min) {
.control-label {
text-align: right;
}
......
less/type.less
View file @ 37933a9e
......@@ -264,7 +264,6 @@ blockquote:after {
// Addresses
address {
display: block;
margin-bottom: @line-height-computed;
font-style: normal;
line-height: @line-height-base;
......
package.json
View file @ 37933a9e
......@@ -4,7 +4,7 @@
, "version": "3.0.0"
, "keywords": ["bootstrap", "css"]
, "homepage": "http://twbs.github.com/bootstrap/"
, "author": "Twitter Inc."
, "author": "Twitter, Inc."
, "scripts": { "test": "grunt test" }
, "repository": {
"type": "git"
......
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