diff options
| author | Mark Otto <[email protected]> | 2013-12-31 13:53:33 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-12-31 13:53:33 -0800 |
| commit | b253cb2c1e34a41940c4933fb95c46da833fc5f9 (patch) | |
| tree | e5a40b963eba273c42e4aad21fb3858a657002dd /examples/grid/grid.css | |
| parent | 9e1153d0498a9e9612c1db85922642fe2aa38c2a (diff) | |
| parent | 8812856de1ce17bb2f482c75370fb2e3db7ac6de (diff) | |
| download | bootstrap-b253cb2c1e34a41940c4933fb95c46da833fc5f9.tar.xz bootstrap-b253cb2c1e34a41940c4933fb95c46da833fc5f9.zip | |
Merge branch 'master' into docs_derp
Conflicts:
_config.yml
docs/_includes/footer.html
docs/_includes/nav-main.html
docs/_includes/old-bs-docs.html
docs/_layouts/default.html
docs/_layouts/home.html
docs/getting-started.html
docs/index.html
Diffstat (limited to 'examples/grid/grid.css')
| -rw-r--r-- | examples/grid/grid.css | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/examples/grid/grid.css b/examples/grid/grid.css deleted file mode 100644 index 963b128e3..000000000 --- a/examples/grid/grid.css +++ /dev/null @@ -1,28 +0,0 @@ -.container { - padding-left: 15px; - padding-right: 15px; -} - -h4 { - margin-top: 25px; -} -.row { - margin-bottom: 20px; -} -.row .row { - margin-top: 10px; - margin-bottom: 0; -} -[class*="col-"] { - padding-top: 15px; - padding-bottom: 15px; - background-color: #eee; - border: 1px solid #ddd; - background-color: rgba(86,61,124,.15); - border: 1px solid rgba(86,61,124,.2); -} - -hr { - margin-top: 40px; - margin-bottom: 40px; -}
\ No newline at end of file |