]> git.ipfire.org Git - thirdparty/bootstrap.git/log
thirdparty/bootstrap.git
12 years agoMake sure form actions are properly aligned with form-horizontal 7409/head
Andreas Cederström [Thu, 28 Mar 2013 10:33:18 +0000 (11:33 +0100)] 
Make sure form actions are properly aligned with form-horizontal

12 years agoclarify docs on unstyled lists
Mark Otto [Wed, 27 Mar 2013 22:54:17 +0000 (15:54 -0700)] 
clarify docs on unstyled lists

12 years agoRefactor .list-inline and .list-unstyled
Mark Otto [Wed, 27 Mar 2013 22:42:11 +0000 (15:42 -0700)] 
Refactor .list-inline and .list-unstyled

* Instead of shared and separate CSS, isolate by class for easier mixin-ability
* .list-unstyled is now used as a mixin in .list-inline

12 years agodocs fixes with new .bs-docs-container; fixing some lingering grid classes
Mark Otto [Wed, 27 Mar 2013 06:54:17 +0000 (23:54 -0700)] 
docs fixes with new .bs-docs-container; fixing some lingering grid classes

12 years agoRemove grid example; update grid classes in examples
Mark Otto [Wed, 27 Mar 2013 00:17:39 +0000 (17:17 -0700)] 
Remove grid example; update grid classes in examples

12 years agoNew grid classes
Mark Otto [Wed, 27 Mar 2013 00:12:17 +0000 (17:12 -0700)] 
New grid classes

12 years agoremove .navbar-inner from starter template
Mark Otto [Tue, 26 Mar 2013 19:31:03 +0000 (12:31 -0700)] 
remove .navbar-inner from starter template

12 years agoMerge branch '3.0.0-wip' of https://github.com/psylabs/bootstrap into psylabs-3.0...
Mark Otto [Tue, 26 Mar 2013 19:28:00 +0000 (12:28 -0700)] 
Merge branch '3.0.0-wip' of https://github.com/psylabs/bootstrap into psylabs-3.0.0-wip

Conflicts:
less/tests/navbar-fixed-top.html
less/tests/navbar-static-top.html
less/tests/navbar.html

12 years agoFixed the navbar toggle in example templates by changing all the ".btn .btn-navbar... 7386/head
mo [Tue, 26 Mar 2013 01:13:13 +0000 (18:13 -0700)] 
Fixed the navbar toggle in example templates by changing all the ".btn .btn-navbar" to ".navbar-toggle"

12 years agoFixed all the .brand in navbar to .navbar-brand
mo [Tue, 26 Mar 2013 00:46:44 +0000 (17:46 -0700)] 
Fixed all the .brand in navbar to .navbar-brand

12 years agocolor border in table contextual classes
Mark Otto [Mon, 18 Mar 2013 00:26:02 +0000 (17:26 -0700)] 
color border in table contextual classes

12 years agoFixes #7297: add support for .success, .error, and .warning on td and th elements...
Mark Otto [Sun, 17 Mar 2013 19:10:58 +0000 (12:10 -0700)] 
Fixes #7297: add support for .success, .error, and .warning on td and th elements in tables

12 years agoincorporate print utilities classes into responsive docs; rejigger some content
Mark Otto [Sun, 17 Mar 2013 18:57:00 +0000 (11:57 -0700)] 
incorporate print utilities classes into responsive docs; rejigger some content

12 years agoMerge branch 'jfroom-2.3.1-jfroom-wip' into 3.0.0-wip
Mark Otto [Sun, 17 Mar 2013 18:45:21 +0000 (11:45 -0700)] 
Merge branch 'jfroom-2.3.1-jfroom-wip' into 3.0.0-wip

12 years agoupdate readme to resolve conflict
Mark Otto [Sun, 17 Mar 2013 18:45:13 +0000 (11:45 -0700)] 
update readme to resolve conflict

