diff options
| author | Mark Otto <[email protected]> | 2013-08-05 12:20:52 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-08-05 12:20:52 -0700 |
| commit | 96136dbb56e136278cc7084caf84291949925d0c (patch) | |
| tree | 6db39936e8b632420f5a322f70035ab4a991b470 /less/type.less | |
| parent | e23906facaa63fcc97bddbd0895c301699c9e942 (diff) | |
| parent | efac0bf8d6cda1e6af85fb84d30d673c8e0a2ee8 (diff) | |
| download | bootstrap-96136dbb56e136278cc7084caf84291949925d0c.tar.xz bootstrap-96136dbb56e136278cc7084caf84291949925d0c.zip | |
Merge branch 'pullright' of https://github.com/liuyl/bootstrap into liuyl-pullright
Conflicts:
dist/css/bootstrap.min.css
Diffstat (limited to 'less/type.less')
| -rw-r--r-- | less/type.less | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/less/type.less b/less/type.less index 41581a66a..3fa558f7a 100644 --- a/less/type.less +++ b/less/type.less @@ -202,7 +202,6 @@ blockquote { // Float right with text-align: right &.pull-right { - float: right; padding-right: 15px; padding-left: 0; border-right: 5px solid @blockquote-border-color; |