From a4a6244eb7a7514ad7410403bf5b60d1bf3e88b0 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 30 Sep 2012 22:09:51 -0700 Subject: add sticky footer example per martin bean's suggestion, using the implementation by ryan fait --- .../img/examples/bootstrap-example-sticky-footer.png | Bin 0 -> 11905 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 docs/assets/img/examples/bootstrap-example-sticky-footer.png (limited to 'docs/assets') diff --git a/docs/assets/img/examples/bootstrap-example-sticky-footer.png b/docs/assets/img/examples/bootstrap-example-sticky-footer.png new file mode 100644 index 000000000..c5a1f5f01 Binary files /dev/null and b/docs/assets/img/examples/bootstrap-example-sticky-footer.png differ -- cgit v1.2.3 From da43c7c27cb08a76775ad64b5caa210630d0c2cd Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 30 Sep 2012 22:41:26 -0700 Subject: run make after merge --- docs/assets/css/bootstrap.css | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'docs/assets') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 825d6b51e..0160bf1f6 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3189,7 +3189,8 @@ button.close { border-radius: 5px; } -.btn-large [class^="icon-"] { +.btn-large [class^="icon-"], +.btn-large [class*=" icon-"] { margin-top: 2px; } @@ -3201,7 +3202,8 @@ button.close { border-radius: 3px; } -.btn-small [class^="icon-"] { +.btn-small [class^="icon-"], +.btn-small [class*=" icon-"] { margin-top: 0; } -- cgit v1.2.3