diff options
| author | Mark Otto <[email protected]> | 2014-03-06 22:40:25 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-03-06 22:40:25 -0800 |
| commit | 12c619f5b9149a4d3f4d24efe106504b6a8a5004 (patch) | |
| tree | dacdd064110d04b8195151c08ef4e5713ba3ea24 /docs/examples/grid | |
| parent | f4dd6221d4e7a8eaa9cd8ebe0457ad016f5058cc (diff) | |
| parent | 7e299c6a49bced5d2c2581a5504ddf7dbcaf041f (diff) | |
| download | bootstrap-12c619f5b9149a4d3f4d24efe106504b6a8a5004.tar.xz bootstrap-12c619f5b9149a4d3f4d24efe106504b6a8a5004.zip | |
Merge branch 'master' into boulox-responsive-embed
Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/assets/js/customize.min.js
docs/assets/js/docs.min.js
docs/css.html
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
Diffstat (limited to 'docs/examples/grid')
| -rw-r--r-- | docs/examples/grid/grid.css | 6 | ||||
| -rw-r--r-- | docs/examples/grid/index.html | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/docs/examples/grid/grid.css b/docs/examples/grid/grid.css index 963b128e3..a7a106d06 100644 --- a/docs/examples/grid/grid.css +++ b/docs/examples/grid/grid.css @@ -1,6 +1,6 @@ .container { - padding-left: 15px; padding-right: 15px; + padding-left: 15px; } h4 { @@ -17,12 +17,12 @@ h4 { padding-top: 15px; padding-bottom: 15px; background-color: #eee; - border: 1px solid #ddd; background-color: rgba(86,61,124,.15); + border: 1px solid #ddd; border: 1px solid rgba(86,61,124,.2); } hr { margin-top: 40px; margin-bottom: 40px; -}
\ No newline at end of file +} diff --git a/docs/examples/grid/index.html b/docs/examples/grid/index.html index e9196fc57..54bdfbe0a 100644 --- a/docs/examples/grid/index.html +++ b/docs/examples/grid/index.html @@ -3,7 +3,7 @@ <head> <meta charset="utf-8"> <meta http-equiv="X-UA-Compatible" content="IE=edge"> - <meta name="viewport" content="width=device-width, initial-scale=1.0"> + <meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="description" content=""> <meta name="author" content=""> <link rel="shortcut icon" href="../../assets/ico/favicon.ico"> @@ -63,7 +63,7 @@ <hr> <h3>Two columns with two nested columns</h3> - <p>Per the documentation, nesting is easy—just put a row of columns within an existing row. This gives you two columns <strong>starting at desktops and scaling to large desktops</strong>, with another two (equal widths) within the larger column.</p> + <p>Per the documentation, nesting is easy—just put a row of columns within an existing column. This gives you two columns <strong>starting at desktops and scaling to large desktops</strong>, with another two (equal widths) within the larger column.</p> <p>At mobile device sizes, tablets and down, these columns and their nested columns will stack.</p> <div class="row"> <div class="col-md-8"> |