]> git.ipfire.org Git - thirdparty/bootstrap.git/log
thirdparty/bootstrap.git
11 years agoFixed error in documentation in mixins.less 10427/head
Liam [Wed, 4 Sep 2013 08:59:44 +0000 (18:59 +1000)] 
Fixed error in documentation in mixins.less

11 years agoMerge pull request #10423 from hustlzp/master
Chris Rebert [Wed, 4 Sep 2013 07:54:03 +0000 (00:54 -0700)] 
Merge pull request #10423 from hustlzp/master

CSS docs - Grid section: two dots are missing before 'col-md-8'

11 years agoCSS docs - Grid section: two dots are missing before 'col-md-8' 10423/head
Zhipeng Liu [Wed, 4 Sep 2013 07:45:10 +0000 (15:45 +0800)] 
CSS docs - Grid section: two dots are missing before 'col-md-8'

Add the two missing docs

11 years agoMerge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Wed, 4 Sep 2013 03:17:45 +0000 (20:17 -0700)] 
Merge branch 'master' of github.com:twbs/bootstrap

11 years agoFixes #10407: Add line-height to progress bar for proper text alignment within
Mark Otto [Wed, 4 Sep 2013 03:11:27 +0000 (20:11 -0700)] 
Fixes #10407: Add line-height to progress bar for proper text alignment within

11 years agoMerge pull request #10419 from twbs/doc-that-nav-lists-are-gone
Chris Rebert [Wed, 4 Sep 2013 02:54:34 +0000 (19:54 -0700)] 
Merge pull request #10419 from twbs/doc-that-nav-lists-are-gone

add .nav-list & .nav-header to removals section of migration guide

11 years agoadd .nav-list & .nav-header to removals section of migration guide; fixes #9139 10419/head
Chris Rebert [Wed, 4 Sep 2013 02:52:25 +0000 (19:52 -0700)] 
add .nav-list & .nav-header to removals section of migration guide; fixes #9139

11 years agoMerge branch 'master' into carousel-glyphicons-mainstream
Mark Otto [Wed, 4 Sep 2013 01:43:42 +0000 (18:43 -0700)] 
Merge branch 'master' into carousel-glyphicons-mainstream

Conflicts:
javascript.html

11 years agodat grunt
Mark Otto [Wed, 4 Sep 2013 01:31:02 +0000 (18:31 -0700)] 
dat grunt

11 years agoMerge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Wed, 4 Sep 2013 01:21:28 +0000 (18:21 -0700)] 
Merge branch 'master' of github.com:twbs/bootstrap

11 years agoMerge branch 'color-code-IE89-table'
Mark Otto [Wed, 4 Sep 2013 01:20:43 +0000 (18:20 -0700)] 
Merge branch 'color-code-IE89-table'

11 years agoColor code IE8-9 table with text classes and Glyhpicons instead of table classes
Mark Otto [Wed, 4 Sep 2013 01:20:21 +0000 (18:20 -0700)] 
Color code IE8-9 table with text classes and Glyhpicons instead of table classes

11 years agoMerge pull request #10413 from twbs/carousel-transitions-no-fallback-note
Mark Otto [Wed, 4 Sep 2013 01:09:49 +0000 (18:09 -0700)] 
Merge pull request #10413 from twbs/carousel-transitions-no-fallback-note

address #10343 more directly: add note on carousel transitions in IE8+9

11 years agomake Glyphicons mainstream in Carousel examples 10414/head
Chris Rebert [Wed, 4 Sep 2013 00:46:35 +0000 (17:46 -0700)] 
make Glyphicons mainstream in Carousel examples

11 years agoaddress #10343 more directly: add note on carousel transitions in IE8+9 10413/head
Chris Rebert [Wed, 4 Sep 2013 00:34:21 +0000 (17:34 -0700)] 
address #10343 more directly: add note on carousel transitions in IE8+9

11 years agowe've got your back (sorta), Linux Firefox users
Chris Rebert [Wed, 4 Sep 2013 00:01:21 +0000 (17:01 -0700)] 
we've got your back (sorta), Linux Firefox users

