]> git.ipfire.org Git - thirdparty/bootstrap.git/log
thirdparty/bootstrap.git
13 years agoRemove underscore hack for IE6 2089/head
Jacob Rask [Sun, 19 Feb 2012 20:54:38 +0000 (21:54 +0100)] 
Remove underscore hack for IE6

IE6 does not seem to be supported by Bootstrap, and reducing the number
of unused and invalid properties is always nice.

13 years agoMerge branch 'master' into 2.0.2-wip
Jacob Thornton [Sun, 19 Feb 2012 07:31:37 +0000 (23:31 -0800)] 
Merge branch 'master' into 2.0.2-wip

Conflicts:
docs/assets/bootstrap.zip

13 years agofix bootstrap-button toggle regression + tests
Jacob Thornton [Sun, 19 Feb 2012 07:29:58 +0000 (23:29 -0800)] 
fix bootstrap-button toggle regression + tests

13 years agomerge in and remake for responsive navbar dropdown fix
Mark Otto [Sun, 19 Feb 2012 04:09:34 +0000 (20:09 -0800)] 
merge in and remake for responsive navbar dropdown fix

13 years agoMerge branch 'tagliala-collapse-dropdown-fix' into 2.0.2-wip
Mark Otto [Sun, 19 Feb 2012 04:08:11 +0000 (20:08 -0800)] 
Merge branch 'tagliala-collapse-dropdown-fix' into 2.0.2-wip

13 years agofix right aligned dropdowns
Mark Otto [Sun, 19 Feb 2012 04:06:38 +0000 (20:06 -0800)] 
fix right aligned dropdowns

13 years agoMerge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip
Mark Otto [Sat, 18 Feb 2012 23:31:44 +0000 (15:31 -0800)] 
Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip

13 years agoMerge pull request #2063 from DominikTo/master
Mark Otto [Sat, 18 Feb 2012 23:31:16 +0000 (15:31 -0800)] 
Merge pull request #2063 from DominikTo/master

fixed syntax error in sprites.less and typo in comments

13 years agoclarify forms in navbar per #2072
Mark Otto [Sat, 18 Feb 2012 23:23:38 +0000 (15:23 -0800)] 
clarify forms in navbar per #2072

13 years agoMerge pull request #2066 from artstorm/2.0.2-wip
Mark Otto [Sat, 18 Feb 2012 23:17:41 +0000 (15:17 -0800)] 
Merge pull request #2066 from artstorm/2.0.2-wip

Fixed compile problem with LESS 1.2.1.

13 years agoclarify misc components subhead
Mark Otto [Sat, 18 Feb 2012 23:17:25 +0000 (15:17 -0800)] 
clarify misc components subhead

13 years agoFixed compile problem with LESS 1.2.1. 2066/head
Johan Steen [Sat, 18 Feb 2012 13:28:44 +0000 (14:28 +0100)] 
Fixed compile problem with LESS 1.2.1.

The sprite path variables introduced in v2.0.1 prevents bootstrap.less to
compile wiht LESS v1.2.1. Updated the variables to use the @{name}
construct when inserted in sprites.less, as outlined in the LESS
documentation. This change makes the CSS compile with LESS v1.2.1.

13 years agoFixed a wrong behaviour when using collapse and dropdown in responsive layout 2065/head
Geremia Taglialatela [Sat, 18 Feb 2012 12:08:49 +0000 (13:08 +0100)] 
Fixed a wrong behaviour when using collapse and dropdown in responsive layout

13 years agofixed syntax error 2063/head
Dominik Tobschall [Fri, 17 Feb 2012 17:24:17 +0000 (18:24 +0100)] 
fixed syntax error

13 years agofixed typo (whitespace)
Dominik Tobschall [Fri, 17 Feb 2012 17:23:52 +0000 (18:23 +0100)] 
fixed typo (whitespace)

13 years agoadd mention of js compilation to single file in customize page per #2003
Mark Otto [Sat, 18 Feb 2012 05:18:08 +0000 (21:18 -0800)] 
add mention of js compilation to single file in customize page per #2003

13 years agoadd small section to navbar docs on text in the component, per #2035
Mark Otto [Sat, 18 Feb 2012 04:53:12 +0000 (20:53 -0800)] 
add small section to navbar docs on text in the component, per #2035

13 years agoremoving duplicate reset filter since we changed the main button to use buttonBackgro...
Mark Otto [Sat, 18 Feb 2012 04:47:02 +0000 (20:47 -0800)] 
removing duplicate reset filter since we changed the main button to use buttonBackground mixin, per #2024

