diff options
| author | Mark Otto <[email protected]> | 2014-02-22 12:20:53 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-02-22 12:20:53 -0800 |
| commit | 4ccf088a24b8c0f9694458c81d44514559712a65 (patch) | |
| tree | 60a79f54e70487da7cea4ae27e1cbd5a4cb027e3 /dist/css/bootstrap.css | |
| parent | 49094844ac55a0e08d6d847b0e07868f8b639037 (diff) | |
| parent | b99be29f32f3db208b47bd33fbef1f63405ccfdc (diff) | |
| download | bootstrap-4ccf088a24b8c0f9694458c81d44514559712a65.tar.xz bootstrap-4ccf088a24b8c0f9694458c81d44514559712a65.zip | |
Merge branch 'master' into pr/12813
Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
Diffstat (limited to 'dist/css/bootstrap.css')
| -rw-r--r-- | dist/css/bootstrap.css | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 8fee90674..d8c3977fc 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -5616,6 +5616,8 @@ button.close { } .clearfix:before, .clearfix:after, +.dl-horizontal dd:before, +.dl-horizontal dd:after, .container:before, .container:after, .container-fluid:before, @@ -5646,6 +5648,7 @@ button.close { content: " "; } .clearfix:after, +.dl-horizontal dd:after, .container:after, .container-fluid:after, .row:after, |
