From 6d541a6066d46bff19833707deeca8f41279b180 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 28 Sep 2011 19:06:10 -0700 Subject: [PATCH] pulling out more stuff and fixing file name at top of file --- bootstrap.css | 4 ++-- docs/index.html | 18 ++++++------------ lib/mixins.less | 2 +- lib/patterns.less | 6 ++---- 4 files changed, 11 insertions(+), 19 deletions(-) diff --git a/bootstrap.css b/bootstrap.css index 6d3c15390a..babe50a210 100644 --- a/bootstrap.css +++ b/bootstrap.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: Sat Sep 17 17:21:25 PDT 2011 + * Date: Wed Sep 28 19:05:53 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). @@ -173,7 +173,7 @@ textarea { /* Variables.less * Variables to customize the look and feel of Bootstrap * ----------------------------------------------------- */ -/* Variables.less +/* Mixins.less * Snippets of reusable CSS to develop faster and keep code readable * ----------------------------------------------------------------- */ /* diff --git a/docs/index.html b/docs/index.html index 5c5162471a..857af24486 100644 --- a/docs/index.html +++ b/docs/index.html @@ -84,14 +84,12 @@ ================================================== -->
-
-

Bootstrap, from Twitter

-

- Bootstrap is a toolkit from Twitter designed to kickstart development of webapps and sites.
- It includes base CSS and HTML for typography, forms, buttons, tables, grids, navigation, and more.
-

-

Nerd alert: Bootstrap is built with Less and was designed to work out of the gate with modern browsers in mind.

-
+

Bootstrap, from Twitter

+

+ Bootstrap is a toolkit from Twitter designed to kickstart development of webapps and sites.
+ It includes base CSS and HTML for typography, forms, buttons, tables, grids, navigation, and more.
+

+

Nerd alert: Bootstrap is built with Less and was designed to work out of the gate with modern browsers in mind.

@@ -140,10 +138,6 @@

History

Engineers at Twitter have historically used almost any library they were familiar with to meet front-end requirements. Bootstrap began as an answer to the challenges that presented. With the help of many awesome folks, Bootstrap has grown significantly.

Read more on dev.twitter.com ›

-

- - -

Browser support

diff --git a/lib/mixins.less b/lib/mixins.less index ca7893dafe..929618a409 100644 --- a/lib/mixins.less +++ b/lib/mixins.less @@ -1,4 +1,4 @@ -/* Variables.less +/* Mixins.less * Snippets of reusable CSS to develop faster and keep code readable * ----------------------------------------------------------------- */ diff --git a/lib/patterns.less b/lib/patterns.less index 1ba218c36b..eae09a5963 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -350,7 +350,7 @@ // Basic pill nav .pills { a { - margin: 5px 3px 5px 0; + margin: 5px 3px 5px 0; padding: 0 15px; text-shadow: 0 1px 1px @white; line-height: 30px; @@ -376,7 +376,7 @@ .tab-content > .active, .pill-content > .active { - display:block; + display: block; } @@ -398,8 +398,6 @@ padding: 0 5px; color: @grayLight; } - a { - } .active a { color: @grayDark; }