13 years agofix duplicate input prepend/append css selectors per #2026
Mark Otto [Sat, 18 Feb 2012 04:40:56 +0000 (20:40 -0800)] 
fix duplicate input prepend/append css selectors per #2026

13 years agoswap last .btn-dark reference
Mark Otto [Sat, 18 Feb 2012 04:25:49 +0000 (20:25 -0800)] 
swap last .btn-dark reference

13 years agofix grid typo in subnav
Mark Otto [Fri, 17 Feb 2012 22:41:41 +0000 (14:41 -0800)] 
fix grid typo in subnav

13 years agofix page header example and docs per #2048
Mark Otto [Fri, 17 Feb 2012 22:39:30 +0000 (14:39 -0800)] 
fix page header example and docs per #2048

13 years ago2.0.1 v2.0.1
Jacob Thornton [Fri, 17 Feb 2012 06:42:38 +0000 (22:42 -0800)] 
2.0.1

13 years agoMerge branch '2.0.1-wip'
Jacob Thornton [Fri, 17 Feb 2012 06:41:02 +0000 (22:41 -0800)] 
Merge branch '2.0.1-wip'

13 years agobring back checkbox borders to iOS by conditionalizing the border: 0; on it to IE7...
Mark Otto [Fri, 17 Feb 2012 06:34:30 +0000 (22:34 -0800)] 
bring back checkbox borders to iOS by conditionalizing the border: 0; on it to IE7-9; fix word break on pre in IE

13 years agochange clearfix mixin to drop parens that prevent it from being a class, too
Mark Otto [Fri, 17 Feb 2012 06:04:11 +0000 (22:04 -0800)] 
change clearfix mixin to drop parens that prevent it from being a class, too

13 years agoadd mini buttons per #1971
Mark Otto [Fri, 17 Feb 2012 05:28:16 +0000 (21:28 -0800)] 
add mini buttons per #1971

13 years agofix buttons focus state and swap a buttons for button buttons
Mark Otto [Fri, 17 Feb 2012 05:25:40 +0000 (21:25 -0800)] 
fix buttons focus state and swap a buttons for button buttons

13 years agofix responsive media queries to use 979 and 980 where appropro
Mark Otto [Fri, 17 Feb 2012 05:08:52 +0000 (21:08 -0800)] 
fix responsive media queries to use 979 and 980 where appropro

13 years agoadd mention of navbar vertical divider in docs
Mark Otto [Fri, 17 Feb 2012 05:04:16 +0000 (21:04 -0800)] 
add mention of navbar vertical divider in docs

13 years agoadd note about popover placement
Jacob Thornton [Fri, 17 Feb 2012 04:46:35 +0000 (20:46 -0800)] 
add note about popover placement

13 years agodon't try next if not next
Jacob Thornton [Fri, 17 Feb 2012 04:43:57 +0000 (20:43 -0800)] 
don't try next if not next

13 years agoadd idea to modal markup exmaple
Jacob Thornton [Fri, 17 Feb 2012 04:33:15 +0000 (20:33 -0800)] 
add idea to modal markup exmaple

13 years agorebuild bro
Jacob Thornton [Fri, 17 Feb 2012 04:30:18 +0000 (20:30 -0800)] 
rebuild bro

13 years agofix dropdown links
Jacob Thornton [Fri, 17 Feb 2012 04:30:00 +0000 (20:30 -0800)] 
fix dropdown links

13 years agonull out interval so that pause doesn't resume on next or prev
Jacob Thornton [Fri, 17 Feb 2012 04:22:01 +0000 (20:22 -0800)] 
null out interval so that pause doesn't resume on next or prev

13 years agorebuild alerts
Jacob Thornton [Fri, 17 Feb 2012 04:05:09 +0000 (20:05 -0800)] 
rebuild alerts

13 years agofix alerts
Jacob Thornton [Fri, 17 Feb 2012 04:04:26 +0000 (20:04 -0800)] 
fix alerts

13 years agoMerge branch '2.0.1-wip' of https://github.com/twitter/bootstrap into 2.0.1-wip
Jacob Thornton [Tue, 14 Feb 2012 02:42:57 +0000 (18:42 -0800)] 
Merge branch '2.0.1-wip' of https://github.com/twitter/bootstrap into 2.0.1-wip

Conflicts:
docs/assets/bootstrap.zip

13 years agoadd semicolons to the end of js files
Jacob Thornton [Tue, 14 Feb 2012 02:41:02 +0000 (18:41 -0800)] 
add semicolons to the end of js files

