]> git.ipfire.org Git - thirdparty/bootstrap.git/log
thirdparty/bootstrap.git
12 years agouse @screen-small var in grid.less 7782/head
Chris Rebert [Sat, 4 May 2013 00:38:58 +0000 (17:38 -0700)] 
use @screen-small var in grid.less

Per comment by @nextgenthemes on/in cd06c5baac64a366

12 years agoMerge pull request #7621 from jeremydenoun/patch-1
Mark Otto [Sat, 4 May 2013 00:32:54 +0000 (17:32 -0700)] 
Merge pull request #7621 from jeremydenoun/patch-1

Fix flickering on progress bar width update

12 years agoFixes #7511: add support for nested button groups so you can use dropdowns in your...
Mark Otto [Fri, 3 May 2013 23:16:26 +0000 (16:16 -0700)] 
Fixes #7511: add support for nested button groups so you can use dropdowns in your button groups

12 years agoFixes #7721: change @navbar-text to @navbar-color, along with inverse options
Mark Otto [Fri, 3 May 2013 22:29:32 +0000 (15:29 -0700)] 
Fixes #7721: change @navbar-text to @navbar-color, along with inverse options

12 years agorecompile after last justified nav tweaks
Mark Otto [Fri, 3 May 2013 22:29:10 +0000 (15:29 -0700)] 
recompile after last justified nav tweaks

12 years agoUpdate justified nav CSS for proper selectors
Mark Otto [Fri, 3 May 2013 22:18:04 +0000 (15:18 -0700)] 
Update justified nav CSS for proper selectors

12 years agoMerge pull request #7670 from DarDar/3.0.0-wip
Mark Otto [Fri, 3 May 2013 22:05:29 +0000 (15:05 -0700)] 
Merge pull request #7670 from DarDar/3.0.0-wip

Use @font-size-... variables instead of hardcoded font-size in px

12 years agoMerge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Mark Otto [Fri, 3 May 2013 21:57:07 +0000 (14:57 -0700)] 
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

12 years agoScope .table-bordered styles to immediate children only
Mark Otto [Fri, 3 May 2013 21:56:57 +0000 (14:56 -0700)] 
Scope .table-bordered styles to immediate children only

12 years agoremove .fade from static modal example, but include in code snippet
Mark Otto [Fri, 3 May 2013 21:46:09 +0000 (14:46 -0700)] 
remove .fade from static modal example, but include in code snippet

12 years agoMerge pull request #7769 from holic/3.0.0-sticky-footer
Mark Otto [Fri, 3 May 2013 21:29:11 +0000 (14:29 -0700)] 
Merge pull request #7769 from holic/3.0.0-sticky-footer

Use padding instead of #push with box-sizing: border-box

12 years agoMerge branch 'bs3_cdn_docs_mention' into 3.0.0-wip
Mark Otto [Fri, 3 May 2013 21:13:06 +0000 (14:13 -0700)] 
Merge branch 'bs3_cdn_docs_mention' into 3.0.0-wip

Conflicts:
docs/docs.html

12 years agoMerge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Mark Otto [Fri, 3 May 2013 21:11:23 +0000 (14:11 -0700)] 
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

12 years agoAdd cursor: pointer; to .checkbox and .radio and their inline counterparts
Mark Otto [Fri, 3 May 2013 18:56:00 +0000 (11:56 -0700)] 
Add cursor: pointer; to .checkbox and .radio and their inline counterparts

12 years agoMerge pull request #7762 from sethlilly/3.0.0-wip
Mark Otto [Fri, 3 May 2013 18:21:13 +0000 (11:21 -0700)] 
Merge pull request #7762 from sethlilly/3.0.0-wip

Corrected typo in carousel.html

12 years agoMerge pull request #7770 from holic/3.0.0-input-border-transition
Mark Otto [Fri, 3 May 2013 17:59:52 +0000 (10:59 -0700)] 
Merge pull request #7770 from holic/3.0.0-input-border-transition

Fix input border flicker in Chrome

