From fbe22f05800a3ce4ae3a880914d8e03cb1e01d1b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 15 Oct 2011 17:21:39 -0700 Subject: updated index of docs to use html5 self closing tags, add responsive shell to bootstrap file --- lib/bootstrap.less | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'lib/bootstrap.less') diff --git a/lib/bootstrap.less b/lib/bootstrap.less index 62f2ce916..9665306fd 100644 --- a/lib/bootstrap.less +++ b/lib/bootstrap.less @@ -23,4 +23,7 @@ @import "type.less"; @import "forms.less"; @import "tables.less"; -@import "patterns.less"; \ No newline at end of file +@import "patterns.less"; + +// Responsive +@import "responsive.less"; \ No newline at end of file -- cgit v1.2.3 From a0179322854a9d1e2b9363447c9884e40733d04f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 16 Nov 2011 23:58:36 -0800 Subject: start breaking down patterns.less into more distinct files, update docs for forms to use correct classes --- lib/bootstrap.less | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'lib/bootstrap.less') diff --git a/lib/bootstrap.less b/lib/bootstrap.less index 9665306fd..ffad35913 100644 --- a/lib/bootstrap.less +++ b/lib/bootstrap.less @@ -23,7 +23,17 @@ @import "type.less"; @import "forms.less"; @import "tables.less"; + +// Temp catchall for what's missing thus far @import "patterns.less"; +@import "tabs-pills.less"; +@import "breadcrumbs.less"; +@import "pagination.less"; +@import "modals.less"; +@import "twipsy.less"; +@import "popovers.less"; +@import "media-grids.less"; + // Responsive @import "responsive.less"; \ No newline at end of file -- cgit v1.2.3 From 20aecb983838422c7b43e20960b10d4d79fefaa3 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 21 Dec 2011 16:22:20 -0600 Subject: updated all docs to jQuery 1.7, move all docs JS to application.js, and move dropdowns css to dedicated file --- lib/bootstrap.less | 1 + 1 file changed, 1 insertion(+) (limited to 'lib/bootstrap.less') diff --git a/lib/bootstrap.less b/lib/bootstrap.less index ffad35913..a871a7cd4 100644 --- a/lib/bootstrap.less +++ b/lib/bootstrap.less @@ -27,6 +27,7 @@ // Temp catchall for what's missing thus far @import "patterns.less"; +@import "dropdowns.less"; @import "tabs-pills.less"; @import "breadcrumbs.less"; @import "pagination.less"; -- cgit v1.2.3 From c854ed167ce37d6a008723c78f2e6336211fff69 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 21 Dec 2011 16:26:21 -0600 Subject: rename media grid to thumbnails, recompile bootstrap, fix examples for mobile phones --- lib/bootstrap.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/bootstrap.less') diff --git a/lib/bootstrap.less b/lib/bootstrap.less index a871a7cd4..e05a966ad 100644 --- a/lib/bootstrap.less +++ b/lib/bootstrap.less @@ -34,7 +34,7 @@ @import "modals.less"; @import "twipsy.less"; @import "popovers.less"; -@import "media-grids.less"; +@import "thumbnails.less"; // Responsive @import "responsive.less"; \ No newline at end of file -- cgit v1.2.3 From fb9401b355366452d310d39f51224999da4daa82 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 5 Jan 2012 01:34:14 -0800 Subject: tweaks abound, updated prettify styles, new sidenav component started, sprite icons started --- lib/bootstrap.less | 2 ++ 1 file changed, 2 insertions(+) (limited to 'lib/bootstrap.less') diff --git a/lib/bootstrap.less b/lib/bootstrap.less index e05a966ad..8b821825c 100644 --- a/lib/bootstrap.less +++ b/lib/bootstrap.less @@ -27,6 +27,7 @@ // Temp catchall for what's missing thus far @import "patterns.less"; +@import "sprites.less"; @import "dropdowns.less"; @import "tabs-pills.less"; @import "breadcrumbs.less"; @@ -34,6 +35,7 @@ @import "modals.less"; @import "twipsy.less"; @import "popovers.less"; +@import "sidenav.less"; @import "thumbnails.less"; // Responsive -- cgit v1.2.3 From 20add59de3f2b69aaa9c9b325dab20b13c75eaa1 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 5 Jan 2012 10:01:42 -0800 Subject: breaking out patterns.less even more, removing unnecessary div from checkbox and radio lists--now just labels and inputs --- lib/bootstrap.less | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) (limited to 'lib/bootstrap.less') diff --git a/lib/bootstrap.less b/lib/bootstrap.less index 8b821825c..df233f128 100644 --- a/lib/bootstrap.less +++ b/lib/bootstrap.less @@ -19,24 +19,38 @@ // Grid system and page structure @import "scaffolding.less"; -// Styled patterns and elements +// Base CSS @import "type.less"; @import "forms.less"; @import "tables.less"; -// Temp catchall for what's missing thus far -@import "patterns.less"; - +// Components: common @import "sprites.less"; @import "dropdowns.less"; +@import "wells.less"; +@import "component-animations.less"; +@import "close.less"; + +// Components: Nav +@import "navbar.less"; @import "tabs-pills.less"; +@import "sidenav.less"; @import "breadcrumbs.less"; @import "pagination.less"; + +// Components: Popovers @import "modals.less"; @import "twipsy.less"; @import "popovers.less"; -@import "sidenav.less"; + +// Components: Buttons & Alerts +@import "buttons.less"; +@import "button-groups.less"; +@import "alerts.less"; // Note: alerts share common CSS with buttons and thus have styles in buttons.less + +// Components: Misc @import "thumbnails.less"; +@import "labels.less"; // Responsive @import "responsive.less"; \ No newline at end of file -- cgit v1.2.3 From 3eb80591b2c8bb2850caf27da7d6b8c8b747063a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotrek=20Oko=C5=84ski?= Date: Sat, 26 Nov 2011 19:41:17 +0100 Subject: Progress bars --- lib/bootstrap.less | 1 + 1 file changed, 1 insertion(+) (limited to 'lib/bootstrap.less') diff --git a/lib/bootstrap.less b/lib/bootstrap.less index df233f128..0335f8651 100644 --- a/lib/bootstrap.less +++ b/lib/bootstrap.less @@ -30,6 +30,7 @@ @import "wells.less"; @import "component-animations.less"; @import "close.less"; +@import "progress-bars.less"; // Components: Nav @import "navbar.less"; -- cgit v1.2.3 From 1438b14f74fc30c3b9bd63bd54d3bcfe5ce33c3c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 7 Jan 2012 15:52:57 -0800 Subject: overhauled docs to include example markup, add language around browser support and classes --- lib/bootstrap.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/bootstrap.less') diff --git a/lib/bootstrap.less b/lib/bootstrap.less index 0335f8651..d82dffc65 100644 --- a/lib/bootstrap.less +++ b/lib/bootstrap.less @@ -30,7 +30,6 @@ @import "wells.less"; @import "component-animations.less"; @import "close.less"; -@import "progress-bars.less"; // Components: Nav @import "navbar.less"; @@ -52,6 +51,7 @@ // Components: Misc @import "thumbnails.less"; @import "labels.less"; +@import "progress-bars.less"; // Responsive @import "responsive.less"; \ No newline at end of file -- cgit v1.2.3 From 2948d1c3b247a5aff1fd1f15cf72540e3f492f57 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 7 Jan 2012 20:40:28 -0800 Subject: overhaul the entire tabs component structure and docs; remove side nav and make it a nav list to build on new .nav base class --- lib/bootstrap.less | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'lib/bootstrap.less') diff --git a/lib/bootstrap.less b/lib/bootstrap.less index d82dffc65..2bec3dd01 100644 --- a/lib/bootstrap.less +++ b/lib/bootstrap.less @@ -33,8 +33,7 @@ // Components: Nav @import "navbar.less"; -@import "tabs-pills.less"; -@import "sidenav.less"; +@import "navs.less"; @import "breadcrumbs.less"; @import "pagination.less"; -- cgit v1.2.3 From eaa8220d70f84a710c9dfa1bd49a7c35bcab1a3b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 8 Jan 2012 15:38:57 -0800 Subject: add utilities.less file for generic classes --- lib/bootstrap.less | 3 +++ 1 file changed, 3 insertions(+) (limited to 'lib/bootstrap.less') diff --git a/lib/bootstrap.less b/lib/bootstrap.less index 2bec3dd01..57ada98a9 100644 --- a/lib/bootstrap.less +++ b/lib/bootstrap.less @@ -52,5 +52,8 @@ @import "labels.less"; @import "progress-bars.less"; +// Utility classes +@import "utilities.less"; // Has to be last to override when necessary + // Responsive @import "responsive.less"; \ No newline at end of file -- cgit v1.2.3 From 6f2f947a4309a8fdeb7067612447c0f1a15dcfd9 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Wed, 11 Jan 2012 21:42:55 -0800 Subject: add build tool for js + rename twipsy to tooltip + lots of little doc cleanup --- lib/bootstrap.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/bootstrap.less') diff --git a/lib/bootstrap.less b/lib/bootstrap.less index 57ada98a9..d71002c46 100644 --- a/lib/bootstrap.less +++ b/lib/bootstrap.less @@ -39,7 +39,7 @@ // Components: Popovers @import "modals.less"; -@import "twipsy.less"; +@import "tooltip.less"; @import "popovers.less"; // Components: Buttons & Alerts -- cgit v1.2.3 From 6d916763f82be8c2d4f87842275170c12bea72ec Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 14 Jan 2012 20:54:37 -0800 Subject: adding the pager component after rewriting the pagination docs and css --- lib/bootstrap.less | 1 + 1 file changed, 1 insertion(+) (limited to 'lib/bootstrap.less') diff --git a/lib/bootstrap.less b/lib/bootstrap.less index d71002c46..43b512086 100644 --- a/lib/bootstrap.less +++ b/lib/bootstrap.less @@ -36,6 +36,7 @@ @import "navs.less"; @import "breadcrumbs.less"; @import "pagination.less"; +@import "pager.less"; // Components: Popovers @import "modals.less"; -- cgit v1.2.3 From 16eccc43d9fa6317818b5d1621d0477150214488 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 14 Jan 2012 23:28:48 -0800 Subject: dates updated to 2012 --- lib/bootstrap.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/bootstrap.less') diff --git a/lib/bootstrap.less b/lib/bootstrap.less index 43b512086..db6a192f5 100644 --- a/lib/bootstrap.less +++ b/lib/bootstrap.less @@ -1,7 +1,7 @@ /*! * Bootstrap @VERSION * - * Copyright 2011 Twitter, Inc + * Copyright 2012 Twitter, Inc * Licensed under the Apache License v2.0 * http://www.apache.org/licenses/LICENSE-2.0 * -- cgit v1.2.3 From c02501e1b714ebb44c560483316ac36c4f709c50 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 15 Jan 2012 16:27:36 -0800 Subject: move carousel to separate stylesheet, update popovers to fix ie7 bug, fix pagination, fix alerts --- lib/bootstrap.less | 1 + 1 file changed, 1 insertion(+) (limited to 'lib/bootstrap.less') diff --git a/lib/bootstrap.less b/lib/bootstrap.less index db6a192f5..db5ed61f7 100644 --- a/lib/bootstrap.less +++ b/lib/bootstrap.less @@ -52,6 +52,7 @@ @import "thumbnails.less"; @import "labels.less"; @import "progress-bars.less"; +@import "carousel.less"; // Utility classes @import "utilities.less"; // Has to be last to override when necessary -- cgit v1.2.3 From f48278dac6ac89fcf9d1ab7526ec3029dd1a4d8e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 15 Jan 2012 18:40:17 -0800 Subject: updated accordion and carousel; accordion still needs work --- lib/bootstrap.less | 1 + 1 file changed, 1 insertion(+) (limited to 'lib/bootstrap.less') diff --git a/lib/bootstrap.less b/lib/bootstrap.less index db5ed61f7..fec87a339 100644 --- a/lib/bootstrap.less +++ b/lib/bootstrap.less @@ -52,6 +52,7 @@ @import "thumbnails.less"; @import "labels.less"; @import "progress-bars.less"; +@import "accordion.less"; @import "carousel.less"; // Utility classes -- cgit v1.2.3 From f2fadf1f0a3f444893fec394fd0180d03e1058a3 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 18 Jan 2012 00:24:10 -0800 Subject: rename navbar variables, change navbar search placeholder to mixin --- lib/bootstrap.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/bootstrap.less') diff --git a/lib/bootstrap.less b/lib/bootstrap.less index fec87a339..67642d1c4 100644 --- a/lib/bootstrap.less +++ b/lib/bootstrap.less @@ -32,8 +32,8 @@ @import "close.less"; // Components: Nav -@import "navbar.less"; @import "navs.less"; +@import "navbar.less"; @import "breadcrumbs.less"; @import "pagination.less"; @import "pager.less"; -- cgit v1.2.3 From 9553b1e3e9457a48b6da3724c906a36f935aa526 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 25 Jan 2012 10:02:52 -0800 Subject: update docs to include separate responsive css, update docs to highlight proper file name, updated makefile to build responsive separately --- lib/bootstrap.less | 3 --- 1 file changed, 3 deletions(-) (limited to 'lib/bootstrap.less') diff --git a/lib/bootstrap.less b/lib/bootstrap.less index 67642d1c4..8d307d427 100644 --- a/lib/bootstrap.less +++ b/lib/bootstrap.less @@ -57,6 +57,3 @@ // Utility classes @import "utilities.less"; // Has to be last to override when necessary - -// Responsive -@import "responsive.less"; \ No newline at end of file -- cgit v1.2.3 From 7a6737512a18f56bb95a0024fdbd4a8823034b76 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 26 Jan 2012 14:50:55 -0800 Subject: break scaffolding down into smaller less files --- lib/bootstrap.less | 2 ++ 1 file changed, 2 insertions(+) (limited to 'lib/bootstrap.less') diff --git a/lib/bootstrap.less b/lib/bootstrap.less index 8d307d427..40ebd7f2f 100644 --- a/lib/bootstrap.less +++ b/lib/bootstrap.less @@ -18,6 +18,8 @@ // Grid system and page structure @import "scaffolding.less"; +@import "grid.less"; +@import "layouts.less"; // Base CSS @import "type.less"; -- cgit v1.2.3 From f82db4b95bf12bc6c04a5ecc3d4a649ba9800db0 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 26 Jan 2012 14:53:35 -0800 Subject: separate code from type css files --- lib/bootstrap.less | 1 + 1 file changed, 1 insertion(+) (limited to 'lib/bootstrap.less') diff --git a/lib/bootstrap.less b/lib/bootstrap.less index 40ebd7f2f..ede31c035 100644 --- a/lib/bootstrap.less +++ b/lib/bootstrap.less @@ -23,6 +23,7 @@ // Base CSS @import "type.less"; +@import "code.less"; @import "forms.less"; @import "tables.less"; -- cgit v1.2.3 From ef4e3bc0f7549e327c45792884a264faab402400 Mon Sep 17 00:00:00 2001 From: Linmiao Xu Date: Thu, 26 Jan 2012 15:51:11 -0800 Subject: Move hero-unit css out of pattern.less and include it. Fixes #1185. --- lib/bootstrap.less | 1 + 1 file changed, 1 insertion(+) (limited to 'lib/bootstrap.less') diff --git a/lib/bootstrap.less b/lib/bootstrap.less index ede31c035..bc9f84373 100644 --- a/lib/bootstrap.less +++ b/lib/bootstrap.less @@ -57,6 +57,7 @@ @import "progress-bars.less"; @import "accordion.less"; @import "carousel.less"; +@import "hero-unit.less"; // Utility classes @import "utilities.less"; // Has to be last to override when necessary -- cgit v1.2.3 From dc2deb9a1b1995bbabee91bfd579d9b466fe78f2 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Thu, 26 Jan 2012 21:48:46 -0800 Subject: moving structure around + more work on builder... --- lib/bootstrap.less | 63 ------------------------------------------------------ 1 file changed, 63 deletions(-) delete mode 100644 lib/bootstrap.less (limited to 'lib/bootstrap.less') diff --git a/lib/bootstrap.less b/lib/bootstrap.less deleted file mode 100644 index bc9f84373..000000000 --- a/lib/bootstrap.less +++ /dev/null @@ -1,63 +0,0 @@ -/*! - * Bootstrap @VERSION - * - * Copyright 2012 Twitter, Inc - * Licensed under the Apache License v2.0 - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: @DATE - */ - -// CSS Reset -@import "reset.less"; - -// Core variables and mixins -@import "variables.less"; // Modify this for custom colors, font-sizes, etc -@import "mixins.less"; - -// Grid system and page structure -@import "scaffolding.less"; -@import "grid.less"; -@import "layouts.less"; - -// Base CSS -@import "type.less"; -@import "code.less"; -@import "forms.less"; -@import "tables.less"; - -// Components: common -@import "sprites.less"; -@import "dropdowns.less"; -@import "wells.less"; -@import "component-animations.less"; -@import "close.less"; - -// Components: Nav -@import "navs.less"; -@import "navbar.less"; -@import "breadcrumbs.less"; -@import "pagination.less"; -@import "pager.less"; - -// Components: Popovers -@import "modals.less"; -@import "tooltip.less"; -@import "popovers.less"; - -// Components: Buttons & Alerts -@import "buttons.less"; -@import "button-groups.less"; -@import "alerts.less"; // Note: alerts share common CSS with buttons and thus have styles in buttons.less - -// Components: Misc -@import "thumbnails.less"; -@import "labels.less"; -@import "progress-bars.less"; -@import "accordion.less"; -@import "carousel.less"; -@import "hero-unit.less"; - -// Utility classes -@import "utilities.less"; // Has to be last to override when necessary -- cgit v1.2.3