13 years agoupdate irc spacing in readme
Jacob Thornton [Tue, 14 Feb 2012 02:11:41 +0000 (18:11 -0800)] 
update irc spacing in readme

13 years agoadd irc note
Jacob Thornton [Tue, 14 Feb 2012 02:10:36 +0000 (18:10 -0800)] 
add irc note

13 years agochange up fonts on form elements to remove unnecessary font-family on label element...
Mark Otto [Mon, 13 Feb 2012 16:18:19 +0000 (08:18 -0800)] 
change up fonts on form elements to remove unnecessary font-family on label element, per #1950

13 years agofix filename mention in js docs per #1938
Mark Otto [Mon, 13 Feb 2012 06:50:21 +0000 (22:50 -0800)] 
fix filename mention in js docs per #1938

13 years agoensure help-block is block per #1937
Mark Otto [Mon, 13 Feb 2012 06:49:06 +0000 (22:49 -0800)] 
ensure help-block is block per #1937

13 years agoclean up nav-header in responsive
Mark Otto [Mon, 13 Feb 2012 05:11:56 +0000 (21:11 -0800)] 
clean up nav-header in responsive

13 years agoadding makeRow and makeColumn mixins for generating more semantic layouts
Mark Otto [Mon, 13 Feb 2012 04:46:39 +0000 (20:46 -0800)] 
adding makeRow and makeColumn mixins for generating more semantic layouts

13 years agoallow .input-prepend/.input-append to work in .navbar per #1681
Mark Otto [Mon, 13 Feb 2012 04:28:22 +0000 (20:28 -0800)] 
allow .input-prepend/.input-append to work in .navbar per #1681

13 years agoadd docs for alt form control sizing per #1700
Mark Otto [Mon, 13 Feb 2012 04:10:48 +0000 (20:10 -0800)] 
add docs for alt form control sizing per #1700

13 years agoadd typography pattern .page-header to components per #1701
Mark Otto [Mon, 13 Feb 2012 04:07:25 +0000 (20:07 -0800)] 
add typography pattern .page-header to components per #1701

13 years agoupdate docs on fixed nav per #1726
Mark Otto [Mon, 13 Feb 2012 03:50:36 +0000 (19:50 -0800)] 
update docs on fixed nav per #1726

13 years agoclear up scaffolding page to separate fixed from fluid grid systems
Mark Otto [Mon, 13 Feb 2012 00:59:29 +0000 (16:59 -0800)] 
clear up scaffolding page to separate fixed from fluid grid systems

13 years agoadd link to docs compiling section in readme
Mark Otto [Mon, 13 Feb 2012 00:05:25 +0000 (16:05 -0800)] 
add link to docs compiling section in readme

13 years agoupdate readme to clarify dependencies of make command, per #1756
Mark Otto [Mon, 13 Feb 2012 00:04:02 +0000 (16:04 -0800)] 
update readme to clarify dependencies of make command, per #1756

13 years agoadd note to button dropdowns about js plugin dependency per #1746
Mark Otto [Sun, 12 Feb 2012 23:49:04 +0000 (15:49 -0800)] 
add note to button dropdowns about js plugin dependency per #1746

13 years agoclean up modals.less comments, add new class for optional use on modal forms to remov...
Mark Otto [Sun, 12 Feb 2012 23:43:04 +0000 (15:43 -0800)] 
clean up modals.less comments, add new class for optional use on modal forms to remove bottom margin

13 years agochange classname from .btn-dark to .btn-inverse, change use text
Mark Otto [Sun, 12 Feb 2012 23:18:20 +0000 (15:18 -0800)] 
change classname from .btn-dark to .btn-inverse, change use text

13 years agoMerge branch '2.0.1-wip' of https://github.com/simonfranz/bootstrap into simonfranz...
Mark Otto [Sun, 12 Feb 2012 23:14:27 +0000 (15:14 -0800)] 
Merge branch '2.0.1-wip' of https://github.com/simonfranz/bootstrap into simonfranz-2.0.1-wip

13 years agoadd hero-unit docs per #1880
Mark Otto [Sun, 12 Feb 2012 22:47:09 +0000 (14:47 -0800)] 
add hero-unit docs per #1880

13 years agoenable the use of .nav-header in dropdowns per #1827
Mark Otto [Sun, 12 Feb 2012 22:09:13 +0000 (14:09 -0800)] 
enable the use of .nav-header in dropdowns per #1827

13 years agoadd navbar background hover variable and fix uneditable-input with append/prepend...
Mark Otto [Sun, 12 Feb 2012 22:01:58 +0000 (14:01 -0800)] 
add navbar background hover variable and fix uneditable-input with append/prepend controls

