diff options
| author | Mark Otto <[email protected]> | 2013-09-11 12:31:21 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-09-11 12:31:21 -0700 |
| commit | 37933a9e08e24e0683c3909aaabe79888e006ba6 (patch) | |
| tree | dcd0cbb40240b1e0a5b856ce8755fbcd9a6b9f10 /css.html | |
| parent | 5d1707a25c0ee68644a182196439a86be1beafbd (diff) | |
| parent | c62426daeb8e7709422ab2eeeb0cf2eb2fad4575 (diff) | |
| download | bootstrap-37933a9e08e24e0683c3909aaabe79888e006ba6.tar.xz bootstrap-37933a9e08e24e0683c3909aaabe79888e006ba6.zip | |
Merge branch 'master' of github.com:twbs/bootstrap
Conflicts:
dist/css/bootstrap.min.css
Diffstat (limited to 'css.html')
| -rw-r--r-- | css.html | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -74,7 +74,7 @@ base_url: "../" <p class="lead">Bootstrap includes a responsive, mobile first fluid grid system that appropriately scales up to 12 columns as the device or viewport size increases. It includes <a href="#grid-example-basic">predefined classes</a> for easy layout options, as well as powerful <a href="#grid-less">mixins for generating more semantic layouts</a>.</p> <h3 id="grid-media-queries">Media queries</h3> - <p>We use the following media queries to create the key breakpoints in our grid system.</p> + <p>We use the following media queries in our LESS files to create the key breakpoints in our grid system.</p> {% highlight css %} /* Extra small devices (phones, less than 768px) */ /* No media query since this is the default in Bootstrap */ |