12 years agorun make on previous commits
Mark Otto [Fri, 3 May 2013 17:53:26 +0000 (10:53 -0700)] 
run make on previous commits

12 years agoMore navbar CSS and docs cleanup
Mark Otto [Fri, 3 May 2013 06:13:43 +0000 (23:13 -0700)] 
More navbar CSS and docs cleanup

* Rearrange sections
* Add code snippets for text and links in navbars
* Add .navbar-link back in
* Add mention of .navbar-text, but it still needs to be re-implemented
* Update nav to reflect new order

12 years agoImprove buttons in navbars
Mark Otto [Fri, 3 May 2013 06:05:09 +0000 (23:05 -0700)] 
Improve buttons in navbars

* Add top margin, calculated by subtracting height of an input from height of a navbar, and dividing by two
* Uses the same method as .navbar-form
* To use, add .navbar-btn to any button outside a form element
* Also add section to docs detailing buttons in navbars, and add more ids for the other unlinked and unmentioned sections in the side nav

12 years agodelete lingering navbar dividers code since we nuked that awhile back
Mark Otto [Fri, 3 May 2013 05:58:30 +0000 (22:58 -0700)] 
delete lingering navbar dividers code since we nuked that awhile back

12 years agoCleanup .navbar-form styles
Mark Otto [Fri, 3 May 2013 05:52:32 +0000 (22:52 -0700)] 
Cleanup .navbar-form styles

* Nuke the commented out navbar forms code that's not currently needed
* Add a few more examples to the .navbar-form docs section
* Remove (for now at least) top padding on checkbox and radios

12 years agoadd customizer link to docs homepage
Mark Otto [Fri, 3 May 2013 05:44:43 +0000 (22:44 -0700)] 
add customizer link to docs homepage

12 years agoFix input border flicker in Chrome from @garoevans, closes #7689 7770/head
Kevin Ingersoll [Fri, 3 May 2013 03:27:10 +0000 (15:27 +1200)] 
Fix input border flicker in Chrome from @garoevans, closes #7689

12 years agoUse padding instead of #push with box-sizing: border-box 7769/head
Kevin Ingersoll [Fri, 3 May 2013 03:22:27 +0000 (15:22 +1200)] 
Use padding instead of #push with box-sizing: border-box

12 years agoCorrected typo in carousel.html 7762/head
Seth Lilly [Thu, 2 May 2013 17:03:54 +0000 (14:03 -0300)] 
Corrected typo in carousel.html

Changed text from "First featurette headling" to "First featurette heading" in the first `h2.featurette-heading` tag.

12 years agoUse @font-size-... variables instead of hardcoded font-size in px 7670/head
DarDar [Tue, 23 Apr 2013 22:41:06 +0000 (00:41 +0200)] 
Use @font-size-... variables instead of hardcoded font-size in px

12 years agoMerge pull request #7750 from hppycoder/3.0.0-wip
Mark Otto [Wed, 1 May 2013 18:50:29 +0000 (11:50 -0700)] 
Merge pull request #7750 from hppycoder/3.0.0-wip

Updating the README.md to fix the link to Bower

12 years agoUpdating the README.md to fix the link to Bower 7750/head
Chad Smith [Wed, 1 May 2013 17:47:52 +0000 (13:47 -0400)] 
Updating the README.md to fix the link to Bower

12 years agoadd the fade class to the default modal docs
Mark Otto [Wed, 1 May 2013 02:55:02 +0000 (19:55 -0700)] 
add the fade class to the default modal docs

12 years agooutdent the rows for tablets and above
Mark Otto [Wed, 1 May 2013 02:35:52 +0000 (19:35 -0700)] 
outdent the rows for tablets and above

12 years agomake that left/right padding, not top/bottom on navbar
Mark Otto [Wed, 1 May 2013 02:20:41 +0000 (19:20 -0700)] 
make that left/right padding, not top/bottom on navbar

