Skip to content

B
bootstrap
Commit f22a077f authored by fat's avatar fat
Browse files
Options

Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip

parents b1d21731 b6390d29
Hide whitespace changes
Inline Side-by-side
Showing with 487 additions and 393 deletions
Gruntfile.js
View file @ f22a077f
/* jshint node: true */ /* jshint node: true */
module.exports = function(grunt) { module.exports = function(grunt) {
"use strict"; "use strict";
// Project configuration. // Project configuration.
grunt.initConfig({ grunt.initConfig({
// Metadata.
pkg: grunt.file.readJSON('package.json'), // Metadata.
banner: '/**\n' + pkg: grunt.file.readJSON('package.json'),
'* <%= pkg.name %>.js v<%= pkg.version %> by @fat and @mdo\n' + banner: '/**\n' +
'* Copyright <%= grunt.template.today("yyyy") %> <%= pkg.author %>\n' + '* <%= pkg.name %>.js v<%= pkg.version %> by @fat and @mdo\n' +
'* <%= _.pluck(pkg.licenses, "url").join(", ") %>\n' + '* Copyright <%= grunt.template.today("yyyy") %> <%= pkg.author %>\n' +
'*/\n', '* <%= _.pluck(pkg.licenses, "url").join(", ") %>\n' +
jqueryCheck: 'if (!jQuery) { throw new Error(\"Bootstrap requires jQuery\") }\n\n', '*/\n',
// Task configuration. jqueryCheck: 'if (!jQuery) { throw new Error(\"Bootstrap requires jQuery\") }\n\n',
clean: {
dist: ['dist'] // Task configuration.
}, clean: {
concat: { dist: ['dist']
options: { },
banner: '<%= banner %><%= jqueryCheck %>',
stripBanners: false jshint: {
}, options: {
bootstrap: { jshintrc: 'js/.jshintrc'
src: ['js/transition.js', 'js/alert.js', 'js/button.js', 'js/carousel.js', 'js/collapse.js', 'js/dropdown.js', 'js/modal.js', 'js/tooltip.js', 'js/popover.js', 'js/scrollspy.js', 'js/tab.js', 'js/affix.js'], },
dest: 'dist/js/<%= pkg.name %>.js' gruntfile: {
} src: 'Gruntfile.js'
}, },
jshint: { src: {
options: { src: ['js/*.js']
jshintrc: 'js/.jshintrc' },
}, test: {
gruntfile: { src: ['js/tests/unit/*.js']
src: 'Gruntfile.js' }
}, },
src: { concat: {
src: ['js/*.js'] options: {
}, banner: '<%= banner %><%= jqueryCheck %>',
test: { stripBanners: false
src: ['js/tests/unit/*.js'] },
} bootstrap: {
}, src: [
recess: { 'js/transition.js',
options: { 'js/alert.js',
compile: true 'js/button.js',
}, 'js/carousel.js',
bootstrap: { 'js/collapse.js',
files: { 'js/dropdown.js',
'dist/css/bootstrap.css': ['less/bootstrap.less'] 'js/modal.js',
} 'js/tooltip.js',
}, 'js/popover.js',
min: { 'js/scrollspy.js',
options: { 'js/tab.js',
compress: true 'js/affix.js'
}, ],
files: { dest: 'dist/js/<%= pkg.name %>.js'
'dist/css/bootstrap.min.css': ['less/bootstrap.less'] }
} },
} uglify: {
}, options: {
uglify: { banner: '<%= banner %>'
options: { },
banner: '<%= banner %>' bootstrap: {
}, src: ['<%= concat.bootstrap.dest %>'],
bootstrap: { dest: 'dist/js/<%= pkg.name %>.min.js'
files: { }
'dist/js/<%= pkg.name %>.min.js': ['<%= concat.bootstrap.dest %>'] },
}
} recess: {
}, options: {
qunit: { compile: true
options: { },
inject: 'js/tests/unit/phantom.js' bootstrap: {
}, src: ['less/bootstrap.less'],
files: ['js/tests/*.html'] dest: 'dist/css/<%= pkg.name %>.css'
}, },
connect: { min: {
server: { options: {
options: { compress: true
port: 3000,
base: '.'
}
}
}, },
watch: { src: ['less/bootstrap.less'],
src: { dest: 'dist/css/<%= pkg.name %>.min.css'
files: '<%= jshint.src.src %>', }
tasks: ['jshint:src', 'qunit'] },
},
test: { qunit: {
files: '<%= jshint.test.src %>', options: {
tasks: ['jshint:test', 'qunit'] inject: 'js/tests/unit/phantom.js'
}, },
recess: { files: ['js/tests/*.html']
files: 'less/*.less', },
tasks: ['recess'] connect: {
} server: {
options: {
port: 3000,
base: '.'
} }
}); }
},
watch: {
src: {
files: '<%= jshint.src.src %>',
tasks: ['jshint:src', 'qunit']
},
test: {
files: '<%= jshint.test.src %>',
tasks: ['jshint:test', 'qunit']
},
recess: {
files: 'less/*.less',
tasks: ['recess']
}
}
});
// These plugins provide necessary tasks. // These plugins provide necessary tasks.
grunt.loadNpmTasks('grunt-contrib-connect'); grunt.loadNpmTasks('grunt-contrib-clean');
grunt.loadNpmTasks('grunt-contrib-clean'); grunt.loadNpmTasks('grunt-contrib-concat');
grunt.loadNpmTasks('grunt-contrib-concat'); grunt.loadNpmTasks('grunt-contrib-connect');
grunt.loadNpmTasks('grunt-contrib-jshint'); grunt.loadNpmTasks('grunt-contrib-jshint');
grunt.loadNpmTasks('grunt-contrib-uglify'); grunt.loadNpmTasks('grunt-contrib-qunit');
grunt.loadNpmTasks('grunt-contrib-qunit'); grunt.loadNpmTasks('grunt-contrib-uglify');
grunt.loadNpmTasks('grunt-contrib-watch'); grunt.loadNpmTasks('grunt-contrib-watch');
grunt.loadNpmTasks('grunt-recess'); grunt.loadNpmTasks('grunt-recess');
// Test task. // Test task.
grunt.registerTask('test', ['jshint', 'qunit']); grunt.registerTask('test', ['jshint', 'qunit']);
// JS distribution task. // JS distribution task.
grunt.registerTask('dist-js', ['concat', 'uglify']); grunt.registerTask('dist-js', ['concat', 'uglify']);
// CSS distribution task. // CSS distribution task.
grunt.registerTask('dist-css', ['recess']); grunt.registerTask('dist-css', ['recess']);
// Full distribution task. // Full distribution task.
grunt.registerTask('dist', ['clean', 'dist-css', 'dist-js']); grunt.registerTask('dist', ['clean', 'dist-css', 'dist-js']);
// Default task. // Default task.
grunt.registerTask('default', ['test', 'dist']); grunt.registerTask('default', ['test', 'dist']);
}; };
_includes/nav-components.html
View file @ f22a077f
...@@ -80,7 +80,13 @@ ...@@ -80,7 +80,13 @@
<li><a href="#type-components-page-header">Page header</a></li> <li><a href="#type-components-page-header">Page header</a></li>
</ul> </ul>
</li> </li>
<li><a href="#thumbnails">Thumbnails</a></li> <li>
<a href="#thumbnails">Thumbnails</a>
<ul class="nav">
<li><a href="#thumbnails-default">Default thumbnails</a></li>
<li><a href="#thumbnails-custom-content">Custom content</a></li>
</ul>
</li>
<li> <li>
<a href="#alerts">Alerts</a> <a href="#alerts">Alerts</a>
<ul class="nav"> <ul class="nav">
...@@ -99,7 +105,13 @@ ...@@ -99,7 +105,13 @@
<li><a href="#progress-stacked">Stacked</a></li> <li><a href="#progress-stacked">Stacked</a></li>
</ul> </ul>
</li> </li>
<li><a href="#media">Media object</a></li> <li>
<a href="#media">Media object</a>
<ul class="nav">
<li><a href="#media-default">Default media</a></li>
<li><a href="#media-list">Media list</a></li>
</ul>
</li>
<li> <li>
<a href="#list-group">List group</a> <a href="#list-group">List group</a>
<ul class="nav"> <ul class="nav">
......
components.html
View file @ f22a077f
...@@ -50,7 +50,7 @@ base_url: "../" ...@@ -50,7 +50,7 @@ base_url: "../"
{% endhighlight %} {% endhighlight %}
<h3 id="dropdowns-headers">Dropdown headers</h3> <h3 id="dropdowns-headers">Dropdown headers</h3>
<p>Add a header to break up label sections of actions in any dropdown menu.</p> <p>Add a header to label sections of actions in any dropdown menu.</p>
<div class="bs-example"> <div class="bs-example">
<div class="dropdown clearfix"> <div class="dropdown clearfix">
<ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu"> <ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu">
...@@ -155,12 +155,11 @@ base_url: "../" ...@@ -155,12 +155,11 @@ base_url: "../"
{% endhighlight %} {% endhighlight %}
<h3 id="btn-groups-nested">Nested button groups</h3> <h3 id="btn-groups-nested">Nested button groups</h3>
<p>Place buttons groups within button groups when you want dropdown menus mixed with a series of buttons.</p> <p>Place a <code>.btn-group</code> within another <code>.btn-group</code> when you want dropdown menus mixed with a series of buttons.</p>
<div class="bs-example"> <div class="bs-example">
<div class="btn-group"> <div class="btn-group">
<button type="button" class="btn btn-default">1</button> <button type="button" class="btn btn-default">1</button>
<button type="button" class="btn btn-default">2</button> <button type="button" class="btn btn-default">2</button>
<button type="button" class="btn btn-default">3</button>
<div class="btn-group"> <div class="btn-group">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"> <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
...@@ -170,11 +169,27 @@ base_url: "../" ...@@ -170,11 +169,27 @@ base_url: "../"
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li><a href="#">Dropdown link</a></li> <li><a href="#">Dropdown link</a></li>
<li><a href="#">Dropdown link</a></li> <li><a href="#">Dropdown link</a></li>
<li><a href="#">Dropdown link</a></li> </ul>
</ul>
</div> </div>
</div> </div>
</div> </div>
{% highlight html %}
<div class="btn-group">
<button type="button" class="btn btn-default">1</button>
<button type="button" class="btn btn-default">2</button>
<div class="btn-group">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
Dropdown
<span class="caret"></span>
</button>
<ul class="dropdown-menu">
<li><a href="#">Dropdown link</a></li>
<li><a href="#">Dropdown link</a></li>
</ul>
</div>
</div>
{% endhighlight %}
<h3 id="btn-groups-vertical">Vertical button groups</h3> <h3 id="btn-groups-vertical">Vertical button groups</h3>
<p>Make a set of buttons appear vertically stacked rather than horizontally.</p> <p>Make a set of buttons appear vertically stacked rather than horizontally.</p>
...@@ -231,7 +246,7 @@ base_url: "../" ...@@ -231,7 +246,7 @@ base_url: "../"
</div> </div>
<h3 id="btn-dropdowns-single">Single button dropdowns</h3> <h3 id="btn-dropdowns-single">Single button dropdowns</h3>
<p>Turn a button into dropdown toggle with some basic markup changes.</p> <p>Turn a button into a dropdown toggle with some basic markup changes.</p>
<div class="bs-example"> <div class="bs-example">
<div class="btn-toolbar" style="margin-bottom: 10px;"> <div class="btn-toolbar" style="margin-bottom: 10px;">
<div class="btn-group"> <div class="btn-group">
...@@ -385,7 +400,7 @@ base_url: "../" ...@@ -385,7 +400,7 @@ base_url: "../"
<div class="bs-example"> <div class="bs-example">
<div class="btn-toolbar" style="margin: 0;"> <div class="btn-toolbar" style="margin: 0;">
<div class="btn-group"> <div class="btn-group">
<button class="btn btn-default btn-large dropdown-toggle" type="button" data-toggle="dropdown"> <button class="btn btn-default btn-lg dropdown-toggle" type="button" data-toggle="dropdown">
Large button <span class="caret"></span> Large button <span class="caret"></span>
</button> </button>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
...@@ -397,7 +412,7 @@ base_url: "../" ...@@ -397,7 +412,7 @@ base_url: "../"
</ul> </ul>
</div><!-- /btn-group --> </div><!-- /btn-group -->
<div class="btn-group"> <div class="btn-group">
<button class="btn btn-default btn-small dropdown-toggle" type="button" data-toggle="dropdown"> <button class="btn btn-default btn-sm dropdown-toggle" type="button" data-toggle="dropdown">
Small button <span class="caret"></span> Small button <span class="caret"></span>
</button> </button>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
...@@ -408,12 +423,24 @@ base_url: "../" ...@@ -408,12 +423,24 @@ base_url: "../"
<li><a href="#">Separated link</a></li> <li><a href="#">Separated link</a></li>
</ul> </ul>
</div><!-- /btn-group --> </div><!-- /btn-group -->
<div class="btn-group">
<button class="btn btn-default btn-xs dropdown-toggle" type="button" data-toggle="dropdown">
Extra small button <span class="caret"></span>
</button>
<ul class="dropdown-menu">
<li><a href="#">Action</a></li>
<li><a href="#">Another action</a></li>
<li><a href="#">Something else here</a></li>
<li class="divider"></li>
<li><a href="#">Separated link</a></li>
</ul>
</div><!-- /btn-group -->
</div><!-- /btn-toolbar --> </div><!-- /btn-toolbar -->
</div><!-- /example --> </div><!-- /example -->
{% highlight html %} {% highlight html %}
<!-- Large button group --> <!-- Large button group -->
<div class="btn-group"> <div class="btn-group">
<button class="btn btn-default btn-large dropdown-toggle" type="button" data-toggle="dropdown"> <button class="btn btn-default btn-lg dropdown-toggle" type="button" data-toggle="dropdown">
Large button <span class="caret"></span> Large button <span class="caret"></span>
</button> </button>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
...@@ -423,13 +450,22 @@ base_url: "../" ...@@ -423,13 +450,22 @@ base_url: "../"
<!-- Small button group --> <!-- Small button group -->
<div class="btn-group"> <div class="btn-group">
<button class="btn btn-default btn-small dropdown-toggle" type="button" data-toggle="dropdown"> <button class="btn btn-default btn-sm dropdown-toggle" type="button" data-toggle="dropdown">
Small button <span class="caret"></span> Small button <span class="caret"></span>
</button> </button>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
... ...
</ul> </ul>
</div> </div>
<!-- Extra small button group -->
<div class="btn-group">
<button class="btn btn-default btn-xs dropdown-toggle" type="button" data-toggle="dropdown">
Extra small button <span class="caret"></span>
</button>
<ul class="dropdown-menu">
...
</ul>
</div> </div>
{% endhighlight %} {% endhighlight %}
...@@ -535,8 +571,8 @@ base_url: "../" ...@@ -535,8 +571,8 @@ base_url: "../"
<p>Add the relative form sizing classes to the <code>.input-group-addon</code>.</p> <p>Add the relative form sizing classes to the <code>.input-group-addon</code>.</p>
<form class="bs-example bs-example-form"> <form class="bs-example bs-example-form">
<div class="input-group"> <div class="input-group">
<span class="input-group-addon input-large">@</span> <span class="input-group-addon input-lg">@</span>
<input type="text" class="form-control input-large" placeholder="Username"> <input type="text" class="form-control input-lg" placeholder="Username">
</div> </div>
<br> <br>
<div class="input-group"> <div class="input-group">
...@@ -545,14 +581,14 @@ base_url: "../" ...@@ -545,14 +581,14 @@ base_url: "../"
</div> </div>
<br> <br>
<div class="input-group"> <div class="input-group">
<span class="input-group-addon input-small">@</span> <span class="input-group-addon input-sm">@</span>
<input type="text" class="form-control input-small" placeholder="Username"> <input type="text" class="form-control input-sm" placeholder="Username">
</div> </div>
</form> </form>
{% highlight html %} {% highlight html %}
<div class="input-group"> <div class="input-group">
<span class="input-group-addon input-large">@</span> <span class="input-group-addon input-lg">@</span>
<input type="text" class="form-control input-large" placeholder="Username"> <input type="text" class="form-control input-lg" placeholder="Username">
</div> </div>
<div class="input-group"> <div class="input-group">
...@@ -561,8 +597,8 @@ base_url: "../" ...@@ -561,8 +597,8 @@ base_url: "../"
</div> </div>
<div class="input-group"> <div class="input-group">
<span class="input-group-addon input-small">@</span> <span class="input-group-addon input-sm">@</span>
<input type="text" class="form-control input-small" placeholder="Username"> <input type="text" class="form-control input-sm" placeholder="Username">
</div> </div>
{% endhighlight %} {% endhighlight %}
...@@ -1446,10 +1482,10 @@ body { padding-bottom: 70px; } ...@@ -1446,10 +1482,10 @@ body { padding-bottom: 70px; }
<h3>Sizes</h3> <h3>Sizes</h3>
<p>Fancy larger or smaller pagination? Add <code>.pagination-large</code> or <code>.pagination-small</code> for additional sizes.</p> <p>Fancy larger or smaller pagination? Add <code>.pagination-lg</code> or <code>.pagination-sm</code> for additional sizes.</p>
<div class="bs-example"> <div class="bs-example">
<div> <div>
<ul class="pagination pagination-large"> <ul class="pagination pagination-lg">
<li><a href="#">&laquo;</a></li> <li><a href="#">&laquo;</a></li>
<li><a href="#">1</a></li> <li><a href="#">1</a></li>
<li><a href="#">2</a></li> <li><a href="#">2</a></li>
...@@ -1471,7 +1507,7 @@ body { padding-bottom: 70px; } ...@@ -1471,7 +1507,7 @@ body { padding-bottom: 70px; }
</ul> </ul>
</div> </div>
<div> <div>
<ul class="pagination pagination-small"> <ul class="pagination pagination-sm">
<li><a href="#">&laquo;</a></li> <li><a href="#">&laquo;</a></li>
<li><a href="#">1</a></li> <li><a href="#">1</a></li>
<li><a href="#">2</a></li> <li><a href="#">2</a></li>
...@@ -1483,9 +1519,9 @@ body { padding-bottom: 70px; } ...@@ -1483,9 +1519,9 @@ body { padding-bottom: 70px; }
</div> </div>
</div> </div>
{% highlight html %} {% highlight html %}
<ul class="pagination pagination-large">...</ul> <ul class="pagination pagination-lg">...</ul>
<ul class="pagination pagination">...</ul> <ul class="pagination pagination">...</ul>
<ul class="pagination pagination-small">...</ul> <ul class="pagination pagination-sm">...</ul>
{% endhighlight %} {% endhighlight %}
...@@ -1659,14 +1695,14 @@ body { padding-bottom: 70px; } ...@@ -1659,14 +1695,14 @@ body { padding-bottom: 70px; }
<div class="jumbotron"> <div class="jumbotron">
<h1>Hello, world!</h1> <h1>Hello, world!</h1>
<p>This is a simple hero unit, a simple jumbotron-style component for calling extra attention to featured content or information.</p> <p>This is a simple hero unit, a simple jumbotron-style component for calling extra attention to featured content or information.</p>
<p><a class="btn btn-primary btn-large">Learn more</a></p> <p><a class="btn btn-primary btn-lg">Learn more</a></p>
</div> </div>
</div> </div>
{% highlight html %} {% highlight html %}
<div class="jumbotron"> <div class="jumbotron">
<h1>Hello, world!</h1> <h1>Hello, world!</h1>
<p>...</p> <p>...</p>
<p><a class="btn btn-primary btn-large">Learn more</a></p> <p><a class="btn btn-primary btn-lg">Learn more</a></p>
</div> </div>
{% endhighlight %} {% endhighlight %}
...@@ -1694,7 +1730,7 @@ body { padding-bottom: 70px; } ...@@ -1694,7 +1730,7 @@ body { padding-bottom: 70px; }
</div> </div>
<p class="lead">Extend Bootstrap's <a href="../css/#grid">grid system</a> with the thumbnail component to easily display grids of images, videos, text, and more.</p> <p class="lead">Extend Bootstrap's <a href="../css/#grid">grid system</a> with the thumbnail component to easily display grids of images, videos, text, and more.</p>
<h3>Default thumbnails</h3> <h3 id="thumbnails-default">Default thumbnails</h3>
<p>By default, Bootstrap's thumbnails are designed to showcase linked images with minimal required markup.</p> <p>By default, Bootstrap's thumbnails are designed to showcase linked images with minimal required markup.</p>
<div class="bs-example"> <div class="bs-example">
<div class="row"> <div class="row">
...@@ -1731,7 +1767,7 @@ body { padding-bottom: 70px; } ...@@ -1731,7 +1767,7 @@ body { padding-bottom: 70px; }
</div> </div>
{% endhighlight %} {% endhighlight %}
<h3>Custom content thumbnails</h3> <h3 id="thumbnails-custom-content">Custom content thumbnails</h3>
<p>With a bit of extra markup, it's possible to add any kind of HTML content like headings, paragraphs, or buttons into thumbnails.</p> <p>With a bit of extra markup, it's possible to add any kind of HTML content like headings, paragraphs, or buttons into thumbnails.</p>
<div class="bs-example"> <div class="bs-example">
<div class="row"> <div class="row">
...@@ -1999,7 +2035,7 @@ body { padding-bottom: 70px; } ...@@ -1999,7 +2035,7 @@ body { padding-bottom: 70px; }
</div> </div>
<p class="lead">Abstract object styles for building various types of components (like blog comments, Tweets, etc) that feature a left- or right-aligned image alongside textual content.</p> <p class="lead">Abstract object styles for building various types of components (like blog comments, Tweets, etc) that feature a left- or right-aligned image alongside textual content.</p>
<h3>Default example</h3> <h3 id="media-default">Default media</h3>
<p>The default media allow to float a media object (images, video, audio) to the left or right of a content block.</p> <p>The default media allow to float a media object (images, video, audio) to the left or right of a content block.</p>
<div class="bs-example"> <div class="bs-example">
<div class="media"> <div class="media">
...@@ -2042,7 +2078,7 @@ body { padding-bottom: 70px; } ...@@ -2042,7 +2078,7 @@ body { padding-bottom: 70px; }
</div> </div>
{% endhighlight %} {% endhighlight %}
<h3>Media list</h3> <h3 id="media-list">Media list</h3>
<p>With a bit of extra markup, you can use media inside list (useful for comment threads or articles lists).</p> <p>With a bit of extra markup, you can use media inside list (useful for comment threads or articles lists).</p>
<div class="bs-example"> <div class="bs-example">
<ul class="media-list"> <ul class="media-list">
...@@ -2350,7 +2386,7 @@ body { padding-bottom: 70px; } ...@@ -2350,7 +2386,7 @@ body { padding-bottom: 70px; }
<p>Some default panel content here. Nulla vitae elit libero, a pharetra augue. Aenean lacinia bibendum nulla sed consectetur. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. Nullam id dolor id nibh ultricies vehicula ut id elit.</p> <p>Some default panel content here. Nulla vitae elit libero, a pharetra augue. Aenean lacinia bibendum nulla sed consectetur. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. Nullam id dolor id nibh ultricies vehicula ut id elit.</p>
<!-- List group --> <!-- List group -->
<ul class="list-group list-group-flush"> <ul class="list-group">
<li class="list-group-item">Cras justo odio</li> <li class="list-group-item">Cras justo odio</li>
<li class="list-group-item">Dapibus ac facilisis in</li> <li class="list-group-item">Dapibus ac facilisis in</li>
<li class="list-group-item">Morbi leo risus</li> <li class="list-group-item">Morbi leo risus</li>
...@@ -2366,7 +2402,7 @@ body { padding-bottom: 70px; } ...@@ -2366,7 +2402,7 @@ body { padding-bottom: 70px; }
<p>...</p> <p>...</p>
<!-- List group --> <!-- List group -->
<ul class="list-group list-group-flush"> <ul class="list-group">
<li class="list-group-item">Cras justo odio</li> <li class="list-group-item">Cras justo odio</li>
<li class="list-group-item">Dapibus ac facilisis in</li> <li class="list-group-item">Dapibus ac facilisis in</li>
<li class="list-group-item">Morbi leo risus</li> <li class="list-group-item">Morbi leo risus</li>
...@@ -2402,20 +2438,20 @@ body { padding-bottom: 70px; } ...@@ -2402,20 +2438,20 @@ body { padding-bottom: 70px; }
<h3>Optional classes</h3> <h3>Optional classes</h3>
<p>Control padding and rounded corners with two optional modifier classes.</p> <p>Control padding and rounded corners with two optional modifier classes.</p>
<div class="bs-example"> <div class="bs-example">
<div class="well well-large"> <div class="well well-lg">
Look, I'm in a well! Look, I'm in a well!
</div> </div>
</div> </div>
{% highlight html %} {% highlight html %}
<div class="well well-large">...</div> <div class="well well-lg">...</div>
{% endhighlight %} {% endhighlight %}
<div class="bs-example"> <div class="bs-example">
<div class="well well-small"> <div class="well well-sm">
Look, I'm in a well! Look, I'm in a well!
</div> </div>
</div> </div>
{% highlight html %} {% highlight html %}
<div class="well well-small">...</div> <div class="well well-sm">...</div>
{% endhighlight %} {% endhighlight %}
</div> </div>
css.html
View file @ f22a077f
...@@ -69,7 +69,7 @@ base_url: "../" ...@@ -69,7 +69,7 @@ base_url: "../"
</div> </div>
<p class="lead">With the launch of Bootstrap 3, icons have been moved to a <a href="https://github.com/twbs/bootstrap-glyphicons">separate repository</a>. This keeps the primary project as lean as possible, makes it easier for folks to swap icon libraries, and makes Glyphicons icon fonts more readily available to more people outside Bootstrap.</p> <p class="lead">With the launch of Bootstrap 3, icons have been moved to a <a href="https://github.com/twbs/bootstrap-glyphicons">separate repository</a>. This keeps the primary project as lean as possible, makes it easier for folks to swap icon libraries, and makes Glyphicons icon fonts more readily available to more people outside Bootstrap.</p>
<p class="lead"> <p class="lead">
<a href="http://glyphicons.getbootstrap.com/" class="btn btn-default btn-large">Visit Glyphicons for Bootstrap</a> or <a href="https://github.com/twbs/bootstrap-glyphicons">download from GitHub</a> <a href="http://glyphicons.getbootstrap.com/" class="btn btn-default btn-lg">Visit Glyphicons for Bootstrap</a> or <a href="https://github.com/twbs/bootstrap-glyphicons">download from GitHub</a>
</p> </p>
</div> </div>
...@@ -91,7 +91,7 @@ base_url: "../" ...@@ -91,7 +91,7 @@ base_url: "../"
<tr> <tr>
<th></th> <th></th>
<th> <th>
Tiny devices Extra small devices
<small>Phones (&lt;768px)</small> <small>Phones (&lt;768px)</small>
</th> </th>
<th> <th>
...@@ -1302,11 +1302,19 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline. ...@@ -1302,11 +1302,19 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
<label for="inputPassword" class="col-lg-2 control-label">Password</label> <label for="inputPassword" class="col-lg-2 control-label">Password</label>
<div class="col-lg-10"> <div class="col-lg-10">
<input type="password" class="form-control" id="inputPassword" placeholder="Password"> <input type="password" class="form-control" id="inputPassword" placeholder="Password">
</div>
</div>
<div class="form-group">
<div class="col-lg-offset-2 col-lg-10">
<div class="checkbox"> <div class="checkbox">
<label> <label>
<input type="checkbox"> Remember me <input type="checkbox"> Remember me
</label> </label>
</div> </div>
</div>
</div>
<div class="form-group">
<div class="col-lg-offset-2 col-lg-10">
<button type="submit" class="btn btn-default">Sign in</button> <button type="submit" class="btn btn-default">Sign in</button>
</div> </div>
</div> </div>
...@@ -1323,11 +1331,19 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline. ...@@ -1323,11 +1331,19 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
<label for="inputPassword" class="col-lg-2 control-label">Password</label> <label for="inputPassword" class="col-lg-2 control-label">Password</label>
<div class="col-lg-10"> <div class="col-lg-10">
<input type="password" class="form-control" id="inputPassword" placeholder="Password"> <input type="password" class="form-control" id="inputPassword" placeholder="Password">
</div>
</div>
<div class="form-group">
<div class="col-lg-offset-2 col-lg-10">
<div class="checkbox"> <div class="checkbox">
<label> <label>
<input type="checkbox"> Remember me <input type="checkbox"> Remember me
</label> </label>
</div> </div>
</div>
</div>
<div class="form-group">
<div class="col-lg-offset-2 col-lg-10">
<button type="submit" class="btn btn-default">Sign in</button> <button type="submit" class="btn btn-default">Sign in</button>
</div> </div>
</div> </div>
...@@ -1569,35 +1585,35 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline. ...@@ -1569,35 +1585,35 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
<h2 id="forms-control-sizes">Control sizing</h2> <h2 id="forms-control-sizes">Control sizing</h2>
<p>Set heights using classes like <code>.input-large</code>, and set widths using grid column classes like <code>.col-lg-*</code>.</p> <p>Set heights using classes like <code>.input-lg</code>, and set widths using grid column classes like <code>.col-lg-*</code>.</p>
<h3>Height sizing</h3> <h3>Height sizing</h3>
<p>Create larger or smaller form controls that match button sizes.</p> <p>Create larger or smaller form controls that match button sizes.</p>
<form class="bs-example bs-example-control-sizing"> <form class="bs-example bs-example-control-sizing">
<div class="controls docs-input-sizes"> <div class="controls docs-input-sizes">
<input class="form-control input-large" type="text" placeholder=".input-large"> <input class="form-control input-lg" type="text" placeholder=".input-lg">
<input type="text" class="form-control" placeholder="Default input"> <input type="text" class="form-control" placeholder="Default input">
<input class="form-control input-small" type="text" placeholder=".input-small"> <input class="form-control input-sm" type="text" placeholder=".input-sm">
<select class="form-control input-large"> <select class="form-control input-lg">
<option value="">.input-large</option> <option value="">.input-lg</option>
</select> </select>
<select class="form-control"> <select class="form-control">
<option value="">Default select</option> <option value="">Default select</option>
</select> </select>
<select class="form-control input-small"> <select class="form-control input-sm">
<option value="">.input-small</option> <option value="">.input-sm</option>
</select> </select>
</div> </div>
</form> </form>
{% highlight html %} {% highlight html %}
<input class="form-control input-large" type="text" placeholder=".input-large"> <input class="form-control input-lg" type="text" placeholder=".input-lg">
<input class="form-control" type="text" placeholder="Default input"> <input class="form-control" type="text" placeholder="Default input">
<input class="form-control input-small" type="text" placeholder=".input-small"> <input class="form-control input-sm" type="text" placeholder=".input-sm">
<select class="form-control input-large">...</select> <select class="form-control input-lg">...</select>
<select class="form-control">...</select> <select class="form-control">...</select>
<select class="form-control input-small">...</select> <select class="form-control input-sm">...</select>
{% endhighlight %} {% endhighlight %}
<h3>Column sizing</h3> <h3>Column sizing</h3>
...@@ -1685,54 +1701,54 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline. ...@@ -1685,54 +1701,54 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
{% endhighlight %} {% endhighlight %}
<h2 id="buttons-sizes">Button sizes</h2> <h2 id="buttons-sizes">Button sizes</h2>
<p>Fancy larger or smaller buttons? Add <code>.btn-large</code> or <code>.btn-small</code> for additional sizes.</p> <p>Fancy larger or smaller buttons? Add <code>.btn-lg</code>, <code>.btn-sm</code>, or <code>.btn-xs</code> for additional sizes.</p>
<div class="bs-example"> <div class="bs-example">
<p> <p>
<button type="button" class="btn btn-primary btn-large">Large button</button> <button type="button" class="btn btn-primary btn-lg">Large button</button>
<button type="button" class="btn btn-default btn-large">Large button</button> <button type="button" class="btn btn-default btn-lg">Large button</button>
</p> </p>
<p> <p>
<button type="button" class="btn btn-primary">Default button</button> <button type="button" class="btn btn-primary">Default button</button>
<button type="button" class="btn btn-default">Default button</button> <button type="button" class="btn btn-default">Default button</button>
</p> </p>
<p> <p>
<button type="button" class="btn btn-primary btn-small">Small button</button> <button type="button" class="btn btn-primary btn-sm">Small button</button>
<button type="button" class="btn btn-default btn-small">Small button</button> <button type="button" class="btn btn-default btn-sm">Small button</button>
</p> </p>
<p> <p>
<button type="button" class="btn btn-primary btn-mini">Mini button</button> <button type="button" class="btn btn-primary btn-xs">Extra small button</button>
<button type="button" class="btn btn-default btn-mini">Mini button</button> <button type="button" class="btn btn-default btn-xs">Extra small button</button>
</p> </p>
</div> </div>
{% highlight html %} {% highlight html %}
<p> <p>
<button type="button" class="btn btn-primary btn-large">Large button</button> <button type="button" class="btn btn-primary btn-lg">Large button</button>
<button type="button" class="btn btn-default btn-large">Large button</button> <button type="button" class="btn btn-default btn-lg">Large button</button>
</p> </p>
<p> <p>
<button type="button" class="btn btn-primary">Default button</button> <button type="button" class="btn btn-primary">Default button</button>
<button type="button" class="btn btn-default">Default button</button> <button type="button" class="btn btn-default">Default button</button>
</p> </p>
<p> <p>
<button type="button" class="btn btn-primary btn-small">Small button</button> <button type="button" class="btn btn-primary btn-sm">Small button</button>
<button type="button" class="btn btn-default btn-small">Small button</button> <button type="button" class="btn btn-default btn-sm">Small button</button>
</p> </p>
<p> <p>
<button type="button" class="btn btn-primary btn-mini">Mini button</button> <button type="button" class="btn btn-primary btn-xs">Extra small button</button>
<button type="button" class="btn btn-default btn-mini">Mini button</button> <button type="button" class="btn btn-default btn-xs">Extra small button</button>
</p> </p>
{% endhighlight %} {% endhighlight %}
<p>Create block level buttons&mdash;those that span the full width of a parent&mdash; by adding <code>.btn-block</code>.</p> <p>Create block level buttons&mdash;those that span the full width of a parent&mdash; by adding <code>.btn-block</code>.</p>
<div class="bs-example"> <div class="bs-example">
<div class="well" style="max-width: 400px; margin: 0 auto 10px;"> <div class="well" style="max-width: 400px; margin: 0 auto 10px;">
<button type="button" class="btn btn-primary btn-large btn-block">Block level button</button> <button type="button" class="btn btn-primary btn-lg btn-block">Block level button</button>
<button type="button" class="btn btn-default btn-large btn-block">Block level button</button> <button type="button" class="btn btn-default btn-lg btn-block">Block level button</button>
</div> </div>
</div> </div>
{% highlight html %} {% highlight html %}
<button type="button" class="btn btn-primary btn-large btn-block">Block level button</button> <button type="button" class="btn btn-primary btn-lg btn-block">Block level button</button>
<button type="button" class="btn btn-default btn-large btn-block">Block level button</button> <button type="button" class="btn btn-default btn-lg btn-block">Block level button</button>
{% endhighlight %} {% endhighlight %}
...@@ -1742,12 +1758,12 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline. ...@@ -1742,12 +1758,12 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
<h3>Button element</h3> <h3>Button element</h3>
<p>Add the <code>disabled</code> attribute to <code>&lt;button&gt;</code> buttons.</p> <p>Add the <code>disabled</code> attribute to <code>&lt;button&gt;</code> buttons.</p>
<p class="bs-example"> <p class="bs-example">
<button type="button" class="btn btn-primary btn-large" disabled="disabled">Primary button</button> <button type="button" class="btn btn-primary btn-lg" disabled="disabled">Primary button</button>
<button type="button" class="btn btn-default btn-large" disabled="disabled">Button</button> <button type="button" class="btn btn-default btn-lg" disabled="disabled">Button</button>
</p> </p>
{% highlight html %} {% highlight html %}
<button type="button" class="btn btn-large btn-primary" disabled="disabled">Primary button</button> <button type="button" class="btn btn-lg btn-primary" disabled="disabled">Primary button</button>
<button type="button" class="btn btn-default btn-large" disabled="disabled">Button</button> <button type="button" class="btn btn-default btn-lg" disabled="disabled">Button</button>
{% endhighlight %} {% endhighlight %}
<div class="bs-callout bs-callout-danger"> <div class="bs-callout bs-callout-danger">
...@@ -1758,12 +1774,12 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline. ...@@ -1758,12 +1774,12 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
<h3>Anchor element</h3> <h3>Anchor element</h3>
<p>Add the <code>.disabled</code> class to <code>&lt;a&gt;</code> buttons.</p> <p>Add the <code>.disabled</code> class to <code>&lt;a&gt;</code> buttons.</p>
<p class="bs-example"> <p class="bs-example">
<a href="#" class="btn btn-primary btn-large disabled">Primary link</a> <a href="#" class="btn btn-primary btn-lg disabled">Primary link</a>
<a href="#" class="btn btn-default btn-large disabled">Link</a> <a href="#" class="btn btn-default btn-lg disabled">Link</a>
</p> </p>
{% highlight html %} {% highlight html %}
<a href="#" class="btn btn-primary btn-large disabled">Primary link</a> <a href="#" class="btn btn-primary btn-lg disabled">Primary link</a>
<a href="#" class="btn btn-default btn-large disabled">Link</a> <a href="#" class="btn btn-default btn-lg disabled">Link</a>
{% endhighlight %} {% endhighlight %}
<p> <p>
We use <code>.disabled</code> as a utility class here, similar to the common <code>.active</code> class, so no prefix is required. We use <code>.disabled</code> as a utility class here, similar to the common <code>.active</code> class, so no prefix is required.
......
customize.html
View file @ f22a077f
...@@ -486,7 +486,7 @@ base_url: "../" ...@@ -486,7 +486,7 @@ base_url: "../"
<p>Define the breakpoints at which your layout will change, adapting to different screen sizes.</p> <p>Define the breakpoints at which your layout will change, adapting to different screen sizes.</p>
<div class="row"> <div class="row">
<div class="col-lg-6"> <div class="col-lg-6">
<label>@screen-tiny</label> <label>@screen-xsmall</label>
<input type="text" class="form-control" placeholder="480px"> <input type="text" class="form-control" placeholder="480px">
<label>@screen-small</label> <label>@screen-small</label>
<input type="text" class="form-control" placeholder="768px"> <input type="text" class="form-control" placeholder="768px">
...@@ -1439,7 +1439,7 @@ base_url: "../" ...@@ -1439,7 +1439,7 @@ base_url: "../"
</div> </div>
<p class="lead">Hooray! Your custom version of Bootstrap is now ready to be compiled. Just click the button below to finish the process.</p> <p class="lead">Hooray! Your custom version of Bootstrap is now ready to be compiled. Just click the button below to finish the process.</p>
<div class="bs-customize-download"> <div class="bs-customize-download">
<a class="btn btn-block btn-large btn-bs" href="#" onclick="_gaq.push(['_trackEvent', 'Customize', 'Download', 'Customize and Download']);">Customize and Download</a> <a class="btn btn-block btn-lg btn-bs" href="#" onclick="_gaq.push(['_trackEvent', 'Customize', 'Download', 'Customize and Download']);">Customize and Download</a>
</div> </div>
<div class="bs-callout bs-callout-danger"> <div class="bs-callout bs-callout-danger">
<h4>What's included?</h4> <h4>What's included?</h4>
......
dist/css/bootstrap.css
View file @ f22a077f
...@@ -1537,7 +1537,7 @@ textarea.form-control { ...@@ -1537,7 +1537,7 @@ textarea.form-control {
margin-left: 10px; margin-left: 10px;
} }
.input-large { .input-lg {
height: 45px; height: 45px;
padding: 10px 16px; padding: 10px 16px;
font-size: 18px; font-size: 18px;
...@@ -1545,7 +1545,7 @@ textarea.form-control { ...@@ -1545,7 +1545,7 @@ textarea.form-control {
border-radius: 6px; border-radius: 6px;
} }
.input-small { .input-sm {
height: 30px; height: 30px;
padding: 5px 10px; padding: 5px 10px;
font-size: 12px; font-size: 12px;
...@@ -1553,18 +1553,18 @@ textarea.form-control { ...@@ -1553,18 +1553,18 @@ textarea.form-control {
border-radius: 3px; border-radius: 3px;
} }
select.input-large { select.input-lg {
height: 45px; height: 45px;
line-height: 45px; line-height: 45px;
} }
select.input-small { select.input-sm {
height: 30px; height: 30px;
line-height: 30px; line-height: 30px;
} }
textarea.input-large, textarea.input-lg,
textarea.input-small { textarea.input-sm {
height: auto; height: auto;
} }
...@@ -1647,6 +1647,62 @@ textarea.input-small { ...@@ -1647,6 +1647,62 @@ textarea.input-small {
color: #737373; color: #737373;
} }
.form-inline .form-control,
.form-inline .radio,
.form-inline .checkbox {
display: inline-block;
}
.form-inline .radio,
.form-inline .checkbox {
margin-top: 0;
margin-bottom: 0;
}
.form-horizontal .control-label,
.form-horizontal .radio-inline,
.form-horizontal .checkbox-inline {
padding-top: 9px;
}
.form-horizontal .form-group:before,
.form-horizontal .form-group:after {
display: table;
content: " ";
}
.form-horizontal .form-group:after {
clear: both;
}
.form-horizontal .form-group:before,
.form-horizontal .form-group:after {
display: table;
content: " ";
}
.form-horizontal .form-group:after {
clear: both;
}
@media (min-width: 768px) {
.form-horizontal .form-group {
margin-right: -15px;
margin-left: -15px;
}
}
.form-horizontal .form-group .row {
margin-right: -15px;
margin-left: -15px;
}
@media (min-width: 768px) {
.form-horizontal .control-label {
text-align: right;
}
}
.btn { .btn {
display: inline-block; display: inline-block;
padding: 6px 12px; padding: 6px 12px;
...@@ -1933,22 +1989,22 @@ fieldset[disabled] .btn-link:focus { ...@@ -1933,22 +1989,22 @@ fieldset[disabled] .btn-link:focus {
text-decoration: none; text-decoration: none;
} }
.btn-large { .btn-lg {
padding: 10px 16px; padding: 10px 16px;
font-size: 18px; font-size: 18px;
line-height: 1.33; line-height: 1.33;
border-radius: 6px; border-radius: 6px;
} }
.btn-small, .btn-sm,
.btn-mini { .btn-xs {
padding: 5px 10px; padding: 5px 10px;
font-size: 12px; font-size: 12px;
line-height: 1.5; line-height: 1.5;
border-radius: 3px; border-radius: 3px;
} }
.btn-mini { .btn-xs {
padding: 3px 5px; padding: 3px 5px;
} }
...@@ -2045,15 +2101,17 @@ input[type="button"].btn-block { ...@@ -2045,15 +2101,17 @@ input[type="button"].btn-block {
box-sizing: border-box; box-sizing: border-box;
} }
.input-group-addon.input-small { .input-group-addon.input-sm {
padding: 5px 10px; padding: 5px 10px;
font-size: 12px; font-size: 12px;
line-height: 1.5;
border-radius: 3px; border-radius: 3px;
} }
.input-group-addon.input-large { .input-group-addon.input-lg {
padding: 10px 16px; padding: 10px 16px;
font-size: 18px; font-size: 18px;
line-height: 1.33;
border-radius: 6px; border-radius: 6px;
} }
...@@ -2106,62 +2164,6 @@ input[type="button"].btn-block { ...@@ -2106,62 +2164,6 @@ input[type="button"].btn-block {
z-index: 2; z-index: 2;
} }
.form-inline .form-control,
.form-inline .radio,
.form-inline .checkbox {
display: inline-block;
}
.form-inline .radio,
.form-inline .checkbox {
margin-top: 0;
margin-bottom: 0;
}
.form-horizontal .control-label,
.form-horizontal .radio-inline,
.form-horizontal .checkbox-inline {
padding-top: 9px;
}
.form-horizontal .form-group:before,
.form-horizontal .form-group:after {
display: table;
content: " ";
}
.form-horizontal .form-group:after {
clear: both;
}
.form-horizontal .form-group:before,
.form-horizontal .form-group:after {
display: table;
content: " ";
}
.form-horizontal .form-group:after {
clear: both;
}
@media (min-width: 768px) {
.form-horizontal .form-group {
margin-right: -15px;
margin-left: -15px;
}
}
.form-horizontal .form-group .row {
margin-right: -15px;
margin-left: -15px;
}
@media (min-width: 768px) {
.form-horizontal .control-label {
text-align: right;
}
}
.caret { .caret {
display: inline-block; display: inline-block;
width: 0; width: 0;
...@@ -2386,6 +2388,23 @@ a.list-group-item.active .list-group-item-text { ...@@ -2386,6 +2388,23 @@ a.list-group-item.active .list-group-item-text {
box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05); box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05);
} }
.panel .list-group {
margin: 15px -15px -15px;
}
.panel .list-group .list-group-item {
border-width: 1px 0;
}
.panel .list-group .list-group-item:first-child {
border-top-right-radius: 0;
border-top-left-radius: 0;
}
.panel .list-group .list-group-item:last-child {
border-bottom: 0;
}
.panel-heading { .panel-heading {
padding: 10px 15px; padding: 10px 15px;
margin: -15px -15px 15px; margin: -15px -15px 15px;
...@@ -2461,23 +2480,6 @@ a.list-group-item.active .list-group-item-text { ...@@ -2461,23 +2480,6 @@ a.list-group-item.active .list-group-item-text {
border-color: #bce8f1; border-color: #bce8f1;
} }
.list-group-flush {
margin: 15px -15px -15px;
}
.list-group-flush .list-group-item {
border-width: 1px 0;
}
.list-group-flush .list-group-item:first-child {
border-top-right-radius: 0;
border-top-left-radius: 0;
}
.list-group-flush .list-group-item:last-child {
border-bottom: 0;
}
.well { .well {
min-height: 20px; min-height: 20px;
padding: 19px; padding: 19px;
...@@ -2494,12 +2496,12 @@ a.list-group-item.active .list-group-item-text { ...@@ -2494,12 +2496,12 @@ a.list-group-item.active .list-group-item-text {
border-color: rgba(0, 0, 0, 0.15); border-color: rgba(0, 0, 0, 0.15);
} }
.well-large { .well-lg {
padding: 24px; padding: 24px;
border-radius: 6px; border-radius: 6px;
} }
.well-small { .well-sm {
padding: 9px; padding: 9px;
border-radius: 3px; border-radius: 3px;
} }
...@@ -3083,6 +3085,8 @@ button.close { ...@@ -3083,6 +3085,8 @@ button.close {
} }
.navbar-text { .navbar-text {
float: left;
padding: 0 15px;
margin-top: 15px; margin-top: 15px;
margin-bottom: 15px; margin-bottom: 15px;
} }
...@@ -3216,7 +3220,7 @@ button.close { ...@@ -3216,7 +3220,7 @@ button.close {
padding-left: 8px; padding-left: 8px;
} }
.btn-group > .btn-large + .dropdown-toggle { .btn-group > .btn-lg + .dropdown-toggle {
padding-right: 12px; padding-right: 12px;
padding-left: 12px; padding-left: 12px;
} }
...@@ -3230,11 +3234,11 @@ button.close { ...@@ -3230,11 +3234,11 @@ button.close {
margin-left: 0; margin-left: 0;
} }
.btn-large .caret { .btn-lg .caret {
border-width: 5px; border-width: 5px;
} }
.dropup .btn-large .caret { .dropup .btn-lg .caret {
border-bottom-width: 5px; border-bottom-width: 5px;
} }
...@@ -3266,6 +3270,7 @@ button.close { ...@@ -3266,6 +3270,7 @@ button.close {
.btn-group-justified { .btn-group-justified {
display: table; display: table;
width: 100%; width: 100%;
table-layout: fixed;
} }
.btn-group-justified .btn { .btn-group-justified .btn {
...@@ -3315,7 +3320,7 @@ button.close { ...@@ -3315,7 +3320,7 @@ button.close {
.pagination > li > a, .pagination > li > a,
.pagination > li > span { .pagination > li > span {
float: left; float: left;
padding: 4px 12px; padding: 6px 12px;
line-height: 1.428571429; line-height: 1.428571429;
text-decoration: none; text-decoration: none;
background-color: #ffffff; background-color: #ffffff;
...@@ -3358,38 +3363,38 @@ button.close { ...@@ -3358,38 +3363,38 @@ button.close {
background-color: #ffffff; background-color: #ffffff;
} }
.pagination-large > li > a, .pagination-lg > li > a,
.pagination-large > li > span { .pagination-lg > li > span {
padding: 10px 16px; padding: 10px 16px;
font-size: 18px; font-size: 18px;
} }
.pagination-large > li:first-child > a, .pagination-lg > li:first-child > a,
.pagination-large > li:first-child > span { .pagination-lg > li:first-child > span {
border-bottom-left-radius: 6px; border-bottom-left-radius: 6px;
border-top-left-radius: 6px; border-top-left-radius: 6px;
} }
.pagination-large > li:last-child > a, .pagination-lg > li:last-child > a,
.pagination-large > li:last-child > span { .pagination-lg > li:last-child > span {
border-top-right-radius: 6px; border-top-right-radius: 6px;
border-bottom-right-radius: 6px; border-bottom-right-radius: 6px;
} }
.pagination-small > li > a, .pagination-sm > li > a,
.pagination-small > li > span { .pagination-sm > li > span {
padding: 5px 10px; padding: 5px 10px;
font-size: 12px; font-size: 12px;
} }
.pagination-small > li:first-child > a, .pagination-sm > li:first-child > a,
.pagination-small > li:first-child > span { .pagination-sm > li:first-child > span {
border-bottom-left-radius: 3px; border-bottom-left-radius: 3px;
border-top-left-radius: 3px; border-top-left-radius: 3px;
} }
.pagination-small > li:last-child > a, .pagination-sm > li:last-child > a,
.pagination-small > li:last-child > span { .pagination-sm > li:last-child > span {
border-top-right-radius: 3px; border-top-right-radius: 3px;
border-bottom-right-radius: 3px; border-bottom-right-radius: 3px;
} }
......
dist/css/bootstrap.min.css
View file @ f22a077f
This source diff could not be displayed because it is too large. You can view the blob instead.
getting-started.html
View file @ f22a077f
...@@ -17,7 +17,7 @@ base_url: "../" ...@@ -17,7 +17,7 @@ base_url: "../"
<h3>Download compiled CSS and JS</h3> <h3>Download compiled CSS and JS</h3>
<p class="lead">The fastest way to get started is to get the compiled and minified versions of our CSS and JavaScript. No documentation or original source files are included.</p> <p class="lead">The fastest way to get started is to get the compiled and minified versions of our CSS and JavaScript. No documentation or original source files are included.</p>
<p><a class="btn btn-large btn-primary" href="{{ site.download_dist }}" onclick="_gaq.push(['_trackEvent', 'Getting started', 'Download', 'Download compiled']);">Download Bootstrap</a></p> <p><a class="btn btn-lg btn-primary" href="{{ site.download_dist }}" onclick="_gaq.push(['_trackEvent', 'Getting started', 'Download', 'Download compiled']);">Download Bootstrap</a></p>
<hr> <hr>
......
index.html
View file @ f22a077f
...@@ -9,7 +9,7 @@ base_url: "./" ...@@ -9,7 +9,7 @@ base_url: "./"
<h1>Bootstrap 3</h1> <h1>Bootstrap 3</h1>
<p class="lead">Sleek, intuitive, and powerful mobile-first front-end framework for faster and easier web development.</p> <p class="lead">Sleek, intuitive, and powerful mobile-first front-end framework for faster and easier web development.</p>
<p> <p>
<a href="{{ site.download_dist }}" class="btn btn-outline btn-large" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Download', 'Download 3.0.0 RC1']);">Download Bootstrap</a> <a href="{{ site.download_dist }}" class="btn btn-outline btn-lg" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Download', 'Download 3.0.0 RC1']);">Download Bootstrap</a>
</p> </p>
</div> </div>
</div> </div>
javascript.html
View file @ f22a077f
...@@ -15,7 +15,7 @@ base_url: "../" ...@@ -15,7 +15,7 @@ base_url: "../"
</div> </div>
<h3 id="js-individual-compiled">Individual or compiled</h3> <h3 id="js-individual-compiled">Individual or compiled</h3>
<p>Plugins can be included individually (using bootstrap's individual <code>*.js</code> files, or all at once (using <code>bootstrap.js</code> or the minified <code>bootstrap.min.js</code>.</p> <p>Plugins can be included individually (using Bootstrap's individual <code>*.js</code> files, or all at once (using <code>bootstrap.js</code> or the minified <code>bootstrap.min.js</code>.</p>
<div class="bs-callout bs-callout-danger"> <div class="bs-callout bs-callout-danger">
<h4>Do not attempt to include both.</h4> <h4>Do not attempt to include both.</h4>
...@@ -28,7 +28,7 @@ base_url: "../" ...@@ -28,7 +28,7 @@ base_url: "../"
</div> </div>
<h3 id="js-data-attrs">Data attributes</h3> <h3 id="js-data-attrs">Data attributes</h3>
<p>You can use all Bootstrap plugins purely through the markup API without writing a single line of JavaScript. This is Bootstrap's first class API and should be your first consideration when using a plugin.</p> <p>You can use all Bootstrap plugins purely through the markup API without writing a single line of JavaScript. This is Bootstrap's first-class API and should be your first consideration when using a plugin.</p>
<p>That said, in some situations it may be desirable to turn this functionality off. Therefore, we also provide the ability to disable the data attribute API by unbinding all events on the document namespaced with <code>data-api</code>. This looks like this: <p>That said, in some situations it may be desirable to turn this functionality off. Therefore, we also provide the ability to disable the data attribute API by unbinding all events on the document namespaced with <code>data-api</code>. This looks like this:
{% highlight js %} {% highlight js %}
...@@ -59,12 +59,12 @@ $("#myModal").modal('show') // initializes and invokes show immed ...@@ -59,12 +59,12 @@ $("#myModal").modal('show') // initializes and invokes show immed
<p>Sometimes it is necessary to use Bootstrap plugins with other UI frameworks. In these circumstances, namespace collisions can occasionally occur. If this happens, you may call <code>.noConflict</code> on the plugin you wish to revert the value of.</p> <p>Sometimes it is necessary to use Bootstrap plugins with other UI frameworks. In these circumstances, namespace collisions can occasionally occur. If this happens, you may call <code>.noConflict</code> on the plugin you wish to revert the value of.</p>
{% highlight js %} {% highlight js %}
var bootstrapButton = $.fn.button.noConflict() // return $.fn.button to previously assigned value var bootstrapButton = $.fn.button.noConflict() // return $.fn.button to previously assigned value
$.fn.bootstrapBtn = bootstrapButton // give $().bootstrapBtn the bootstrap functionality $.fn.bootstrapBtn = bootstrapButton // give $().bootstrapBtn the Bootstrap functionality
{% endhighlight %} {% endhighlight %}
<h3 id="js-events">Events</h3> <h3 id="js-events">Events</h3>
<p>Bootstrap provides custom events for most plugin's unique actions. Generally, these come in an infinitive and past participle form - where the infinitive (ex. <code>show</code>) is triggered at the start of an event, and its past participle form (ex. <code>shown</code>) is trigger on the completion of an action.</p> <p>Bootstrap provides custom events for most plugin's unique actions. Generally, these come in an infinitive and past participle form - where the infinitive (ex. <code>show</code>) is triggered at the start of an event, and its past participle form (ex. <code>shown</code>) is trigger on the completion of an action.</p>
<p>As of 3.0.0, all bootstrap events are namespaced.</p> <p>As of 3.0.0, all Bootstrap events are namespaced.</p>
<p>All infinitive events provide <code>preventDefault</code> functionality. This provides the ability to stop the execution of an action before it starts.</p> <p>All infinitive events provide <code>preventDefault</code> functionality. This provides the ability to stop the execution of an action before it starts.</p>
{% highlight js %} {% highlight js %}
$('#myModal').on('show.bs.modal', function (e) { $('#myModal').on('show.bs.modal', function (e) {
...@@ -89,7 +89,7 @@ $('#myModal').on('show.bs.modal', function (e) { ...@@ -89,7 +89,7 @@ $('#myModal').on('show.bs.modal', function (e) {
<h3>About transitions</h3> <h3>About transitions</h3>
<p>For simple transition effects, include <code>transition.js</code> once alongside the other JS files. If you're using the compiled (or minified) <code>bootstrap.js</code>, there is no need to include this&mdash;it's already there.</p> <p>For simple transition effects, include <code>transition.js</code> once alongside the other JS files. If you're using the compiled (or minified) <code>bootstrap.js</code>, there is no need to include this&mdash;it's already there.</p>
<h3>What's inside</h3> <h3>What's inside</h3>
<p>Transition.js is a basic helper for transitionEnd events as well as a css transition emulator. It's used by the other plugins to check for css transition support and to catch hanging transitions.</p> <p>Transition.js is a basic helper for <code>transitionEnd</code> events as well as a CSS transition emulator. It's used by the other plugins to check for CSS transition support and to catch hanging transitions.</p>
</div> </div>
...@@ -189,11 +189,11 @@ $('#myModal').on('show.bs.modal', function (e) { ...@@ -189,11 +189,11 @@ $('#myModal').on('show.bs.modal', function (e) {
</div><!-- /.modal --> </div><!-- /.modal -->
<div class="bs-example" style="padding-bottom: 24px;"> <div class="bs-example" style="padding-bottom: 24px;">
<a data-toggle="modal" href="#myModal" class="btn btn-primary btn-large">Launch demo modal</a> <a data-toggle="modal" href="#myModal" class="btn btn-primary btn-lg">Launch demo modal</a>
</div><!-- /example --> </div><!-- /example -->
{% highlight html %} {% highlight html %}
<!-- Button trigger modal --> <!-- Button trigger modal -->
<a data-toggle="modal" href="#myModal" class="btn btn-primary btn-large">Launch demo modal</a> <a data-toggle="modal" href="#myModal" class="btn btn-primary btn-lg">Launch demo modal</a>
<!-- Modal --> <!-- Modal -->
<div class="modal fade" id="myModal"> <div class="modal fade" id="myModal">
...@@ -465,7 +465,7 @@ $('.dropdown-toggle').dropdown() ...@@ -465,7 +465,7 @@ $('.dropdown-toggle').dropdown()
<h3>Methods</h3> <h3>Methods</h3>
<h4>$().dropdown('toggle')</h4> <h4>$().dropdown('toggle')</h4>
<p>A programmatic api for toggling menus for a given navbar or tabbed navigation.</p> <p>Toggles the dropdown menu of a given navbar or tabbed navigation.</p>
</div> </div>
...@@ -957,7 +957,7 @@ $('#myTooltip').on('hidden.bs.tooltip', function () { ...@@ -957,7 +957,7 @@ $('#myTooltip').on('hidden.bs.tooltip', function () {
<h3>Live demo</h3> <h3>Live demo</h3>
<div class="bs-example" style="padding-bottom: 24px;"> <div class="bs-example" style="padding-bottom: 24px;">
<a href="#" class="btn btn-large btn-danger" data-toggle="popover" title="A Title" data-content="And here's some amazing content. It's very engaging. right?">Click to toggle popover</a> <a href="#" class="btn btn-lg btn-danger" data-toggle="popover" title="A Title" data-content="And here's some amazing content. It's very engaging. right?">Click to toggle popover</a>
</div> </div>
<h4>Four directions</h4> <h4>Four directions</h4>
...@@ -1794,7 +1794,7 @@ $('#myCarousel').on('slide.bs.carousel', function () { ...@@ -1794,7 +1794,7 @@ $('#myCarousel').on('slide.bs.carousel', function () {
<h4>Requires independent styling ;)</h4> <h4>Requires independent styling ;)</h4>
<p> <p>
Affix toggles between three states/classes: <code>affix</code>, <code>affix-top</code>, and <code>affix-bottom</code>. You must provide the styles for these classes yourself (independent of this plugin). Affix toggles between three states/classes: <code>affix</code>, <code>affix-top</code>, and <code>affix-bottom</code>. You must provide the styles for these classes yourself (independent of this plugin).
The <code>affix-top</code> class should be in the regular flow of the document. The <code>affix</code> class should be fixed to the page. And <code>affix-bottom</code> should be positioned absolute. Note, <code>affix-bottom</code> is special in that the plugin will place the element with js relative to the <code>offset: { bottom: number }</code> option you've provided. The <code>affix-top</code> class should be in the regular flow of the document. The <code>affix</code> class should be fixed to the page. And <code>affix-bottom</code> should be positioned absolute. Note, <code>affix-bottom</code> is special in that the plugin will place the element with JS relative to the <code>offset: { bottom: number }</code> option you've provided.
</p> </p>
</div> </div>
......
less/button-groups.less
View file @ f22a077f
...@@ -100,7 +100,7 @@ ...@@ -100,7 +100,7 @@
padding-left: 8px; padding-left: 8px;
padding-right: 8px; padding-right: 8px;
} }
.btn-group > .btn-large + .dropdown-toggle { .btn-group > .btn-lg + .dropdown-toggle {
padding-left: 12px; padding-left: 12px;
padding-right: 12px; padding-right: 12px;
} }
...@@ -117,11 +117,11 @@ ...@@ -117,11 +117,11 @@
margin-left: 0; margin-left: 0;
} }
// Carets in other button sizes // Carets in other button sizes
.btn-large .caret { .btn-lg .caret {
border-width: 5px; border-width: 5px;
} }
// Upside down carets for .dropup // Upside down carets for .dropup
.dropup .btn-large .caret { .dropup .btn-lg .caret {
border-bottom-width: 5px; border-bottom-width: 5px;
} }
...@@ -157,6 +157,7 @@ ...@@ -157,6 +157,7 @@
.btn-group-justified { .btn-group-justified {
display: table; display: table;
width: 100%; width: 100%;
table-layout: fixed;
.btn { .btn {
float: none; float: none;
display: table-cell; display: table-cell;
......
less/buttons.less
View file @ f22a077f
...@@ -120,20 +120,20 @@ ...@@ -120,20 +120,20 @@
// Button Sizes // Button Sizes
// -------------------------------------------------- // --------------------------------------------------
.btn-large { .btn-lg {
padding: @padding-large-vertical @padding-large-horizontal; padding: @padding-large-vertical @padding-large-horizontal;
font-size: @font-size-large; font-size: @font-size-large;
line-height: 1.33; // ensure even-numbered height of butotn next to large input line-height: @line-height-large; // ensure even-numbered height of button next to large input
border-radius: @border-radius-large; border-radius: @border-radius-large;
} }
.btn-small, .btn-sm,
.btn-mini { .btn-xs {
padding: @padding-small-vertical @padding-small-horizontal; padding: @padding-small-vertical @padding-small-horizontal;
font-size: @font-size-small; font-size: @font-size-small;
line-height: 1.5; // ensure proper height of button next to small input line-height: @line-height-small; // ensure proper height of button next to small input
border-radius: @border-radius-small; border-radius: @border-radius-small;
} }
.btn-mini { .btn-xs {
padding: 3px 5px; padding: 3px 5px;
} }
......
less/forms.less
View file @ f22a077f
...@@ -218,14 +218,14 @@ input[type="number"] { ...@@ -218,14 +218,14 @@ input[type="number"] {
// horizontal sizing, wrap controls in the predefined grid classes. `<select>` // horizontal sizing, wrap controls in the predefined grid classes. `<select>`
// element gets special love because it's special, and that's a fact! // element gets special love because it's special, and that's a fact!
.input-large { .input-lg {
height: @input-height-large; height: @input-height-large;
padding: @padding-large-vertical @padding-large-horizontal; padding: @padding-large-vertical @padding-large-horizontal;
font-size: @font-size-large; font-size: @font-size-large;
line-height: @line-height-large; line-height: @line-height-large;
border-radius: @border-radius-large; border-radius: @border-radius-large;
} }
.input-small { .input-sm {
height: @input-height-small; height: @input-height-small;
padding: @padding-small-vertical @padding-small-horizontal; padding: @padding-small-vertical @padding-small-horizontal;
font-size: @font-size-small; font-size: @font-size-small;
...@@ -234,18 +234,18 @@ input[type="number"] { ...@@ -234,18 +234,18 @@ input[type="number"] {
} }
select { select {
&.input-large { &.input-lg {
height: @input-height-large; height: @input-height-large;
line-height: @input-height-large; line-height: @input-height-large;
} }
&.input-small { &.input-sm {
height: @input-height-small; height: @input-height-small;
line-height: @input-height-small; line-height: @input-height-small;
} }
} }
textarea { textarea {
&.input-large, &.input-lg,
&.input-small { &.input-sm {
height: auto; height: auto;
} }
} }
...@@ -280,3 +280,47 @@ textarea { ...@@ -280,3 +280,47 @@ textarea {
margin-bottom: 10px; margin-bottom: 10px;
color: lighten(@text-color, 25%); // lighten the text some for contrast color: lighten(@text-color, 25%); // lighten the text some for contrast
} }
// Inline forms
//
// Make forms appear inline(-block).
.form-inline {
.form-control,
.radio,
.checkbox {
display: inline-block;
}
.radio,
.checkbox {
margin-top: 0;
margin-bottom: 0;
}
}
// Horizontal forms
//
// Horizontal forms are built on grid classes and allow you to create forms with
// labels on the left and inputs on the right.
.form-horizontal .control-label,
.form-horizontal .radio-inline,
.form-horizontal .checkbox-inline {
padding-top: 9px;
}
.form-horizontal {
.form-group {
.make-row();
}
}
// Only right align form labels here when the columns stop stacking
@media (min-width: @screen-tablet) {
.form-horizontal .control-label {
text-align: right;
}
}
less/grid.less
View file @ f22a077f
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
// Container and grid column sizing // Container and grid column sizing
// //
// Tiny device columns (smartphones) // Extra small device columns (smartphones)
.col-1, .col-1,
.col-2, .col-2,
.col-3, .col-3,
......
less/input-groups.less
View file @ f22a077f
...@@ -55,15 +55,17 @@ ...@@ -55,15 +55,17 @@
border-radius: @border-radius-base; border-radius: @border-radius-base;
// Sizing // Sizing
&.input-small { &.input-sm {
padding: @padding-small-vertical @padding-small-horizontal; padding: @padding-small-vertical @padding-small-horizontal;
font-size: @font-size-small; font-size: @font-size-small;
border-radius: @border-radius-small; border-radius: @border-radius-small;
line-height: @line-height-small;
} }
&.input-large { &.input-lg {
padding: @padding-large-vertical @padding-large-horizontal; padding: @padding-large-vertical @padding-large-horizontal;
font-size: @font-size-large; font-size: @font-size-large;
border-radius: @border-radius-large; border-radius: @border-radius-large;
line-height: @line-height-large;
} }
// Nuke default margins from checkboxes and radios to vertically center within. // Nuke default margins from checkboxes and radios to vertically center within.
...@@ -113,44 +115,3 @@ ...@@ -113,44 +115,3 @@
z-index: 2; z-index: 2;
} }
} }
// Inline forms
// --------------------------------------------------
.form-inline {
.form-control,
.radio,
.checkbox {
display: inline-block;
}
.radio,
.checkbox {
margin-top: 0;
margin-bottom: 0;
}
}
// Horizontal forms
// --------------------------------------------------
// Horizontal forms are built on grid classes.
.form-horizontal .control-label,
.form-horizontal .radio-inline,
.form-horizontal .checkbox-inline {
padding-top: 9px;
}
.form-horizontal {
.form-group {
.make-row();
}
}
// Only right align form labels here when the columns stop stacking
@media (min-width: @screen-tablet) {
.form-horizontal .control-label {
text-align: right;
}
}
less/navbar.less
View file @ f22a077f
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
padding-top: ((@navbar-height - @line-height-computed) / 2); padding-top: ((@navbar-height - @line-height-computed) / 2);
padding-bottom: ((@navbar-height - @line-height-computed) / 2); padding-bottom: ((@navbar-height - @line-height-computed) / 2);
color: @navbar-link-color; color: @navbar-link-color;
line-height: 20px; line-height: @line-height-computed;
border-radius: @border-radius-base; border-radius: @border-radius-base;
&:hover, &:hover,
&:focus { &:focus {
...@@ -354,6 +354,8 @@ ...@@ -354,6 +354,8 @@
// Add a class to make any element properly align itself vertically within the navbars. // Add a class to make any element properly align itself vertically within the navbars.
.navbar-text { .navbar-text {
float: left;
padding: 0 @navbar-padding-horizontal;
.navbar-vertical-align(@line-height-computed); .navbar-vertical-align(@line-height-computed);
} }
......
less/pagination.less
View file @ f22a077f
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
> a, > a,
> span { > span {
float: left; // Collapse white-space float: left; // Collapse white-space
padding: 4px 12px; padding: @padding-base-vertical @padding-base-horizontal;
line-height: @line-height-base; line-height: @line-height-base;
text-decoration: none; text-decoration: none;
background-color: @pagination-bg; background-color: @pagination-bg;
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
// -------------------------------------------------- // --------------------------------------------------
// Large // Large
.pagination-large { .pagination-lg {
> li { > li {
> a, > a,
> span { > span {
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
} }
// Small // Small
.pagination-small { .pagination-sm {
> li { > li {
> a, > a,
> span { > span {
......
less/panels.less
View file @ f22a077f
...@@ -11,6 +11,24 @@ ...@@ -11,6 +11,24 @@
border: 1px solid @panel-border; border: 1px solid @panel-border;
border-radius: @panel-border-radius; border-radius: @panel-border-radius;
.box-shadow(0 1px 1px rgba(0,0,0,.05)); .box-shadow(0 1px 1px rgba(0,0,0,.05));
// List groups in panels
.list-group {
margin: 15px -15px -15px;
.list-group-item {
border-width: 1px 0;
// Remove border radius for top one
&:first-child {
.border-top-radius(0);
}
// But keep it for the last one
&:last-child {
border-bottom: 0;
}
}
}
} }
// Optional heading // Optional heading
...@@ -82,21 +100,3 @@ ...@@ -82,21 +100,3 @@
border-color: @panel-info-border; border-color: @panel-info-border;
} }
} }
// List groups in panels
.list-group-flush {
margin: 15px -15px -15px;
.list-group-item {
border-width: 1px 0;
// Remove border radius for top one
&:first-child {
.border-top-radius(0);
}
// But keep it for the last one
&:last-child {
border-bottom: 0;
}
}
}
less/variables.less
View file @ f22a077f
...@@ -180,9 +180,9 @@ ...@@ -180,9 +180,9 @@
// Media queries breakpoints // Media queries breakpoints
// -------------------------------------------------- // --------------------------------------------------
// Tiny screen / phone // Extra small screen / phone
@screen-tiny: 480px; @screen-xsmall: 480px;
@screen-phone: @screen-tiny; @screen-phone: @screen-xsmall;
// Small screen / tablet // Small screen / tablet
@screen-small: 768px; @screen-small: 768px;
......
less/wells.less
View file @ f22a077f
...@@ -19,11 +19,11 @@ ...@@ -19,11 +19,11 @@
} }
// Sizes // Sizes
.well-large { .well-lg {
padding: 24px; padding: 24px;
border-radius: @border-radius-large; border-radius: @border-radius-large;
} }
.well-small { .well-sm {
padding: 9px; padding: 9px;
border-radius: @border-radius-small; border-radius: @border-radius-small;
} }
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