Skip to content

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

Merge pull request #9056 from twbs/large-to-lg-etc 

Greater standardization of sizing terminology
parents 30a01e0a cabcd360
Show whitespace changes
Inline Side-by-side
Showing with 142 additions and 121 deletions
components.html
View file @ c45edbe6
...@@ -385,7 +385,7 @@ base_url: "../" ...@@ -385,7 +385,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 +397,7 @@ base_url: "../" ...@@ -397,7 +397,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 +408,24 @@ base_url: "../" ...@@ -408,12 +408,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 +435,22 @@ base_url: "../" ...@@ -423,13 +435,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 +556,8 @@ base_url: "../" ...@@ -535,8 +556,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 +566,14 @@ base_url: "../" ...@@ -545,14 +566,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 +582,8 @@ base_url: "../" ...@@ -561,8 +582,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 +1467,10 @@ body { padding-bottom: 70px; } ...@@ -1446,10 +1467,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 +1492,7 @@ body { padding-bottom: 70px; } ...@@ -1471,7 +1492,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 +1504,9 @@ body { padding-bottom: 70px; } ...@@ -1483,9 +1504,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 +1680,14 @@ body { padding-bottom: 70px; } ...@@ -1659,14 +1680,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 %}
...@@ -2402,20 +2423,20 @@ body { padding-bottom: 70px; } ...@@ -2402,20 +2423,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 @ c45edbe6
...@@ -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>
...@@ -1585,35 +1585,35 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline. ...@@ -1585,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>
...@@ -1701,54 +1701,54 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline. ...@@ -1701,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 %}
...@@ -1758,12 +1758,12 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline. ...@@ -1758,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">
...@@ -1774,12 +1774,12 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline. ...@@ -1774,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 @ c45edbe6
...@@ -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 @ c45edbe6
...@@ -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;
} }
...@@ -1989,22 +1989,22 @@ fieldset[disabled] .btn-link:focus { ...@@ -1989,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;
} }
...@@ -2101,14 +2101,14 @@ input[type="button"].btn-block { ...@@ -2101,14 +2101,14 @@ 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; 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; line-height: 1.33;
...@@ -2496,12 +2496,12 @@ a.list-group-item.active .list-group-item-text { ...@@ -2496,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;
} }
...@@ -3220,7 +3220,7 @@ button.close { ...@@ -3220,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;
} }
...@@ -3234,11 +3234,11 @@ button.close { ...@@ -3234,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;
} }
...@@ -3363,38 +3363,38 @@ button.close { ...@@ -3363,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 @ c45edbe6
This source diff could not be displayed because it is too large. You can view the blob instead.
getting-started.html
View file @ c45edbe6
...@@ -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 @ c45edbe6
...@@ -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 @ c45edbe6
...@@ -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">
...@@ -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>
......
less/button-groups.less
View file @ c45edbe6
...@@ -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;
} }
......
less/buttons.less
View file @ c45edbe6
...@@ -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: @line-height-large; // ensure even-numbered height of button 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: @line-height-small; // 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 @ c45edbe6
...@@ -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;
} }
} }
......
less/grid.less
View file @ c45edbe6
...@@ -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 @ c45edbe6
...@@ -55,13 +55,13 @@ ...@@ -55,13 +55,13 @@
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; 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;
......
less/pagination.less
View file @ c45edbe6
...@@ -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/variables.less
View file @ c45edbe6
...@@ -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 @ c45edbe6
...@@ -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