11 years agoColor-code the "Internet Explorer 8 and 9" features table 10411/head
Chris Rebert [Tue, 3 Sep 2013 23:51:17 +0000 (16:51 -0700)] 
Color-code the "Internet Explorer 8 and 9" features table

11 years agodocs: fix typo in "Internet Explorer 8 and 9" features table
Chris Rebert [Tue, 3 Sep 2013 23:46:02 +0000 (16:46 -0700)] 
docs: fix typo in "Internet Explorer 8 and 9" features table

"placehoder" (sic)

11 years agocopyedit "Internet Explorer 8 and box-sizing" section
Chris Rebert [Tue, 3 Sep 2013 23:36:13 +0000 (16:36 -0700)] 
copyedit "Internet Explorer 8 and box-sizing" section

11 years agoMerge pull request #10408 from twbs/getting-started-minor-edits
Mark Otto [Tue, 3 Sep 2013 22:52:28 +0000 (15:52 -0700)] 
Merge pull request #10408 from twbs/getting-started-minor-edits

CSS vs. LESS vs. styles terminology; "precompiled" terminology

11 years agoMerge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Tue, 3 Sep 2013 22:50:44 +0000 (15:50 -0700)] 
Merge branch 'master' of github.com:twbs/bootstrap

11 years agofixes #10406: Update grid to use width on .container instead of max-width as IE8...
Mark Otto [Tue, 3 Sep 2013 22:49:03 +0000 (15:49 -0700)] 
fixes #10406: Update grid to use width on .container instead of max-width as IE8 improperly computes width

11 years agoremove min-height from ads because ie8
Mark Otto [Tue, 3 Sep 2013 22:35:48 +0000 (15:35 -0700)] 
remove min-height from ads because ie8

11 years agomore space below links on homepage
Mark Otto [Tue, 3 Sep 2013 22:33:36 +0000 (15:33 -0700)] 
more space below links on homepage

11 years agominor copyedit
Chris Rebert [Tue, 3 Sep 2013 19:53:52 +0000 (12:53 -0700)] 
minor copyedit

11 years agoCSS vs. LESS vs. styles terminology; "precompiled" terminology 10408/head
Chris Rebert [Tue, 3 Sep 2013 19:32:24 +0000 (12:32 -0700)] 
CSS vs. LESS vs. styles terminology; "precompiled" terminology

11 years agoslightly clarify button.active use in docs
Chris Rebert [Tue, 3 Sep 2013 19:21:19 +0000 (12:21 -0700)] 
slightly clarify button.active use in docs

11 years agobump grunt-contrib-connect to 0.4.0
Chris Rebert [Tue, 3 Sep 2013 19:17:30 +0000 (12:17 -0700)] 
bump grunt-contrib-connect to 0.4.0

Thanks David.

11 years agominor copyedit
Chris Rebert [Tue, 3 Sep 2013 19:15:33 +0000 (12:15 -0700)] 
minor copyedit

11 years agoMerge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Tue, 3 Sep 2013 14:31:00 +0000 (07:31 -0700)] 
Merge branch 'master' of github.com:twbs/bootstrap

11 years agofixes #10396: mention table class change in migration docs
Mark Otto [Tue, 3 Sep 2013 14:30:46 +0000 (07:30 -0700)] 
fixes #10396: mention table class change in migration docs

11 years agoMerge pull request #10375 from StevenBlack/GSEdits4
Mark Otto [Tue, 3 Sep 2013 09:28:01 +0000 (02:28 -0700)] 
Merge pull request #10375 from StevenBlack/GSEdits4

Refactoring the paragraph describing the 'Examples' section.

11 years agoremove unused .panel-collapse ruleset
Mark Otto [Tue, 3 Sep 2013 08:04:17 +0000 (01:04 -0700)] 
remove unused .panel-collapse ruleset

11 years agoMerge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Tue, 3 Sep 2013 07:55:29 +0000 (00:55 -0700)] 
Merge branch 'master' of github.com:twbs/bootstrap

