From b4b1ef68398b68dcdfa29465d06cd76d6bf2c49d Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Mon, 23 Jan 2012 15:17:32 -0800 Subject: rebuild with new templates --- docs/base-css.html | 95 +++++++++--------------------------------------------- 1 file changed, 15 insertions(+), 80 deletions(-) (limited to 'docs/base-css.html') diff --git a/docs/base-css.html b/docs/base-css.html index a869eecf8..91cb4ec70 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -27,86 +27,30 @@ -
Bootstrap
@@ -115,28 +59,19 @@
-<<<<<<< HEAD

Base CSS

On top of the scaffolding, basic HTML elements are styled and enhanced with extensible classes to provide a fresh, consistent look and feel.

+
-======= - -
-

Base CSS

-

On top of the scaffolding, basic HTML elements are styled and enhanced with extensible classes to provide a fresh, consistent look and feel.

- -
->>>>>>> a074087034716804610637a5ad9cc0447a2cccb2