12 years agoRemove all #font mixins; replace single instance of its use in Bootstrap with the...
Mark Otto [Sun, 17 Mar 2013 18:34:27 +0000 (11:34 -0700)] 
Remove all #font mixins; replace single instance of its use in Bootstrap with the @font-family-monospace variable

12 years agoExploring rems as font-size unit
Mark Otto [Sun, 17 Mar 2013 18:33:07 +0000 (11:33 -0700)] 
Exploring rems as font-size unit

* Added a new mixin to calculate rems and pixels for IE fallback
* Updated the body, p, and .lead elements to use the new .font-size() mixin
* New mixin has default value of 14px or 1.4rem
* Still needs exploration, and change this means lots of work rejiggering margins and line-heights
* Related, started to reorganize the mixins a bit to call out mixins that are used by the framework and not utilities or snippets

12 years agomixin, not copypasta
Mark Otto [Sun, 17 Mar 2013 18:15:04 +0000 (11:15 -0700)] 
mixin, not copypasta

12 years agoconvert to preboot's retina mixin
Mark Otto [Sun, 17 Mar 2013 00:19:05 +0000 (17:19 -0700)] 
convert to preboot's retina mixin

12 years agoMerge branch '3.0.0-wip' of https://github.com/dannykeane/bootstrap into dannykeane...
Mark Otto [Sun, 17 Mar 2013 00:06:20 +0000 (17:06 -0700)] 
Merge branch '3.0.0-wip' of https://github.com/dannykeane/bootstrap into dannykeane-3.0.0-wip

12 years agofixes #7140: hide navbar toggle in print
Mark Otto [Sat, 16 Mar 2013 23:17:32 +0000 (16:17 -0700)] 
fixes #7140: hide navbar toggle in print

12 years agoFixes #7150: colorize links in alerts
Mark Otto [Sat, 16 Mar 2013 22:31:03 +0000 (15:31 -0700)] 
Fixes #7150: colorize links in alerts

12 years agocomment
Mark Otto [Sat, 16 Mar 2013 22:03:22 +0000 (15:03 -0700)] 
comment

12 years agoMerge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Mark Otto [Sat, 16 Mar 2013 21:59:43 +0000 (14:59 -0700)] 
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

12 years agoMerge pull request #7258 from acconrad/patch-1
Mark Otto [Sat, 16 Mar 2013 21:59:33 +0000 (14:59 -0700)] 
Merge pull request #7258 from acconrad/patch-1

Update buttons.less to disable btn pointer events

12 years agotypo
Mark Otto [Sat, 16 Mar 2013 21:49:21 +0000 (14:49 -0700)] 
typo

12 years agoFix vertical button groups
Mark Otto [Sat, 16 Mar 2013 20:03:31 +0000 (13:03 -0700)] 
Fix vertical button groups

12 years agoUse form elements in checkbox and radio button groups
Mark Otto [Sat, 16 Mar 2013 19:34:07 +0000 (12:34 -0700)] 
Use form elements in checkbox and radio button groups

* Uses .btn on label elements with nested checkbox and radio controls within
* Updated examples to reflect change in HTML and CSS
* Had to add .active all buttons for proper state highlighting (mimicing the :active pseudo state)
* Still needs JavaScript plugin updated by @fat

12 years agoremove inner shadow from .highlight
Mark Otto [Sat, 16 Mar 2013 19:09:26 +0000 (12:09 -0700)] 
remove inner shadow from .highlight

12 years agoupdate pygments highlighting with customizations from preboot
Mark Otto [Sat, 16 Mar 2013 19:07:00 +0000 (12:07 -0700)] 
update pygments highlighting with customizations from preboot

12 years agoOverhaul the grid system and its docs
Mark Otto [Sat, 16 Mar 2013 06:21:10 +0000 (23:21 -0700)] 
Overhaul the grid system and its docs