11 years agomo betta docs on box-sizing to build on e521ee83094f5a70978cc9d879f400c3ac95369c
Mark Otto [Tue, 3 Sep 2013 07:49:59 +0000 (00:49 -0700)] 
mo betta docs on box-sizing to build on e521ee83094f5a70978cc9d879f400c3ac95369c

11 years agofixes #10372: two download buttons on homepage; also fixes broke button styles
Mark Otto [Tue, 3 Sep 2013 03:20:47 +0000 (20:20 -0700)] 
fixes #10372: two download buttons on homepage; also fixes broke button styles

11 years agoMerge pull request #10382 from StevenBlack/GSEdits5
Mark Otto [Tue, 3 Sep 2013 03:13:57 +0000 (20:13 -0700)] 
Merge pull request #10382 from StevenBlack/GSEdits5

'Disabling responsiveness' section of docs: simplification and focus

11 years agoMerge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Tue, 3 Sep 2013 02:53:20 +0000 (19:53 -0700)] 
Merge branch 'master' of github.com:twbs/bootstrap

11 years agoupdate box-sizing third party support section to include mention of google CSE and...
Mark Otto [Tue, 3 Sep 2013 02:52:59 +0000 (19:52 -0700)] 
update box-sizing third party support section to include mention of google CSE and expand to include CSS and Less options

11 years agoGetting Started page: Simplified and focused the text of the 'Disabling responsivenes... 10382/head
Steven Black [Tue, 3 Sep 2013 00:01:36 +0000 (20:01 -0400)] 
Getting Started page: Simplified and focused the text of the 'Disabling responsiveness' section.

11 years agoRefactoring the paragraph describing the 'Examples' section. 10375/head
Steven Black [Mon, 2 Sep 2013 19:24:55 +0000 (15:24 -0400)] 
Refactoring the paragraph describing the 'Examples' section.

11 years agoMerge pull request #10374 from tagliala/patch-2
Julian Thilo [Mon, 2 Sep 2013 17:32:45 +0000 (10:32 -0700)] 
Merge pull request #10374 from tagliala/patch-2

Fixed glyphicons count

11 years agoMerge pull request #10366 from coliff/patch-2
Chris Rebert [Mon, 2 Sep 2013 17:31:55 +0000 (10:31 -0700)] 
Merge pull request #10366 from coliff/patch-2

Update index.html (change from 'hero unit' to 'jumbotron')

11 years agoUpdate index.html 10366/head
Christian [Mon, 2 Sep 2013 12:36:54 +0000 (21:36 +0900)] 
Update index.html

Updated text in the jumbotron container to reflect the Bootstrap 3 change from 'hero unit' to 'jumbotron'.

11 years agoMerge pull request #10364 from wangsai/patch-1
Chris Rebert [Mon, 2 Sep 2013 09:50:45 +0000 (02:50 -0700)] 
Merge pull request #10364 from wangsai/patch-1

Completion of parentheses

11 years agoCompletion of parentheses 10364/head
wangsai [Mon, 2 Sep 2013 09:47:04 +0000 (17:47 +0800)] 
Completion of parentheses

11 years agoderp, add on to #10153 with proper variable /cc @ggam
Mark Otto [Mon, 2 Sep 2013 03:52:23 +0000 (20:52 -0700)] 
derp, add on to #10153 with proper variable /cc @ggam

11 years agoMerge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Sun, 1 Sep 2013 22:10:35 +0000 (00:10 +0200)] 
Merge branch 'master' of github.com:twbs/bootstrap

11 years agofixes #10316: Document .active and :active for buttons
Mark Otto [Sun, 1 Sep 2013 22:09:49 +0000 (00:09 +0200)] 
fixes #10316: Document .active and :active for buttons

11 years agoMerge pull request #10342 from twbs/affix-docs
Mark Otto [Sun, 1 Sep 2013 21:59:34 +0000 (14:59 -0700)] 
Merge pull request #10342 from twbs/affix-docs

minor improvements to affix docs

