mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-29 16:19:53 +02:00
Code Issues Releases Wiki Activity

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

Browse Source
This commit is contained in:
Mark Otto
2013-05-12 20:57:07 -07:00
parent 79a4269430 ca5685c1f8
commit 2093635de1
3 changed files with 49 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
docs/assets/css/bootstrap.css vendored
View File

@@ -5112,68 +5112,68 @@ a.list-group-item.active > .badge,
visibility: hidden; visibility: hidden;
} }
.visible-phone { .visible-sm {
display: inherit !important; display: inherit !important;
} }
.visible-tablet { .visible-md {
display: none !important; display: none !important;
} }
.visible-desktop { .visible-lg {
display: none !important; display: none !important;
} }
.hidden-phone { .hidden-sm {
display: none !important; display: none !important;
} }
.hidden-tablet { .hidden-md {
display: inherit !important; display: inherit !important;
} }
.hidden-desktop { .hidden-lg {
display: inherit !important; display: inherit !important;
} }
@media (min-width: 768px) and (max-width: 991px) { @media (min-width: 768px) and (max-width: 991px) {
.visible-phone { .visible-sm {
display: none !important; display: none !important;
} }
.visible-tablet { .visible-md {
display: inherit !important; display: inherit !important;
} }
.visible-desktop { .visible-lg {
display: none !important; display: none !important;
} }
.hidden-phone { .hidden-sm {
display: inherit !important; display: inherit !important;
} }
.hidden-tablet { .hidden-md {
display: none !important; display: none !important;
} }
.hidden-desktop { .hidden-lg {
display: inherit !important; display: inherit !important;
} }
} }
@media (min-width: 992px) { @media (min-width: 992px) {
.visible-phone { .visible-sm {
display: none !important; display: none !important;
} }
.visible-tablet { .visible-md {
display: none !important; display: none !important;
} }
.visible-desktop { .visible-lg {
display: inherit !important; display: inherit !important;
} }
.hidden-phone { .hidden-sm {
display: inherit !important; display: inherit !important;
} }
.hidden-tablet { .hidden-md {
display: inherit !important; display: inherit !important;
} }
.hidden-desktop { .hidden-lg {
display: none !important; display: none !important;
} }
} }

26
docs/css.html
View File