12 years agoadd back bottom margin to navbars
Mark Otto [Wed, 1 May 2013 02:12:48 +0000 (19:12 -0700)] 
add back bottom margin to navbars

12 years agono need for zero padding on navbar top/bottom; better comment
Mark Otto [Wed, 1 May 2013 02:07:28 +0000 (19:07 -0700)] 
no need for zero padding on navbar top/bottom; better comment

12 years agono units on 0 values
Mark Otto [Wed, 1 May 2013 02:06:30 +0000 (19:06 -0700)] 
no units on 0 values

12 years agoFixes #7744: update grid mixin to use latest grid styles
Mark Otto [Tue, 30 Apr 2013 20:03:10 +0000 (13:03 -0700)] 
Fixes #7744: update grid mixin to use latest grid styles

12 years agonuke line numbers
Mark Otto [Tue, 30 Apr 2013 18:32:11 +0000 (11:32 -0700)] 
nuke line numbers

12 years agoMerge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Mark Otto [Mon, 29 Apr 2013 05:46:10 +0000 (22:46 -0700)] 
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

12 years agosingle colon pseudo element for ie8
Mark Otto [Mon, 29 Apr 2013 05:45:56 +0000 (22:45 -0700)] 
single colon pseudo element for ie8

12 years agoMerge pull request #7718 from burnsra/3.0.0-wip-breadcrumbs
Mark Otto [Mon, 29 Apr 2013 03:14:26 +0000 (20:14 -0700)] 
Merge pull request #7718 from burnsra/3.0.0-wip-breadcrumbs

Cleanup breadcrumb divider last item

12 years agoMerge pull request #7719 from burnsra/3.0.0-wip-grid-examples
Mark Otto [Mon, 29 Apr 2013 03:05:15 +0000 (20:05 -0700)] 
Merge pull request #7719 from burnsra/3.0.0-wip-grid-examples

Update examples after grid changes

12 years agoUpdate examples after grid changes 7719/head
Robert Burns [Mon, 29 Apr 2013 02:22:33 +0000 (22:22 -0400)] 
Update examples after grid changes

12 years agoCleanup breadcrumb divider last item 7718/head
Robert Burns [Mon, 29 Apr 2013 01:51:02 +0000 (21:51 -0400)] 
Cleanup breadcrumb divider last item

Modify to hide both padding and leading/trailing whitespace
Thanks to https://github.com/holic for suggestion

12 years agoMerge pull request #7704 from twitter/bs3_moar_grid_changes
Mark Otto [Mon, 29 Apr 2013 01:44:54 +0000 (18:44 -0700)] 
Merge pull request #7704 from twitter/bs3_moar_grid_changes

BS3: Overhaul grid system once more

12 years agoMerge pull request #7716 from burnsra/3.0.0-wip-navbar
Mark Otto [Mon, 29 Apr 2013 01:42:20 +0000 (18:42 -0700)] 
Merge pull request #7716 from burnsra/3.0.0-wip-navbar

Fix navbar-toggle after commit bbee78b30b40ff0b1473a06ea7ecf5a42d51b614

12 years agoFix navbar-toggle after commit bbee78b30b40ff0b1473a06ea7ecf5a42d51b614 7716/head
Robert Burns [Mon, 29 Apr 2013 00:45:42 +0000 (20:45 -0400)] 
Fix navbar-toggle after commit bbee78b30b40ff0b1473a06ea7ecf5a42d51b614

The following commit introduced an issue with the navbar toggle placement:
https://github.com/twitter/bootstrap/commit/bbee78b30b40ff0b1473a06ea7ecf5a42d51b614

12 years agoMerge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Mark Otto [Sun, 28 Apr 2013 21:27:58 +0000 (14:27 -0700)] 
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

12 years agoderp on navbar toggle and docs positions
Mark Otto [Sun, 28 Apr 2013 21:27:48 +0000 (14:27 -0700)] 
derp on navbar toggle and docs positions