11 years agofixes #10344: Update IE8-9 support section with table of specific CSS3 and HTML5...
Mark Otto [Sun, 1 Sep 2013 21:58:22 +0000 (23:58 +0200)] 
fixes #10344: Update IE8-9 support section with table of specific CSS3 and HTML5 features and their support in Bootstrap

11 years agoRemove links to navbar examples from example navbars in Theme example--nullifies...
Mark Otto [Sun, 1 Sep 2013 21:43:51 +0000 (23:43 +0200)] 
Remove links to navbar examples from example navbars in Theme example--nullifies #9894

11 years agoupdate vars to use new component-active-color
Mark Otto [Sun, 1 Sep 2013 21:40:04 +0000 (23:40 +0200)] 
update vars to use new component-active-color

11 years agofixes #9909: Add component active color variable to complement component active bg...
Mark Otto [Sun, 1 Sep 2013 21:38:11 +0000 (23:38 +0200)] 
fixes #9909: Add component active color variable to complement component active bg variable

11 years agoalt fix to #10278: Change Google Maps compatibility warning to a general box-sizing...
Mark Otto [Sun, 1 Sep 2013 21:32:35 +0000 (23:32 +0200)] 
alt fix to #10278: Change Google Maps compatibility warning to a general box-sizing warning

11 years agoMerge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Sun, 1 Sep 2013 19:55:59 +0000 (21:55 +0200)] 
Merge branch 'master' of github.com:twbs/bootstrap

11 years agoFixed glyphicons count 10374/head
Geremia Taglialatela [Sun, 1 Sep 2013 12:36:32 +0000 (14:36 +0200)] 
Fixed glyphicons count

Glyphicons are 200

refers to #9794

11 years agofix straggler instance of "Tiny grid" terminology
Chris Rebert [Sun, 1 Sep 2013 11:14:55 +0000 (04:14 -0700)] 
fix straggler instance of "Tiny grid" terminology

11 years agofixes #10164: Document .center-block mixin and update CSS to include it as a class...
Mark Otto [Sun, 1 Sep 2013 09:20:58 +0000 (11:20 +0200)] 
fixes #10164: Document .center-block mixin and update CSS to include it as a class as well

11 years agominor improvements to affix docs 10342/head
Chris Rebert [Sun, 1 Sep 2013 09:09:12 +0000 (02:09 -0700)] 
minor improvements to affix docs

11 years agoreverse vars for backwards compatibility /cc @cvrebert
Mark Otto [Sun, 1 Sep 2013 09:06:33 +0000 (11:06 +0200)] 
reverse vars for backwards compatibility /cc @cvrebert

11 years agoMerge branch 'deprecate_screen_containers'
Mark Otto [Sun, 1 Sep 2013 09:05:14 +0000 (11:05 +0200)] 
Merge branch 'deprecate_screen_containers'

11 years agofixes #10115: Default carousel controls and Glyphicon controls should behave the...
Mark Otto [Sun, 1 Sep 2013 09:03:19 +0000 (11:03 +0200)] 
fixes #10115: Default carousel controls and Glyphicon controls should behave the same on small devices and up

11 years agofixes #10111: different colors for dropdown link hover and active states
Mark Otto [Sun, 1 Sep 2013 09:00:40 +0000 (11:00 +0200)] 
fixes #10111: different colors for dropdown link hover and active states

11 years agotweak #10336 to double up on the hyphen-minuses to better approximate a long dash
Chris Rebert [Sun, 1 Sep 2013 08:46:18 +0000 (01:46 -0700)] 
tweak #10336 to double up on the hyphen-minuses to better approximate a long dash

11 years agoMerge pull request #10336 from Shipow/master
Chris Rebert [Sun, 1 Sep 2013 08:43:48 +0000 (01:43 -0700)] 
Merge pull request #10336 from Shipow/master

Replace invalid US-ASCII character "\xE2")

11 years agotweak #10298
Chris Rebert [Sun, 1 Sep 2013 08:35:56 +0000 (01:35 -0700)] 
tweak #10298

