diff --git a/bootstrap-1.0.0.css b/bootstrap-1.0.0.css index 4ee29652c4..6cf9f7bb71 100644 --- a/bootstrap-1.0.0.css +++ b/bootstrap-1.0.0.css @@ -6,7 +6,7 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Sun Aug 21 20:53:42 PDT 2011 + * Date: Sun Aug 21 20:55:56 PDT 2011 */ /* Reset.less * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). diff --git a/docs/index.html b/docs/index.html index 983ea7d871..263ccc3edd 100644 --- a/docs/index.html +++ b/docs/index.html @@ -900,35 +900,12 @@ +

Fixed topbar

-
-

Project Name

- -
- -
- -======= ->>>>>>> .merge_file_ugVE3k
-
+

Project Name

  • Home
  • @@ -951,9 +928,10 @@
-
-
+
+
+

What is it