12 years agoMerge pull request #7713 from burnsra/3.0.0-wip-navs-overhaul
Mark Otto [Sun, 28 Apr 2013 21:26:10 +0000 (14:26 -0700)] 
Merge pull request #7713 from burnsra/3.0.0-wip-navs-overhaul

Fix navbar on phone/tablet devices after navbar overhaul

12 years agoMerge pull request #7712 from burnsra/3.0.0-wip-navs
Mark Otto [Sun, 28 Apr 2013 21:24:49 +0000 (14:24 -0700)] 
Merge pull request #7712 from burnsra/3.0.0-wip-navs

Update examples after navbar overhaul

12 years agoFix navbar on phone/tablet devices after navbar overhaul 7713/head
Robert Burns [Sun, 28 Apr 2013 14:08:48 +0000 (10:08 -0400)] 
Fix navbar on phone/tablet devices after navbar overhaul

12 years agoUpdate examples after overhaul of navbar navs 7712/head
Robert Burns [Sun, 28 Apr 2013 13:10:01 +0000 (09:10 -0400)] 
Update examples after overhaul of navbar navs

12 years agoOverhaul navbar navs
Mark Otto [Sun, 28 Apr 2013 01:28:39 +0000 (18:28 -0700)] 
Overhaul navbar navs

* Switch from  to  to eliminate an element in selectors
* Drop .navbar-divider entirely

12 years agoAdd maximum bounds variables for so our responsive utilities don't overlap
Mark Otto [Sat, 27 Apr 2013 18:55:45 +0000 (11:55 -0700)] 
Add maximum bounds variables for so our responsive utilities don't overlap

12 years agoAdding media queries breakpoints variables 7707/head
Kevin [Sat, 27 Apr 2013 16:47:47 +0000 (18:47 +0200)] 
Adding media queries breakpoints variables

12 years agoBack to two grid classes, .col and .col-lg-* 7704/head
Mark Otto [Sat, 27 Apr 2013 06:59:51 +0000 (23:59 -0700)] 
Back to two grid classes, .col and .col-lg-*

12 years agoFixes #7688: move font-weight for glyphicons to before pseudo element
Mark Otto [Sat, 27 Apr 2013 06:13:04 +0000 (23:13 -0700)] 
Fixes #7688: move font-weight for glyphicons to before pseudo element

12 years agoRedo the getting started section to mention BootstrapCDN 7702/head
Mark Otto [Sat, 27 Apr 2013 03:51:48 +0000 (20:51 -0700)] 
Redo the getting started section to mention BootstrapCDN

12 years agorunning make
Mark Otto [Fri, 26 Apr 2013 17:44:44 +0000 (10:44 -0700)] 
running make

12 years agoMerge pull request #7641 from Fowowski/3.0.0-wip
Mark Otto [Thu, 25 Apr 2013 21:51:41 +0000 (14:51 -0700)] 
Merge pull request #7641 from Fowowski/3.0.0-wip

more nested less rules - labels component

12 years ago- changed comments 7641/head
Artur Kwiatkowski [Wed, 24 Apr 2013 11:54:17 +0000 (13:54 +0200)] 
- changed comments
- added hover and focus state for [href] color variations

12 years ago'docs' folder .editorconfig code guide updates
Stephen Edgar [Tue, 23 Apr 2013 07:40:41 +0000 (17:40 +1000)] 
'docs' folder .editorconfig code guide updates

12 years ago'js' folder .editorconfig code guide updates
Stephen Edgar [Tue, 23 Apr 2013 07:34:27 +0000 (17:34 +1000)] 
'js' folder .editorconfig code guide updates

12 years ago'less' folder .editorconfig code guide updates
Stephen Edgar [Tue, 23 Apr 2013 07:30:22 +0000 (17:30 +1000)] 
'less' folder .editorconfig code guide updates

12 years ago'root' folder .editorconfig code guide updates
Stephen Edgar [Tue, 23 Apr 2013 07:27:29 +0000 (17:27 +1000)] 
'root' folder .editorconfig code guide updates

