rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-11-29 11:24:18 +01:00
Code Issues Actions Packages Releases Activity

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

Browse Source
This commit is contained in:
Mark Otto 2013-09-11 23:13:28 -07:00
commit dbcb05880f
6 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
components.html
View File

@ -1562,6 +1562,11 @@ base_url: "../"
</form>
{% endhighlight %}
<div class="bs-callout bs-callout-danger">
<h4>Always add labels</h4>
<p>Screen readers will have trouble with your forms if you don't include a label for every input. For these inline navbar forms, you can hide the labels using the <code>.sr-only</code> class.</p>
</div>
<h2 id="navbar-buttons">Buttons</h2>
<p>For buttons not residing in a <code>&lt;form&gt;</code>, add this class to vertically center buttons within a navbar.</p>

2
less/carousel.less
View File

@ -190,7 +190,7 @@
// Scale up controls for tablets and up
@media screen and (min-width: @screen-sm) {
@media screen and (min-width: @screen-sm-min) {
// Scale up the controls a smidge
.carousel-control {

4
less/grid.less
View File

@ -114,7 +114,7 @@
// Note that `.col-sm-12` doesn't get floated on purpose--there's no need since
// it's full-width.
@media (min-width: @screen-sm) {
@media (min-width: @screen-sm-min) {
.container {
width: @container-sm;
}
@ -192,7 +192,7 @@
// Note that `.col-md-12` doesn't get floated on purpose--there's no need since
// it's full-width.
@media (min-width: @screen-md) {
@media (min-width: @screen-md-min) {
.container {
width: @container-md;
}

2
less/jumbotron.less
View File

@ -24,7 +24,7 @@
border-radius: @border-radius-large; // Only round corners at higher resolutions if contained in a container
}
@media screen and (min-width: @screen-sm) {
@media screen and (min-width: @screen-sm-min) {
padding-top: (@jumbotron-padding * 1.6);
padding-bottom: (@jumbotron-padding * 1.6);

2
less/modals.less
View File

@ -125,7 +125,7 @@
}
// Scale up the modal
@media screen and (min-width: @screen-sm) {
@media screen and (min-width: @screen-sm-min) {
.modal-dialog {
width: 600px;

2
less/type.less
View File

@ -15,7 +15,7 @@ p {
font-weight: 200;
line-height: 1.4;
@media (min-width: @screen-sm) {
@media (min-width: @screen-sm-min) {
font-size: (@font-size-base * 1.5);
}
}