diff options
| author | Mark Otto <[email protected]> | 2012-09-17 18:15:39 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-09-17 18:15:39 -0700 |
| commit | 143fef9f95daca088c1a910fccd07f2b520d8b0b (patch) | |
| tree | f631ef8e07905097da41e1fe263ab4c8ff64fd9e /docs/assets/css/bootstrap.css | |
| parent | 917b46a3430b33b7f2cde9ffe67a13aaa935e9a3 (diff) | |
| download | bootstrap-143fef9f95daca088c1a910fccd07f2b520d8b0b.tar.xz bootstrap-143fef9f95daca088c1a910fccd07f2b520d8b0b.zip | |
overhaul the docs and css to merge into 2.1.2 since this was against master
Diffstat (limited to 'docs/assets/css/bootstrap.css')
| -rw-r--r-- | docs/assets/css/bootstrap.css | 68 |
1 files changed, 14 insertions, 54 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 5b8073bf5..ae09c212a 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -5279,74 +5279,34 @@ a.thumbnail:hover { zoom: 1; } -.media { - margin-bottom: 10px; -} - +.media, .media .media { - margin-top: 20px; -} - -.media .pull-left { - margin-right: 10px; + margin-top: 15px; } -.media .pull-right { - margin-left: 10px; +.media:first-child { + margin-top: 0; } -.media .media-object { +.media-object { display: block; } -.medias { - margin-top: 20px; - margin-left: 0; - list-style-type: none; -} - -.medias .media { - padding-bottom: 10px; - border-bottom: 1px solid rgba(0, 0, 0, 0.07); -} - -.medias > .media.last { - margin: 0; - border-bottom: none; +.media-heading { + margin: 0 0 5px; } -.medias > .media .media { - padding-bottom: 0; - margin-bottom: 0; - border-bottom: none; +.media .pull-left { + margin-right: 10px; } -.media-box { - padding: 10px; - margin-bottom: 19px; - background-color: #fff; - border: 1px solid rgba(0, 0, 0, 0.09); - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - -webkit-box-shadow: 1px 1px 2px rgba(0, 0, 0, 0.1); - -moz-box-shadow: 1px 1px 2px rgba(0, 0, 0, 0.1); - box-shadow: 1px 1px 2px rgba(0, 0, 0, 0.1); +.media .pull-right { + margin-left: 10px; } -@media (max-width: 480px) { - .media .pull-left, - .media .pull-right { - display: block; - float: none; - margin-bottom: 10px; - } - .media .pull-left { - margin-right: 0; - } - .media .pull-right { - margin-left: 0; - } +.media-list { + margin-left: 0; + list-style: none; } .label, |