* Add new grid mixins adapted from Preboot (http://github.com/mdo/preboot)
* Drop the @grid-row-width and @grid-column-width variables
* Add the @grid-float-breakpoint variable, as used in Preboot
* Add support for .push* and .pull* classes for column ordering manipulation
* Document all the things

12 years agobegin to rewrite the grid docs
Mark Otto [Sat, 16 Mar 2013 04:57:16 +0000 (21:57 -0700)] 
begin to rewrite the grid docs

12 years agogetting started as navbar link label
Mark Otto [Sat, 16 Mar 2013 04:23:59 +0000 (21:23 -0700)] 
getting started as navbar link label

12 years agoUse translucent box shadow on hr elements; colorize hr elements within alert components
Mark Otto [Fri, 15 Mar 2013 06:01:23 +0000 (23:01 -0700)] 
Use translucent box shadow on hr elements; colorize hr elements within alert components

12 years agofix derpy linenos in pygments for thumbnails component
Mark Otto [Fri, 15 Mar 2013 05:34:20 +0000 (22:34 -0700)] 
fix derpy linenos in pygments for thumbnails component

12 years agoMerge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Mark Otto [Fri, 15 Mar 2013 05:25:53 +0000 (22:25 -0700)] 
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

12 years agounfuck misaligned main container
Mark Otto [Fri, 15 Mar 2013 04:45:31 +0000 (21:45 -0700)] 
unfuck misaligned main container

12 years agoMerge pull request #7285 from stilliard/patch-1
Mark Otto [Fri, 15 Mar 2013 03:55:43 +0000 (20:55 -0700)] 
Merge pull request #7285 from stilliard/patch-1

Additional heading font-size classes

12 years agomore readme copy
Mark Otto [Fri, 15 Mar 2013 03:55:23 +0000 (20:55 -0700)] 
more readme copy

12 years agoreadme copy
Mark Otto [Fri, 15 Mar 2013 03:54:53 +0000 (20:54 -0700)] 
readme copy

12 years agostart listing other bootstrap powered starter doodads in the readme
Mark Otto [Fri, 15 Mar 2013 02:19:06 +0000 (19:19 -0700)] 
start listing other bootstrap powered starter doodads in the readme

12 years agoAdditional heading font-size classes 7285/head
Andrew Stilliard [Fri, 15 Mar 2013 02:11:37 +0000 (02:11 +0000)] 
Additional heading font-size classes

This relates to changes in issue #7284

12 years agounderp license maybe
Mark Otto [Fri, 15 Mar 2013 02:08:09 +0000 (19:08 -0700)] 
underp license maybe

12 years agoherp derp, spelling booboo
Mark Otto [Fri, 15 Mar 2013 02:06:47 +0000 (19:06 -0700)] 
herp derp, spelling booboo

12 years agoRename license to license.md; point readme to it via link
Mark Otto [Fri, 15 Mar 2013 02:05:54 +0000 (19:05 -0700)] 
Rename license to license.md; point readme to it via link

12 years agofix example navbar brand
Mark Otto [Fri, 15 Mar 2013 01:54:43 +0000 (18:54 -0700)] 
fix example navbar brand

12 years agouse the proper selector
Mark Otto [Fri, 15 Mar 2013 01:53:46 +0000 (18:53 -0700)] 
use the proper selector

12 years agomodify copy
Mark Otto [Fri, 15 Mar 2013 01:23:08 +0000 (18:23 -0700)] 
modify copy

12 years agoMerge branch '3.0.0-wip' of https://github.com/addyosmani/bootstrap into addyosmani...
Mark Otto [Thu, 14 Mar 2013 20:34:48 +0000 (13:34 -0700)] 
Merge branch '3.0.0-wip' of https://github.com/addyosmani/bootstrap into addyosmani-3.0.0-wip

12 years agoFixes #7281: make tables super specific for hovers and striping to avoid nesting...
Mark Otto [Thu, 14 Mar 2013 20:29:43 +0000 (13:29 -0700)] 
Fixes #7281: make tables super specific for hovers and striping to avoid nesting issues

12 years agoMerge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Mark Otto [Thu, 14 Mar 2013 20:25:59 +0000 (13:25 -0700)] 
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

Conflicts:
less/grid.less

12 years agoMerge pull request #7227 from parndt/patch-1
Mark Otto [Thu, 14 Mar 2013 20:04:50 +0000 (13:04 -0700)] 
Merge pull request #7227 from parndt/patch-1

Fix minor grammatical problem

12 years agoAdded bower install to download/install options in getting started guide 7277/head
Addy [Thu, 14 Mar 2013 10:58:16 +0000 (10:58 +0000)] 
Added bower install to download/install options in getting started guide

12 years agoUpdate buttons.less to disable btn pointer events 7258/head
Adam Conrad [Tue, 12 Mar 2013 20:58:41 +0000 (17:58 -0300)] 
Update buttons.less to disable btn pointer events

Buttons that are disabled are still clickable and can still fire click events (such as hopping up to the top of the page if your anchor href points to "#"). Adding the pointer-events:none property will truly disable the button so situations like this don't happen. 

12 years agoMerge pull request #7181 from lukeapage/3.0.0-wip
Mark Otto [Mon, 11 Mar 2013 08:16:08 +0000 (01:16 -0700)] 
Merge pull request #7181 from lukeapage/3.0.0-wip

make less files compile with strict maths in 1.4.0

12 years agoMerge pull request #7208 from benilovj/3.0.0-wip
Mark Otto [Mon, 11 Mar 2013 06:32:13 +0000 (23:32 -0700)] 
Merge pull request #7208 from benilovj/3.0.0-wip

fix grammatical mistakes in carousel docs

12 years agoFix minor grammatical problem 7227/head
Philip Arndt [Sun, 10 Mar 2013 23:07:52 +0000 (12:07 +1300)] 
Fix minor grammatical problem

"check out" makes more sense here.

12 years agoSet border-box globally instead
Mark Otto [Sun, 10 Mar 2013 18:24:07 +0000 (13:24 -0500)] 
Set border-box globally instead

12 years agoMerge pull request #7220 from jooag/patch-1
Mark Otto [Sun, 10 Mar 2013 17:40:00 +0000 (10:40 -0700)] 
Merge pull request #7220 from jooag/patch-1

Fix Typo sucess to success

12 years agoFix Typo sucess to success 7219/head 7220/head
Ufuk Avcu [Sat, 9 Mar 2013 20:04:09 +0000 (21:04 +0100)] 
Fix Typo sucess to success

Mini typo fix in the docs...

12 years agofix grammatical mistakes in carousel docs 7208/head
Jake Benilov [Fri, 8 Mar 2013 00:11:53 +0000 (00:11 +0000)] 
fix grammatical mistakes in carousel docs

12 years agomake less files compile with strict maths in 1.4.0 7181/head
Luke Page [Wed, 6 Mar 2013 16:38:20 +0000 (16:38 +0000)] 
make less files compile with strict maths in 1.4.0

12 years agotweak icons alignment
Mark Otto [Mon, 4 Mar 2013 07:41:16 +0000 (23:41 -0800)] 
tweak icons alignment

12 years agoRemove support for .uneditable-input
Mark Otto [Mon, 4 Mar 2013 07:31:09 +0000 (23:31 -0800)] 
Remove support for .uneditable-input

12 years agoNuke the gallery, punt it to the new http://expo.getbootstrap.com
Mark Otto [Mon, 4 Mar 2013 03:40:47 +0000 (19:40 -0800)] 
Nuke the gallery, punt it to the new http://expo.getbootstrap.com

12 years agofix row change at breakpoint
Mark Otto [Mon, 4 Mar 2013 02:19:31 +0000 (18:19 -0800)] 
fix row change at breakpoint

12 years agoMerge pull request #6968 from twitter/bs3_makefile_separated_done
Mark Otto [Fri, 1 Mar 2013 22:11:24 +0000 (14:11 -0800)] 
Merge pull request #6968 from twitter/bs3_makefile_separated_done

More accurate makefile step confirmation

12 years agoMerge branch '3.0.0-wip' into bs3_makefile_separated_done 6968/head
Mark Otto [Fri, 1 Mar 2013 21:53:21 +0000 (13:53 -0800)] 
Merge branch '3.0.0-wip' into bs3_makefile_separated_done

Conflicts:
Makefile

12 years agonuke commented out unused var
Mark Otto [Fri, 1 Mar 2013 20:37:36 +0000 (12:37 -0800)] 
nuke commented out unused var

12 years agoMerge branch 'master' into 3.0.0-wip
Mark Otto [Fri, 1 Mar 2013 20:37:21 +0000 (12:37 -0800)] 
Merge branch 'master' into 3.0.0-wip

Conflicts:
Makefile
README.md
component.json
docs/assets/css/bootstrap-responsive.css
docs/assets/css/bootstrap.css
docs/assets/js/bootstrap-affix.js
docs/assets/js/bootstrap-alert.js
docs/assets/js/bootstrap-button.js
docs/assets/js/bootstrap-carousel.js
docs/assets/js/bootstrap-collapse.js
docs/assets/js/bootstrap-dropdown.js
docs/assets/js/bootstrap-modal.js
docs/assets/js/bootstrap-popover.js
docs/assets/js/bootstrap-scrollspy.js
docs/assets/js/bootstrap-tab.js
docs/assets/js/bootstrap-tooltip.js
docs/assets/js/bootstrap-transition.js
docs/assets/js/bootstrap-typeahead.js
docs/assets/js/bootstrap.js
docs/assets/js/bootstrap.min.js
docs/index.html
docs/templates/pages/index.mustache
js/bootstrap-affix.js
js/bootstrap-alert.js
js/bootstrap-button.js
js/bootstrap-carousel.js
js/bootstrap-collapse.js
js/bootstrap-dropdown.js
js/bootstrap-modal.js
js/bootstrap-popover.js
js/bootstrap-scrollspy.js
js/bootstrap-tab.js
js/bootstrap-tooltip.js
js/bootstrap-transition.js
js/bootstrap-typeahead.js
less/bootstrap.less
less/responsive.less
package.json

12 years agoFix alignment of .navbar-brand
Mark Otto [Fri, 1 Mar 2013 08:50:08 +0000 (00:50 -0800)] 
Fix alignment of .navbar-brand

12 years agoimprove navbar toggle and hide code snippets on mobile devices for now
Mark Otto [Fri, 1 Mar 2013 08:18:10 +0000 (00:18 -0800)] 
improve navbar toggle and hide code snippets on mobile devices for now

12 years agoredo the buttons examples
Mark Otto [Fri, 1 Mar 2013 08:04:41 +0000 (00:04 -0800)] 
redo the buttons examples

12 years agocustomize navbar in docs
Mark Otto [Fri, 1 Mar 2013 07:36:54 +0000 (23:36 -0800)] 
customize navbar in docs

12 years agoFixes #6998: disabled background color properly on pagination
Mark Otto [Fri, 1 Mar 2013 07:23:05 +0000 (23:23 -0800)] 
Fixes #6998: disabled background color properly on pagination

12 years agoFixes #6995: Add disabled navbar nav link support
Mark Otto [Fri, 1 Mar 2013 07:20:25 +0000 (23:20 -0800)] 
Fixes #6995: Add disabled navbar nav link support

12 years agoFixes #6954: properly reset grid classes within tables
Mark Otto [Fri, 1 Mar 2013 06:47:32 +0000 (22:47 -0800)] 
Fixes #6954: properly reset grid classes within tables

12 years agoMerge pull request #7111 from twitter/2.3.1-wip 7152/head v2.3.1
fat-kun [Fri, 1 Mar 2013 05:24:27 +0000 (21:24 -0800)] 
Merge pull request #7111 from twitter/2.3.1-wip

2.3.1 wip

12 years agoHoly fucking shit fix that input group with buttons rounded corner noise
Mark Otto [Fri, 1 Mar 2013 05:19:02 +0000 (21:19 -0800)] 
Holy fucking shit fix that input group with buttons rounded corner noise

12 years agoupdate changelog 7111/head
fat [Fri, 1 Mar 2013 05:16:08 +0000 (21:16 -0800)] 
update changelog

12 years agoshiiiit
fat [Fri, 1 Mar 2013 05:15:33 +0000 (21:15 -0800)] 
shiiiit

12 years agowoops that should stay 2.3.0
fat [Fri, 1 Mar 2013 05:00:21 +0000 (21:00 -0800)] 
woops that should stay 2.3.0

12 years ago2.3.1
fat [Fri, 1 Mar 2013 04:55:14 +0000 (20:55 -0800)] 
2.3.1

12 years agorebuild
fat [Fri, 1 Mar 2013 04:48:48 +0000 (20:48 -0800)] 
rebuild

12 years agowhitespace
fat [Fri, 1 Mar 2013 04:48:02 +0000 (20:48 -0800)] 
whitespace

12 years agoWHOOPS ( >_>)
fat [Fri, 1 Mar 2013 04:46:51 +0000 (20:46 -0800)] 
WHOOPS ( >_>)

12 years agoonly pass unique options through to child nodes in tooltips
fat [Fri, 1 Mar 2013 04:39:07 +0000 (20:39 -0800)] 
only pass unique options through to child nodes in tooltips

12 years agorebuild
fat [Fri, 1 Mar 2013 03:49:08 +0000 (19:49 -0800)] 
rebuild

12 years agopass true to cycle
fat [Fri, 1 Mar 2013 03:47:01 +0000 (19:47 -0800)] 
pass true to cycle

12 years agoFixes #6935: Use standard decimal points for .opacity() mixin
Mark Otto [Fri, 1 Mar 2013 03:46:49 +0000 (19:46 -0800)] 
Fixes #6935: Use standard decimal points for .opacity() mixin

12 years agoFixes #6897: Print styles get own .less file
Mark Otto [Fri, 1 Mar 2013 03:42:51 +0000 (19:42 -0800)] 
Fixes #6897: Print styles get own .less file

12 years agole sigh
fat [Fri, 1 Mar 2013 03:37:30 +0000 (19:37 -0800)] 
le sigh

12 years agoRemove margin between buttons in button groups; use border-radius mixins to avoid...
Mark Otto [Fri, 1 Mar 2013 03:34:02 +0000 (19:34 -0800)] 
Remove margin between buttons in button groups; use border-radius mixins to avoid reseting border-radii that don't need resetting

12 years agoremove auto regen
Mark Otto [Fri, 1 Mar 2013 03:32:39 +0000 (19:32 -0800)] 
remove auto regen

12 years agoadd new example thumbnails; update links to point to new windows
Mark Otto [Tue, 26 Feb 2013 08:56:06 +0000 (00:56 -0800)] 
add new example thumbnails; update links to point to new windows

12 years agonuke remaining less/tests/ files and move grid over to examples dir
Mark Otto [Tue, 26 Feb 2013 08:49:21 +0000 (00:49 -0800)] 
nuke remaining less/tests/ files and move grid over to examples dir

12 years agonuke glyphicons changes in buttons for now because it's whack
Mark Otto [Tue, 26 Feb 2013 08:44:15 +0000 (00:44 -0800)] 
nuke glyphicons changes in buttons for now because it's whack

12 years agomoved examples added
Mark Otto [Tue, 26 Feb 2013 08:42:24 +0000 (00:42 -0800)] 
moved examples added

12 years agoMove navbar examples to /examples directory
Mark Otto [Tue, 26 Feb 2013 08:37:59 +0000 (00:37 -0800)] 
Move navbar examples to /examples directory

12 years agotry out new table-based type example
Mark Otto [Sun, 24 Feb 2013 09:29:19 +0000 (01:29 -0800)] 
try out new table-based type example