13 years agolower z-index of fixed subnav to prevent overlap of dropdown items in .navbar-fixed
Mark Otto [Sun, 12 Feb 2012 21:33:23 +0000 (13:33 -0800)] 
lower z-index of fixed subnav to prevent overlap of dropdown items in .navbar-fixed

13 years agoMerge branch '2.0.1-wip' of github.com:twitter/bootstrap into 2.0.1-wip
Mark Otto [Sun, 12 Feb 2012 21:27:29 +0000 (13:27 -0800)] 
Merge branch '2.0.1-wip' of github.com:twitter/bootstrap into 2.0.1-wip

Conflicts:
docs/assets/bootstrap.zip

13 years agoMerge branch 'patch-2' of https://github.com/cwiederspan/bootstrap into cwiederspan...
Mark Otto [Sun, 12 Feb 2012 21:20:17 +0000 (13:20 -0800)] 
Merge branch 'patch-2' of https://github.com/cwiederspan/bootstrap into cwiederspan-patch-2

13 years agoupdate ff comment in buttons
Mark Otto [Sun, 12 Feb 2012 21:20:08 +0000 (13:20 -0800)] 
update ff comment in buttons

13 years agoedit comment on IE7-8 support of :focus in navbar-search
Mark Otto [Sun, 12 Feb 2012 19:17:46 +0000 (11:17 -0800)] 
edit comment on IE7-8 support of :focus in navbar-search

13 years agohonor data attributes set on modal as well
Jacob Thornton [Sun, 12 Feb 2012 19:15:12 +0000 (11:15 -0800)] 
honor data attributes set on modal as well

13 years agostandardize default button gradient styles to match other buttons, reset it's IE...
Mark Otto [Sun, 12 Feb 2012 19:14:13 +0000 (11:14 -0800)] 
standardize default button gradient styles to match other buttons, reset it's IE filter to improve IE7 hover

13 years agomove shim after css
Mark Otto [Sun, 12 Feb 2012 19:08:58 +0000 (11:08 -0800)] 
move shim after css

13 years agore-add protocol to the shim
Mark Otto [Sun, 12 Feb 2012 19:08:33 +0000 (11:08 -0800)] 
re-add protocol to the shim

13 years agoMerge branch '2.0.1-wip' of https://github.com/twitter/bootstrap into 2.0.1-wip
Jacob Thornton [Sun, 12 Feb 2012 19:07:34 +0000 (11:07 -0800)] 
Merge branch '2.0.1-wip' of https://github.com/twitter/bootstrap into 2.0.1-wip

Conflicts:
docs/assets/bootstrap.zip

13 years agoadd note about popover placement
Jacob Thornton [Sun, 12 Feb 2012 19:06:50 +0000 (11:06 -0800)] 
add note about popover placement

13 years agowrite out icon classes explicitly to enable find via browser
Mark Otto [Sun, 12 Feb 2012 06:34:41 +0000 (22:34 -0800)] 
write out icon classes explicitly to enable find via browser

13 years agoupdate comment to reflect ie support
Mark Otto [Sun, 12 Feb 2012 04:58:10 +0000 (20:58 -0800)] 
update comment to reflect ie support

13 years agoreset line-height for file input in ie9
Mark Otto [Sun, 12 Feb 2012 04:00:44 +0000 (20:00 -0800)] 
reset line-height for file input in ie9

13 years agochange fixed height on responsive textareas to min-height
Mark Otto [Sun, 12 Feb 2012 03:21:23 +0000 (19:21 -0800)] 
change fixed height on responsive textareas to min-height

13 years agoMerge branch 'patch-1' of https://github.com/cvrebert/bootstrap into cvrebert-patch-1
Mark Otto [Sun, 12 Feb 2012 01:28:07 +0000 (17:28 -0800)] 
Merge branch 'patch-1' of https://github.com/cvrebert/bootstrap into cvrebert-patch-1

13 years agofix tabs content wrapping per #1620
Mark Otto [Sun, 12 Feb 2012 01:27:08 +0000 (17:27 -0800)] 
fix tabs content wrapping per #1620

13 years agoupdate buttons docs for .disabled class per #1774
Mark Otto [Sun, 12 Feb 2012 01:25:47 +0000 (17:25 -0800)] 
update buttons docs for .disabled class per #1774

13 years agoupdate tooltips message in upgrade docs
Mark Otto [Sun, 12 Feb 2012 01:25:30 +0000 (17:25 -0800)] 
update tooltips message in upgrade docs