@@ -1949,7 +1949,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
<p class="lead">For faster mobile-friendly development, use these utility classes for showing and hiding content by device via media query. Also included are utility classes for toggling content when printed.</p> <p class="lead">For faster mobile-friendly development, use these utility classes for showing and hiding content by device via media query. Also included are utility classes for toggling content when printed.</p>
<h3>Responsive classes</h3> <h3>Responsive classes</h3>
<table class="table table-bordered table-striped responsive-utilities hidden-phone"> <table class="table table-bordered table-striped responsive-utilities hidden-sm">
<thead> <thead>
<tr> <tr>
<th>Class</th> <th>Class</th>
@@ -1960,37 +1960,37 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
</thead> </thead>
<tbody> <tbody>
<tr> <tr>
<th><code>.visible-phone</code></th> <th><code>.visible-sm</code></th>
<td class="is-visible">Visible</td> <td class="is-visible">Visible</td>
<td class="is-hidden">Hidden</td> <td class="is-hidden">Hidden</td>
<td class="is-hidden">Hidden</td> <td class="is-hidden">Hidden</td>
</tr> </tr>
<tr> <tr>
<th><code>.visible-tablet</code></th> <th><code>.visible-md</code></th>
<td class="is-hidden">Hidden</td> <td class="is-hidden">Hidden</td>
<td class="is-visible">Visible</td> <td class="is-visible">Visible</td>
<td class="is-hidden">Hidden</td> <td class="is-hidden">Hidden</td>
</tr> </tr>
<tr> <tr>
<th><code>.visible-desktop</code></th> <th><code>.visible-lg</code></th>
<td class="is-hidden">Hidden</td> <td class="is-hidden">Hidden</td>
<td class="is-hidden">Hidden</td> <td class="is-hidden">Hidden</td>
<td class="is-visible">Visible</td> <td class="is-visible">Visible</td>
</tr> </tr>
<tr> <tr>
<th><code>.hidden-phone</code></th> <th><code>.hidden-sm</code></th>
<td class="is-hidden">Hidden</td> <td class="is-hidden">Hidden</td>
<td class="is-visible">Visible</td> <td class="is-visible">Visible</td>
<td class="is-visible">Visible</td> <td class="is-visible">Visible</td>
</tr> </tr>
<tr> <tr>
<th><code>.hidden-tablet</code></th> <th><code>.hidden-md</code></th>
<td class="is-visible">Visible</td> <td class="is-visible">Visible</td>
<td class="is-hidden">Hidden</td> <td class="is-hidden">Hidden</td>
<td class="is-visible">Visible</td> <td class="is-visible">Visible</td>
</tr> </tr>
<tr> <tr>
<th><code>.hidden-desktop</code></th> <th><code>.hidden-lg</code></th>
<td class="is-visible">Visible</td> <td class="is-visible">Visible</td>
<td class="is-visible">Visible</td> <td class="is-visible">Visible</td>
<td class="is-hidden">Hidden</td> <td class="is-hidden">Hidden</td>
@@ -2029,16 +2029,16 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
<h4>Visible on...</h4> <h4>Visible on...</h4>
<p>Green checkmarks indicate that class is visible in your current viewport.</p> <p>Green checkmarks indicate that class is visible in your current viewport.</p>
<ul class="responsive-utilities-test"> <ul class="responsive-utilities-test">
<li>Phone<span class="visible-phone">&#10004; Phone</span></li> <li>Phone<span class="visible-sm">&#10004; Phone</span></li>
<li>Tablet<span class="visible-tablet">&#10004; Tablet</span></li> <li>Tablet<span class="visible-md">&#10004; Tablet</span></li>
<li>Desktop<span class="visible-desktop">&#10004; Desktop</span></li> <li>Desktop<span class="visible-lg">&#10004; Desktop</span></li>
</ul> </ul>
<h4>Hidden on...</h4> <h4>Hidden on...</h4>
<p>Here, green checkmarks indicate that class is hidden in your current viewport.</p> <p>Here, green checkmarks indicate that class is hidden in your current viewport.</p>
<ul class="responsive-utilities-test hidden-on"> <ul class="responsive-utilities-test hidden-on">
<li>Phone<span class="hidden-phone">&#10004; Phone</span></li> <li>Phone<span class="hidden-sm">&#10004; Phone</span></li>
<li>Tablet<span class="hidden-tablet">&#10004; Tablet</span></li> <li>Tablet<span class="hidden-md">&#10004; Tablet</span></li>
<li>Desktop<span class="hidden-desktop">&#10004; Desktop</span></li> <li>Desktop<span class="hidden-lg">&#10004; Desktop</span></li>
</ul> </ul>
</div> </div>

36
less/responsive-utilities.less
View File

@@ -36,35 +36,35 @@
// Visibility utilities // Visibility utilities
// For Phones // For Phones
.visible-phone { display: inherit !important; } .visible-sm { display: inherit !important; }
.visible-tablet { display: none !important; } .visible-md { display: none !important; }
.visible-desktop { display: none !important; } .visible-lg { display: none !important; }
.hidden-phone { display: none !important; } .hidden-sm { display: none !important; }
.hidden-tablet { display: inherit !important; } .hidden-md { display: inherit !important; }
.hidden-desktop { display: inherit !important; } .hidden-lg { display: inherit !important; }
// Tablets & small desktops only // Tablets & small desktops only
@media (min-width: @screen-tablet) and (max-width: @screen-tablet-max) { @media (min-width: @screen-tablet) and (max-width: @screen-tablet-max) {
.visible-phone { display: none !important; } .visible-sm { display: none !important; }
.visible-tablet { display: inherit !important; } .visible-md { display: inherit !important; }
.visible-desktop { display: none !important; } .visible-lg { display: none !important; }
.hidden-phone { display: inherit !important; } .hidden-sm { display: inherit !important; }
.hidden-tablet { display: none !important; } .hidden-md { display: none !important; }
.hidden-desktop { display: inherit !important; } .hidden-lg { display: inherit !important; }
} }
// For desktops // For desktops
@media (min-width: @screen-desktop) { @media (min-width: @screen-desktop) {
.visible-phone { display: none !important; } .visible-sm { display: none !important; }
.visible-tablet { display: none !important; } .visible-md { display: none !important; }
.visible-desktop { display: inherit !important; } .visible-lg { display: inherit !important; }
.hidden-phone { display: inherit !important; } .hidden-sm { display: inherit !important; }
.hidden-tablet { display: inherit !important; } .hidden-md { display: inherit !important; }
.hidden-desktop { display: none !important; } .hidden-lg { display: none !important; }
} }
// Print utilities // Print utilities