12 years agoshoutout to editorconfig in readme
Mark Otto [Tue, 23 Apr 2013 06:02:57 +0000 (23:02 -0700)] 
shoutout to editorconfig in readme

12 years agoexplicit callout in readme for building static assets; fixes #7632
Mark Otto [Tue, 23 Apr 2013 06:01:11 +0000 (23:01 -0700)] 
explicit callout in readme for building static assets; fixes #7632

12 years agoFixes #7661
Chris Rebert [Mon, 22 Apr 2013 23:11:11 +0000 (16:11 -0700)] 
Fixes #7661

12 years ago'root' repo end 'insert_final_newline = true'
Stephen Edgar [Mon, 22 Apr 2013 07:19:56 +0000 (17:19 +1000)] 
'root' repo end 'insert_final_newline = true'

12 years agoUse* global rules with exceptions as needed
Stephen Edgar [Mon, 22 Apr 2013 07:10:59 +0000 (17:10 +1000)] 
Use* global rules with exceptions as needed

12 years agoRefined .editorconfig
Stephen Edgar [Sun, 21 Apr 2013 06:52:32 +0000 (16:52 +1000)] 
Refined .editorconfig

12 years agoInclude .editorconfig
Stephen Edgar [Sat, 20 Apr 2013 04:28:50 +0000 (14:28 +1000)] 
Include .editorconfig

http://editorconfig.org/

12 years agoMerge pull request #7664 from ntwb/editorconfig-3.0.0-wip
Mark Otto [Tue, 23 Apr 2013 15:58:23 +0000 (08:58 -0700)] 
Merge pull request #7664 from ntwb/editorconfig-3.0.0-wip

Editor Config (.editorconfig) Code Guide Update

12 years ago'docs' folder .editorconfig code guide updates 7664/head
Stephen Edgar [Tue, 23 Apr 2013 07:40:41 +0000 (17:40 +1000)] 
'docs' folder .editorconfig code guide updates

12 years ago'js' folder .editorconfig code guide updates
Stephen Edgar [Tue, 23 Apr 2013 07:34:27 +0000 (17:34 +1000)] 
'js' folder .editorconfig code guide updates

12 years ago'less' folder .editorconfig code guide updates
Stephen Edgar [Tue, 23 Apr 2013 07:30:22 +0000 (17:30 +1000)] 
'less' folder .editorconfig code guide updates

12 years ago'root' folder .editorconfig code guide updates
Stephen Edgar [Tue, 23 Apr 2013 07:27:29 +0000 (17:27 +1000)] 
'root' folder .editorconfig code guide updates

12 years agoMerge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Mark Otto [Tue, 23 Apr 2013 06:04:24 +0000 (23:04 -0700)] 
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

12 years agoshoutout to editorconfig in readme
Mark Otto [Tue, 23 Apr 2013 06:02:57 +0000 (23:02 -0700)] 
shoutout to editorconfig in readme

12 years agoexplicit callout in readme for building static assets; fixes #7632
Mark Otto [Tue, 23 Apr 2013 06:01:11 +0000 (23:01 -0700)] 
explicit callout in readme for building static assets; fixes #7632

12 years agoMerge branch 'ntwb-editorconfig' into 3.0.0-wip
Mark Otto [Tue, 23 Apr 2013 05:58:33 +0000 (22:58 -0700)] 
Merge branch 'ntwb-editorconfig' into 3.0.0-wip

12 years agoMerge pull request #7662 from cvrebert/less-1.4-fixes
Mark Otto [Tue, 23 Apr 2013 03:38:14 +0000 (20:38 -0700)] 
Merge pull request #7662 from cvrebert/less-1.4-fixes

Fixes #7661

12 years agoFixes #7661 7662/head
Chris Rebert [Mon, 22 Apr 2013 23:11:11 +0000 (16:11 -0700)] 
Fixes #7661

12 years agoNuked local .a() mixins and simplified the nesting
Artur Kwiatkowski [Mon, 22 Apr 2013 13:34:23 +0000 (15:34 +0200)] 
Nuked local .a() mixins and simplified the nesting