13 years agoMerge branch '2.0.1-docs-update' of https://github.com/smaboshe/bootstrap into smabos...
Mark Otto [Sun, 12 Feb 2012 01:18:17 +0000 (17:18 -0800)] 
Merge branch '2.0.1-docs-update' of https://github.com/smaboshe/bootstrap into smaboshe-2.0.1-docs-update

13 years agomake button examples button element and add upgrade note on tooltip positions per...
Mark Otto [Sun, 12 Feb 2012 01:12:32 +0000 (17:12 -0800)] 
make button examples button element and add upgrade note on tooltip positions per #1532

13 years agosupport small for legend per #1544
Mark Otto [Sun, 12 Feb 2012 00:50:57 +0000 (16:50 -0800)] 
support small for legend per #1544

13 years agoremove color on :active of buttons
Mark Otto [Sun, 12 Feb 2012 00:43:53 +0000 (16:43 -0800)] 
remove color on :active of buttons

13 years agoclear up some messaging in docs on fluid grid system and nesting overall
Mark Otto [Sat, 11 Feb 2012 18:38:41 +0000 (10:38 -0800)] 
clear up some messaging in docs on fluid grid system and nesting overall

13 years agoremove the reset type from cancel buttons in forms examples per #1844
Mark Otto [Sat, 11 Feb 2012 18:13:53 +0000 (10:13 -0800)] 
remove the reset type from cancel buttons in forms examples per #1844

13 years agofix inline form checkbox/radios
Mark Otto [Sat, 11 Feb 2012 08:24:06 +0000 (00:24 -0800)] 
fix inline form checkbox/radios

13 years agofix type on responsive grid per #1852
Mark Otto [Sat, 11 Feb 2012 08:16:13 +0000 (00:16 -0800)] 
fix type on responsive grid per #1852

13 years agomove legend fix out of horizontal and to all forms
Mark Otto [Sat, 11 Feb 2012 08:11:34 +0000 (00:11 -0800)] 
move legend fix out of horizontal and to all forms

13 years agoMerge branch '2.0.1-wip' of https://github.com/jmar777/bootstrap into jmar777-2.0...
Mark Otto [Sat, 11 Feb 2012 08:10:58 +0000 (00:10 -0800)] 
Merge branch '2.0.1-wip' of https://github.com/jmar777/bootstrap into jmar777-2.0.1-wip

13 years agofix javascript text on tooltips per #1862
Mark Otto [Sat, 11 Feb 2012 08:10:26 +0000 (00:10 -0800)] 
fix javascript text on tooltips per #1862

13 years agoupdate selectors for icons to include matcher for icon class in middle of class attr...
Mark Otto [Sat, 11 Feb 2012 08:07:05 +0000 (00:07 -0800)] 
update selectors for icons to include matcher for icon class in middle of class attr, remove docs mention of requiring icon-* first

13 years agofix type in less docs per #1902
Mark Otto [Sat, 11 Feb 2012 08:02:28 +0000 (00:02 -0800)] 
fix type in less docs per #1902

13 years agofix some single vs double quotes, fix typo in js docs per #1900
Mark Otto [Sat, 11 Feb 2012 08:01:35 +0000 (00:01 -0800)] 
fix some single vs double quotes, fix typo in js docs per #1900

13 years agomanually address #1895
Mark Otto [Sat, 11 Feb 2012 07:59:00 +0000 (23:59 -0800)] 
manually address #1895

13 years agoclarify structure of responsive css file
Mark Otto [Sat, 11 Feb 2012 07:57:31 +0000 (23:57 -0800)] 
clarify structure of responsive css file

13 years agoadd best practices and re-org the button groups
Mark Otto [Sat, 11 Feb 2012 07:50:45 +0000 (23:50 -0800)] 
add best practices and re-org the button groups

13 years agoclarify npm install command in less docs
Mark Otto [Sat, 11 Feb 2012 07:37:54 +0000 (23:37 -0800)] 
clarify npm install command in less docs

13 years agoscope th bottom vertical-align to only thead, update code styles to include more...
Mark Otto [Sat, 11 Feb 2012 07:07:32 +0000 (23:07 -0800)] 
scope th bottom vertical-align to only thead, update code styles to include more comments in less file and scrollable option for pre tag

13 years agoMerge branch 'barsoom-ol-unstyled' into 2.0.1-wip
Mark Otto [Fri, 10 Feb 2012 07:20:05 +0000 (23:20 -0800)] 
Merge branch 'barsoom-ol-unstyled' into 2.0.1-wip