mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-02 16:04:07 +03:00
Code Activity

Merge branch '2.0.3-wip' of https://github.com/twitter/bootstrap into 2.0.3-wip

Browse Source
This commit is contained in:
Jacob Thornton
2012-04-18 13:15:58 -07:00
parent 8f98c4fbf6 47b6e6bd80
commit b627898919
6 changed files with 37 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/assets/css/bootstrap.css
Vendored
+1 -1
View File
@@ -3740,7 +3740,7 @@ a.thumbnail:hover {
font-weight: bold;
line-height: 14px;
color: #ffffff;
vertical-align: middle;
vertical-align: baseline;
white-space: nowrap;
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
background-color: #999999;
docs/scaffolding.html
+3 -3
View File
@@ -533,13 +533,13 @@
@media (max-width: 480px) { ... }
// Landscape phone to portrait tablet
@media (max-width: 768px) { ... }
@media (max-width: 767px) { ... }
// Portrait tablet to landscape and desktop
@media (min-width: 768px) and (max-width: 980px) { ... }
@media (min-width: 768px) and (max-width: 979px) { ... }
// Large desktop
@media (min-width: 1200px) { .. }
@media (min-width: 1200px) { ... }
</pre>
</div><!-- /.span -->
</div><!-- /.row -->
docs/templates/pages/scaffolding.mustache
Vendored
+3 -3
View File
@@ -456,13 +456,13 @@
@media (max-width: 480px) { ... }
// {{_i}}Landscape phone to portrait tablet{{/i}}
@media (max-width: 768px) { ... }
@media (max-width: 767px) { ... }
// {{_i}}Portrait tablet to landscape and desktop{{/i}}
@media (min-width: 768px) and (max-width: 980px) { ... }
@media (min-width: 768px) and (max-width: 979px) { ... }
// {{_i}}Large desktop{{/i}}
@media (min-width: 1200px) { .. }
@media (min-width: 1200px) { ... }
</pre>
</div><!-- /.span -->
</div><!-- /.row -->