12 years agoMerge branch '3.0.0-wip' of https://github.com/twitter/bootstrap into 3.0.0-wip
Artur Kwiatkowski [Mon, 22 Apr 2013 13:21:55 +0000 (15:21 +0200)] 
Merge branch '3.0.0-wip' of https://github.com/twitter/bootstrap into 3.0.0-wip

12 years ago'root' repo end 'insert_final_newline = true' 7642/head
Stephen Edgar [Mon, 22 Apr 2013 07:19:56 +0000 (17:19 +1000)] 
'root' repo end 'insert_final_newline = true'

12 years agoUse* global rules with exceptions as needed
Stephen Edgar [Mon, 22 Apr 2013 07:10:59 +0000 (17:10 +1000)] 
Use* global rules with exceptions as needed

12 years agoFixes #7617: lowercase and dash gray color vars
Mark Otto [Mon, 22 Apr 2013 02:35:36 +0000 (19:35 -0700)] 
Fixes #7617: lowercase and dash gray color vars

12 years agoFixes #7648: Thumbnail caption should use @text-color variable. Also adds other thumb...
Mark Otto [Mon, 22 Apr 2013 01:29:06 +0000 (18:29 -0700)] 
Fixes #7648: Thumbnail caption should use @text-color variable. Also adds other thumbnail vars

12 years agotypo
Mark Otto [Mon, 22 Apr 2013 01:25:49 +0000 (18:25 -0700)] 
typo

12 years agoFixes #7577: Attempt to fix, at least, issues with Windows Phone 8 and responsive...
Mark Otto [Sun, 21 Apr 2013 21:50:44 +0000 (14:50 -0700)] 
Fixes #7577: Attempt to fix, at least, issues with Windows Phone 8 and responsive not kicking in correctly

12 years agoRefined .editorconfig
Stephen Edgar [Sun, 21 Apr 2013 06:52:32 +0000 (16:52 +1000)] 
Refined .editorconfig

12 years agoFixes #7591: add .make-small-column() mixin
Mark Otto [Sat, 20 Apr 2013 22:54:44 +0000 (15:54 -0700)] 
Fixes #7591: add .make-small-column() mixin

12 years agoMake alerts use variables better
Mark Otto [Sat, 20 Apr 2013 22:47:07 +0000 (15:47 -0700)] 
Make alerts use variables better

12 years agoOnly use .danger for alerts, no more .error
Mark Otto [Sat, 20 Apr 2013 22:36:11 +0000 (15:36 -0700)] 
Only use .danger for alerts, no more .error

12 years agoFixes #7093: more consistent scrollspy docs
Mark Otto [Sat, 20 Apr 2013 22:32:16 +0000 (15:32 -0700)] 
Fixes #7093: more consistent scrollspy docs

12 years agoFirst pass at updated responsive utilities to be mobile-first. Pulled from #7490...
Mark Otto [Sat, 20 Apr 2013 19:33:09 +0000 (12:33 -0700)] 
First pass at updated responsive utilities to be mobile-first. Pulled from #7490 by @apotropaic

12 years agocorrect grid class in example code
Mark Otto [Sat, 20 Apr 2013 19:29:12 +0000 (12:29 -0700)] 
correct grid class in example code

12 years agocorrect grid class mention in docs
Mark Otto [Sat, 20 Apr 2013 19:28:36 +0000 (12:28 -0700)] 
correct grid class mention in docs

12 years agoAlternate docs mention of breadcrumbs separator, as called out in #7601
Mark Otto [Sat, 20 Apr 2013 19:23:27 +0000 (12:23 -0700)] 
Alternate docs mention of breadcrumbs separator, as called out in #7601

12 years agoMerge branch 'reversefold-master' into 3.0.0-wip
Mark Otto [Sat, 20 Apr 2013 19:13:05 +0000 (12:13 -0700)] 
Merge branch 'reversefold-master' into 3.0.0-wip

Conflicts:
README.md