11 years agofixes alignment and nav list in offcanvas example
Mark Otto [Sun, 1 Sep 2013 08:34:21 +0000 (10:34 +0200)] 
fixes alignment and nav list in offcanvas example

11 years agoMerge pull request #10298 from jhr007/patch-1
Chris Rebert [Sun, 1 Sep 2013 08:34:15 +0000 (01:34 -0700)] 
Merge pull request #10298 from jhr007/patch-1

Note the change to the progress bar.

11 years agofixes #10282: Cross reference tabs and tabs plugin
Mark Otto [Sun, 1 Sep 2013 08:27:20 +0000 (10:27 +0200)] 
fixes #10282: Cross reference tabs and tabs plugin

11 years agofixes #10277: Mention removal of navbar vertical dividers in migration docs
Mark Otto [Sun, 1 Sep 2013 08:21:27 +0000 (10:21 +0200)] 
fixes #10277: Mention removal of navbar vertical dividers in migration docs

11 years agoremove unused link from navs section
Mark Otto [Sun, 1 Sep 2013 08:19:55 +0000 (10:19 +0200)] 
remove unused link from navs section

11 years agoMerge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Sun, 1 Sep 2013 08:18:54 +0000 (10:18 +0200)] 
Merge branch 'master' of github.com:twbs/bootstrap

11 years agofinishes #10256 to add updated var to customizer; also fixes another old var
Mark Otto [Sun, 1 Sep 2013 08:15:39 +0000 (10:15 +0200)] 
finishes #10256 to add updated var to customizer; also fixes another old var

11 years agoMerge branch 'master' into tagliala-patch-1
Mark Otto [Sun, 1 Sep 2013 08:13:47 +0000 (10:13 +0200)] 
Merge branch 'master' into tagliala-patch-1

11 years agoMerge pull request #10249 from coliff/patch-1
Mark Otto [Sun, 1 Sep 2013 08:09:55 +0000 (01:09 -0700)] 
Merge pull request #10249 from coliff/patch-1

Update index.html (update text from hero unit to jumbotron)

11 years agorestore "only" wording in docs regarding Recess/less.js
Chris Rebert [Sun, 1 Sep 2013 08:09:28 +0000 (01:09 -0700)] 
restore "only" wording in docs regarding Recess/less.js

It was there for good reason.
We're not gonna deal with lessphp or dotless bugs.

11 years agofixes #10246: Use correct variable for link hover color in Customizer
Mark Otto [Sun, 1 Sep 2013 08:07:15 +0000 (10:07 +0200)] 
fixes #10246: Use correct variable for link hover color in Customizer

11 years agoMerge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Sun, 1 Sep 2013 08:04:54 +0000 (10:04 +0200)] 
Merge branch 'master' of github.com:twbs/bootstrap

11 years agobetter layout
Mark Otto [Sun, 1 Sep 2013 08:04:44 +0000 (10:04 +0200)] 
better layout

11 years agofinishes #10245 by adding it the new var to the customizer
Mark Otto [Sun, 1 Sep 2013 08:04:03 +0000 (10:04 +0200)] 
finishes #10245 by adding it the new var to the customizer

11 years agoMerge branch 'master' into dancek-breadcrumb-separator
Mark Otto [Sun, 1 Sep 2013 08:01:57 +0000 (10:01 +0200)] 
Merge branch 'master' into dancek-breadcrumb-separator

11 years agoMerge pull request #10232 from twbs/table-nesting
Mark Otto [Sun, 1 Sep 2013 07:59:55 +0000 (00:59 -0700)] 
Merge pull request #10232 from twbs/table-nesting

use direct-child selector more in table styles to better support nested tables

11 years agoMerge branch 'master' into table-nesting 10232/head
Mark Otto [Sun, 1 Sep 2013 07:59:27 +0000 (09:59 +0200)] 
Merge branch 'master' into table-nesting

Conflicts:
dist/css/bootstrap.min.css

11 years agofixes #10223: adds color to input addon
Mark Otto [Sun, 1 Sep 2013 07:53:41 +0000 (09:53 +0200)] 
fixes #10223: adds color to input addon

11 years agofixes #10153: restore headings-color variable
Mark Otto [Sun, 1 Sep 2013 07:49:28 +0000 (09:49 +0200)] 
fixes #10153: restore headings-color variable

11 years agofixes #10136
Mark Otto [Sun, 1 Sep 2013 07:46:33 +0000 (09:46 +0200)] 
fixes #10136

11 years agoMerge branch 'master' into deprecate_screen_containers 10125/head
Mark Otto [Sun, 1 Sep 2013 07:33:11 +0000 (09:33 +0200)] 
Merge branch 'master' into deprecate_screen_containers

11 years agoMerge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Sun, 1 Sep 2013 06:18:46 +0000 (08:18 +0200)] 
Merge branch 'master' of github.com:twbs/bootstrap

11 years agoMerge pull request #10299 from StevenBlack/GettingStartedEdits1
Mark Otto [Sun, 1 Sep 2013 06:17:54 +0000 (23:17 -0700)] 
Merge pull request #10299 from StevenBlack/GettingStartedEdits1

'Getting started' section: refactoring for succinctness, active voice, and consistency with button and link captions.

11 years agoMerge pull request #10323 from StevenBlack/GSEdits3
Mark Otto [Sun, 1 Sep 2013 06:15:47 +0000 (23:15 -0700)] 
Merge pull request #10323 from StevenBlack/GSEdits3

Getting started docs: tweaks to the _Basic template_ section

11 years agoMerge branch 'patch-1' of https://github.com/tagliala/bootstrap into tagliala-patch-1
Mark Otto [Sun, 1 Sep 2013 06:13:51 +0000 (08:13 +0200)] 
Merge branch 'patch-1' of https://github.com/tagliala/bootstrap into tagliala-patch-1

11 years agoMerge branch 'breadcrumb-separator' of https://github.com/dancek/bootstrap into dance...
Mark Otto [Sun, 1 Sep 2013 06:12:56 +0000 (08:12 +0200)] 
Merge branch 'breadcrumb-separator' of https://github.com/dancek/bootstrap into dancek-breadcrumb-separator

11 years agoReplace invalid US-ASCII character "\xE2") 10336/head
Kevin Granger [Sat, 31 Aug 2013 15:50:14 +0000 (17:50 +0200)] 
Replace invalid US-ASCII character "\xE2")

Replace invalid US-ASCII character "\xE2") '—' => '-'

11 years agoMerge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Sat, 31 Aug 2013 07:04:17 +0000 (09:04 +0200)] 
Merge branch 'master' of github.com:twbs/bootstrap

11 years agoMerge pull request #10265 from twbs/fix-10252
Mark Otto [Sat, 31 Aug 2013 06:31:30 +0000 (23:31 -0700)] 
Merge pull request #10265 from twbs/fix-10252

fix #10252 by restricting Android Firefox reset to only .form-control & .btn

11 years agoGetting started docs: tweaks to the _Basic template_ section 10323/head
Steven Black [Sat, 31 Aug 2013 04:03:14 +0000 (00:03 -0400)] 
Getting started docs: tweaks to the _Basic template_ section

11 years agoMerge pull request #10315 from mokkabonna/phantom-cleanup
Chris Rebert [Fri, 30 Aug 2013 19:58:24 +0000 (12:58 -0700)] 
Merge pull request #10315 from mokkabonna/phantom-cleanup

deleted files not used anymore after transition to grunt-contrib-qunit

11 years agodeleted files not used anymore after transition to grunt-contrib-qunit 10315/head
Martin Hansen [Fri, 30 Aug 2013 19:39:48 +0000 (21:39 +0200)] 
deleted files not used anymore after transition to grunt-contrib-qunit

11 years agoMerge pull request #10312 from jleight/master
Chris Rebert [Fri, 30 Aug 2013 19:26:11 +0000 (12:26 -0700)] 
Merge pull request #10312 from jleight/master

Fix broken link to alerts section of JS page.