]> git.ipfire.org Git - thirdparty/bootstrap.git/log
thirdparty/bootstrap.git
12 years agodocument caveat regarding fieldset legend and #6199 6199/head
Chris Rebert [Mon, 10 Dec 2012 09:46:16 +0000 (01:46 -0800)] 
document caveat regarding fieldset legend and #6199

12 years agodocument fieldset[disabled] styling added in #6199; per @mdo
Chris Rebert [Mon, 10 Dec 2012 09:33:02 +0000 (01:33 -0800)] 
document fieldset[disabled] styling added in #6199; per @mdo

12 years agofixes #5605: style as disabled all form controls & btns under a disabled fieldset
Chris Rebert [Mon, 10 Dec 2012 07:42:05 +0000 (23:42 -0800)] 
fixes #5605: style as disabled all form controls & btns under a disabled fieldset

this is a resubmission of #5875, but now against branch 3.0.0-wip
does not exclude elements under a fieldset's legend
issue #6058 is a duplicate of #5605

12 years agoMerge branch 'master' into 3.0.0-wip
Mark Otto [Sun, 9 Dec 2012 01:40:42 +0000 (17:40 -0800)] 
Merge branch 'master' into 3.0.0-wip

Conflicts:
docs/assets/css/bootstrap.css
docs/assets/js/bootstrap.js
docs/css.html
docs/templates/pages/base-css.mustache
docs/templates/pages/components.mustache
docs/templates/pages/javascript.mustache
less/breadcrumbs.less
less/tables.less
less/tests/css-tests.html

12 years agoFixes #5729: Nested striped tables v2.2.2
Mark Otto [Sat, 8 Dec 2012 20:57:21 +0000 (12:57 -0800)] 
Fixes #5729: Nested striped tables

* Scopes striping to immediate children of the tbody and tr
* For nested tables, sets a background color of @bodyBackground, to override the default transparent bg

12 years agoNesting tables
Mark Otto [Sat, 8 Dec 2012 20:52:19 +0000 (12:52 -0800)] 
Nesting tables

* Add simple test to css-tests.html
* Scope .table-bordered to immediate children th/td elements only

12 years agoMerge pull request #6165 from Quy/2.2.2-wip
Mark Otto [Sat, 8 Dec 2012 20:17:46 +0000 (12:17 -0800)] 
Merge pull request #6165 from Quy/2.2.2-wip

Apply code tag to data attribute on javascript page

12 years agoApply code tag to data attribute on javascript page 6165/head
Quy Ton [Sat, 8 Dec 2012 20:06:46 +0000 (12:06 -0800)] 
Apply code tag to data attribute on javascript page

12 years agoget tests passing for typeahead :P
fat [Sat, 8 Dec 2012 00:16:48 +0000 (19:16 -0500)] 
get tests passing for typeahead :P

12 years agoinsert menu of typeahead after input which it suggests on #3529
fat [Fri, 7 Dec 2012 23:59:13 +0000 (18:59 -0500)] 
insert menu of typeahead after input which it suggests on #3529

note: this will likely break things for people in the same way that doing
this to tooltip did… however we think this is a better insertion model for
z-index,scrolling,modal,etc. applications

12 years agofocus on escape in typeahead
fat [Fri, 7 Dec 2012 23:37:32 +0000 (18:37 -0500)] 
focus on escape in typeahead

12 years agoMerge branch '2.2.2-wip' of github.com:twitter/bootstrap into 2.2.2-wip
fat [Fri, 7 Dec 2012 22:50:34 +0000 (17:50 -0500)] 
Merge branch '2.2.2-wip' of github.com:twitter/bootstrap into 2.2.2-wip

12 years agoremove slide from carousel constructor #5579
fat [Fri, 7 Dec 2012 22:49:05 +0000 (17:49 -0500)] 
remove slide from carousel constructor #5579

12 years agoMerge pull request #5862 from pmclanahan/issue-5806-typeahead-keyboard-nav
billy gates [Fri, 7 Dec 2012 22:16:51 +0000 (14:16 -0800)] 
Merge pull request #5862 from pmclanahan/issue-5806-typeahead-keyboard-nav

Fix issue with double move event firing in typeahead.

12 years agorebuild and only select visible dropdown items
fat [Fri, 7 Dec 2012 22:14:49 +0000 (17:14 -0500)] 
rebuild and only select visible dropdown items

12 years agoMerge pull request #6118 from godric7/master
billy gates [Fri, 7 Dec 2012 22:11:18 +0000 (14:11 -0800)] 
Merge pull request #6118 from godric7/master

scrollSpy - add parent scrollTop to offset calculation

12 years agoadd noConflict functionality to all bootstrap plugins
fat [Fri, 7 Dec 2012 22:06:01 +0000 (17:06 -0500)] 
add noConflict functionality to all bootstrap plugins

12 years agoMerge branch '2.2.2-wip' of github.com:twitter/bootstrap into 2.2.2-wip
Mark Otto [Fri, 7 Dec 2012 17:51:57 +0000 (09:51 -0800)] 
Merge branch '2.2.2-wip' of github.com:twitter/bootstrap into 2.2.2-wip

12 years agoFixes #6148: Icons in mini buttons properly aligned
Mark Otto [Fri, 7 Dec 2012 17:51:01 +0000 (09:51 -0800)] 
Fixes #6148: Icons in mini buttons properly aligned

12 years agoMerge pull request #6151 from tierra/pre-code-white-space-fix
Mark Otto [Fri, 7 Dec 2012 17:48:14 +0000 (09:48 -0800)] 
Merge pull request #6151 from tierra/pre-code-white-space-fix

Fix code block white-space breaks within pre tags.

12 years agoMerge branch '2.2.2-wip' of github.com:twitter/bootstrap into 2.2.2-wip
Mark Otto [Fri, 7 Dec 2012 17:43:32 +0000 (09:43 -0800)] 
Merge branch '2.2.2-wip' of github.com:twitter/bootstrap into 2.2.2-wip

12 years agoFixes #6136: Proper scoping of breadcrumbs divider
Mark Otto [Fri, 7 Dec 2012 17:43:09 +0000 (09:43 -0800)] 
Fixes #6136: Proper scoping of breadcrumbs divider

12 years agoMerge pull request #6143 from Quy/2.2.2-wip
Mark Otto [Fri, 7 Dec 2012 17:41:17 +0000 (09:41 -0800)] 
Merge pull request #6143 from Quy/2.2.2-wip

Escape ×

12 years agoFix code block white-space breaks within pre tags. 6151/head
Bryan Petty [Thu, 6 Dec 2012 18:33:00 +0000 (11:33 -0700)] 
Fix code block white-space breaks within pre tags.

12 years agoEscape × 6143/head
Quy Ton [Wed, 5 Dec 2012 23:28:14 +0000 (15:28 -0800)] 
Escape ×

12 years agoNuke all i18n tags from .mustache templates
Mark Otto [Wed, 5 Dec 2012 19:09:02 +0000 (11:09 -0800)] 
Nuke all i18n tags from .mustache templates

12 years agoRemove commented out old popover CSS
Mark Otto [Wed, 5 Dec 2012 19:06:16 +0000 (11:06 -0800)] 
Remove commented out old popover CSS

12 years agoMerge branch '2.2.2-wip' into 3.0.0-wip
Mark Otto [Wed, 5 Dec 2012 19:05:10 +0000 (11:05 -0800)] 
Merge branch '2.2.2-wip' into 3.0.0-wip

Conflicts:
README.md
docs/assets/css/bootstrap.css
docs/assets/js/bootstrap.js
docs/assets/js/bootstrap.min.js
docs/examples/fluid.html
docs/scaffolding.html
less/breadcrumbs.less
less/popovers.less
less/responsive.less

12 years agoadd gallery page, fill with a few screenshots to start
Mark Otto [Wed, 5 Dec 2012 04:30:21 +0000 (20:30 -0800)] 
add gallery page, fill with a few screenshots to start

12 years agoFixes #4550: Temporary fix for dropdown taps on mobile
Mark Otto [Wed, 5 Dec 2012 02:28:12 +0000 (18:28 -0800)] 
Fixes #4550: Temporary fix for dropdown taps on mobile

* Fix as documented here: https://github.com/twitter/bootstrap/issues/4756#issuecomment-9952781
* Stops propagation for touchstart for dropdowns

12 years agoFix up display of dropdown submenu examples on responsive views
Mark Otto [Wed, 5 Dec 2012 02:25:16 +0000 (18:25 -0800)] 
Fix up display of dropdown submenu examples on responsive views

12 years agocorrect link on index page to grid system
Mark Otto [Tue, 4 Dec 2012 17:49:18 +0000 (09:49 -0800)] 
correct link on index page to grid system

12 years agoUpdate js/bootstrap-scrollspy.js 6118/head
Godric [Tue, 4 Dec 2012 00:21:07 +0000 (01:21 +0100)] 
Update js/bootstrap-scrollspy.js

Fix for Bootstrap issue #6013 "scrollSpy - offset calculation"
https://github.com/twitter/bootstrap/issues/6013

12 years agoOnce more, update all the favicons to retina
Mark Otto [Mon, 3 Dec 2012 21:25:56 +0000 (13:25 -0800)] 
Once more, update all the favicons to retina

12 years agoAlign the touch icons attributes
Mark Otto [Mon, 3 Dec 2012 21:22:10 +0000 (13:22 -0800)] 
Align the touch icons attributes

12 years agoFixes #6115: scope breadcrumb styles to immediate children only
Mark Otto [Mon, 3 Dec 2012 21:09:38 +0000 (13:09 -0800)] 
Fixes #6115: scope breadcrumb styles to immediate children only

12 years agoImprove rendering of carousel example for IE10
Mark Otto [Mon, 3 Dec 2012 21:01:27 +0000 (13:01 -0800)] 
Improve rendering of carousel example for IE10

12 years agonuke comments
Mark Otto [Mon, 3 Dec 2012 17:23:02 +0000 (09:23 -0800)] 
nuke comments

12 years agoFixing header color for success, error and info alerts 6111/head
Andreas Cederström [Mon, 3 Dec 2012 13:20:14 +0000 (14:20 +0100)] 
Fixing header color for success, error and info alerts

12 years agoadd source attribution for IE10 fix
Mark Otto [Mon, 3 Dec 2012 05:01:53 +0000 (21:01 -0800)] 
add source attribution for IE10 fix

12 years agoEnable responsive features in IE10 when snapped
Mark Otto [Mon, 3 Dec 2012 04:57:34 +0000 (20:57 -0800)] 
Enable responsive features in IE10 when snapped

12 years agoRevert vertical gradient spec to 'to bottom' as 'top' doesn't work in IE10
Mark Otto [Mon, 3 Dec 2012 04:40:24 +0000 (20:40 -0800)] 
Revert vertical gradient spec to 'to bottom' as 'top' doesn't work in IE10

12 years agoherpderp
Mark Otto [Mon, 3 Dec 2012 02:15:40 +0000 (18:15 -0800)] 
herpderp

12 years agoReadme reorg
Mark Otto [Sun, 2 Dec 2012 21:14:49 +0000 (13:14 -0800)] 
Readme reorg

* Consolidate quick start options into easier to read list
* Consolidate social and community options into a list
* Add link to Code Guide for contributions section

12 years agoreset text align in popovers given inline insertion
Mark Otto [Sun, 2 Dec 2012 10:30:00 +0000 (02:30 -0800)] 
reset text align in popovers given inline insertion

12 years agoremove overrides on inner html of popover-content
Mark Otto [Sun, 2 Dec 2012 09:34:58 +0000 (01:34 -0800)] 
remove overrides on inner html of popover-content

12 years agorun make on js changes to popover
Mark Otto [Sun, 2 Dec 2012 09:32:23 +0000 (01:32 -0800)] 
run make on js changes to popover

12 years agoMerge branch 'Moveo-master' into 2.2.2-wip
Mark Otto [Sun, 2 Dec 2012 09:32:13 +0000 (01:32 -0800)] 
Merge branch 'Moveo-master' into 2.2.2-wip

12 years agorun make on modal popover fix
Mark Otto [Sun, 2 Dec 2012 08:09:45 +0000 (00:09 -0800)] 
run make on modal popover fix

12 years agofollow button width
Mark Otto [Sun, 2 Dec 2012 02:51:03 +0000 (18:51 -0800)] 
follow button width

12 years agoMerge pull request #6097 from blakeembrey/modal-body-relative
Mark Otto [Sun, 2 Dec 2012 01:45:33 +0000 (17:45 -0800)] 
Merge pull request #6097 from blakeembrey/modal-body-relative

Add relative positioning to .modal-body

12 years agoAdd relative positioning to .modal-body - Fixes #5991 6097/head
Blake Embrey [Sat, 1 Dec 2012 23:52:13 +0000 (09:52 +1000)] 
Add relative positioning to .modal-body - Fixes #5991

12 years agoremove single corner border-radius mixins
Mark Otto [Sat, 1 Dec 2012 22:25:28 +0000 (14:25 -0800)] 
remove single corner border-radius mixins

12 years agomove around social buttons
Mark Otto [Sat, 1 Dec 2012 21:47:07 +0000 (13:47 -0800)] 
move around social buttons

12 years agoversion bump to 3.0
Mark Otto [Sat, 1 Dec 2012 06:30:50 +0000 (22:30 -0800)] 
version bump to 3.0

12 years agosection title change
Mark Otto [Sat, 1 Dec 2012 01:43:20 +0000 (17:43 -0800)] 
section title change

12 years agodocs content changed
Mark Otto [Sat, 1 Dec 2012 00:43:31 +0000 (16:43 -0800)] 
docs content changed

12 years agoremove responsive image from css docs page
Mark Otto [Sat, 1 Dec 2012 00:42:48 +0000 (16:42 -0800)] 
remove responsive image from css docs page

12 years agoremove deleted css files, run make
Mark Otto [Sat, 1 Dec 2012 00:31:24 +0000 (16:31 -0800)] 
remove deleted css files, run make

12 years agofirst pass at nuking scaffolding
Mark Otto [Sat, 1 Dec 2012 00:29:30 +0000 (16:29 -0800)] 
first pass at nuking scaffolding

12 years agoRemove more fluid grid stuff
Mark Otto [Sat, 1 Dec 2012 00:18:40 +0000 (16:18 -0800)] 
Remove more fluid grid stuff

* No more fluid layout
* No fluid grid overrides for tables.less
* No more fluid example page

12 years agogrid vars updated
Mark Otto [Fri, 30 Nov 2012 23:43:07 +0000 (15:43 -0800)] 
grid vars updated

12 years agopopovers and tooltips vars
Mark Otto [Fri, 30 Nov 2012 23:40:44 +0000 (15:40 -0800)] 
popovers and tooltips vars

12 years agoform state vars
Mark Otto [Fri, 30 Nov 2012 23:38:31 +0000 (15:38 -0800)] 
form state vars

12 years agohero unit and pagination vars
Mark Otto [Fri, 30 Nov 2012 23:36:16 +0000 (15:36 -0800)] 
hero unit and pagination vars

12 years agoalignment
Mark Otto [Fri, 30 Nov 2012 23:34:35 +0000 (15:34 -0800)] 
alignment

12 years agonavbar vars
Mark Otto [Fri, 30 Nov 2012 23:33:56 +0000 (15:33 -0800)] 
navbar vars

12 years agomore vars changed
Mark Otto [Fri, 30 Nov 2012 23:27:13 +0000 (15:27 -0800)] 
more vars changed

12 years agoremove sprites vars, change zindex vars
Mark Otto [Fri, 30 Nov 2012 23:23:13 +0000 (15:23 -0800)] 
remove sprites vars, change zindex vars

12 years agoremove color variables, swap others were appropro
Mark Otto [Fri, 30 Nov 2012 23:18:49 +0000 (15:18 -0800)] 
remove color variables, swap others were appropro

12 years agomore vars changing
Mark Otto [Fri, 30 Nov 2012 23:09:57 +0000 (15:09 -0800)] 
more vars changing

12 years agomore vars changed, remove @white var
Mark Otto [Fri, 30 Nov 2012 23:05:23 +0000 (15:05 -0800)] 
more vars changed, remove @white var

12 years agomore consistent variable naming patterns
Mark Otto [Fri, 30 Nov 2012 22:45:25 +0000 (14:45 -0800)] 
more consistent variable naming patterns

12 years agoPart 1 of unCamelCasing variables
Mark Otto [Fri, 30 Nov 2012 22:37:24 +0000 (14:37 -0800)] 
Part 1 of unCamelCasing variables

12 years agomore tests for form styles; includes lightening help text
Mark Otto [Fri, 30 Nov 2012 21:35:20 +0000 (13:35 -0800)] 
more tests for form styles; includes lightening help text

12 years agoRefine containers and navbars
Mark Otto [Fri, 30 Nov 2012 20:42:37 +0000 (12:42 -0800)] 
Refine containers and navbars

* Don't reset width on .container, .navbar-* .container, etc
* Instead, use max-width to ensure proper styling for all navbars

12 years agoRemove .navbar-inner from navbar tests
Mark Otto [Fri, 30 Nov 2012 20:36:55 +0000 (12:36 -0800)] 
Remove .navbar-inner from navbar tests

12 years agoInputs now 100% width by default
Mark Otto [Fri, 30 Nov 2012 08:53:07 +0000 (00:53 -0800)] 
Inputs now 100% width by default

* Includes text inputs, selects, and textareas
* Updated docs to include .span* sizes wherever possible
* Commented out responsive 1200px inputs grid
* Still some derp to be done to improve more, but this is a decent first stab

12 years agoremove some unhelpful comments
Mark Otto [Fri, 30 Nov 2012 08:26:02 +0000 (00:26 -0800)] 
remove some unhelpful comments

12 years agoconsolidate font resets into scaffolding
Mark Otto [Fri, 30 Nov 2012 08:24:17 +0000 (00:24 -0800)] 
consolidate font resets into scaffolding

12 years agoremove from form styles
Mark Otto [Fri, 30 Nov 2012 08:21:44 +0000 (00:21 -0800)] 
remove  from form styles

12 years agoMerge branch '2.2.2-wip' into exploratory
Mark Otto [Fri, 30 Nov 2012 08:13:30 +0000 (00:13 -0800)] 
Merge branch '2.2.2-wip' into exploratory

Conflicts:
docs/assets/css/bootstrap.css
docs/components.html
docs/templates/pages/components.mustache
less/alerts.less
less/button-groups.less
less/buttons.less
less/tests/css-tests.html

12 years agoFixes #5853: Maintain 10px margin above help block when following input groups
Mark Otto [Fri, 30 Nov 2012 07:39:33 +0000 (23:39 -0800)] 
Fixes #5853: Maintain 10px margin above help block when following input groups

12 years agoremove element from selector
Mark Otto [Fri, 30 Nov 2012 07:33:09 +0000 (23:33 -0800)] 
remove element from selector

12 years agoMerge pull request #6039 from desheikh/2.2.2-wip
Mark Otto [Fri, 30 Nov 2012 07:32:38 +0000 (23:32 -0800)] 
Merge pull request #6039 from desheikh/2.2.2-wip

help-block margin-top should also apply after a span.uneditable-input

12 years agorun make with nav img fix
Mark Otto [Fri, 30 Nov 2012 07:27:20 +0000 (23:27 -0800)] 
run make with nav img fix

12 years agoupdate comment
Mark Otto [Fri, 30 Nov 2012 07:27:09 +0000 (23:27 -0800)] 
update comment

12 years agoMerge branch 'idavemm-patch-1' into 2.2.2-wip
Mark Otto [Fri, 30 Nov 2012 07:26:22 +0000 (23:26 -0800)] 
Merge branch 'idavemm-patch-1' into 2.2.2-wip

12 years agoMerge branch '2.2.2-wip-holder' into 2.2.2-wip
Mark Otto [Fri, 30 Nov 2012 05:35:57 +0000 (21:35 -0800)] 
Merge branch '2.2.2-wip-holder' into 2.2.2-wip

12 years agoupgrade to holder 1.6
Mark Otto [Fri, 30 Nov 2012 05:35:45 +0000 (21:35 -0800)] 
upgrade to holder 1.6

12 years agoMerge branch 'jblotus-patch-1' into 2.2.2-wip
Mark Otto [Fri, 30 Nov 2012 05:06:20 +0000 (21:06 -0800)] 
Merge branch 'jblotus-patch-1' into 2.2.2-wip

12 years agoMerge branch 'patch-1' of https://github.com/jblotus/bootstrap into jblotus-patch-1
Mark Otto [Fri, 30 Nov 2012 05:06:11 +0000 (21:06 -0800)] 
Merge branch 'patch-1' of https://github.com/jblotus/bootstrap into jblotus-patch-1

12 years agoadd holder and replace placehold.it
Mark Otto [Fri, 30 Nov 2012 04:59:14 +0000 (20:59 -0800)] 
add holder and replace placehold.it

12 years agoadded compiled css file 6039/head
Zulfiqar Ali [Thu, 29 Nov 2012 09:40:23 +0000 (17:40 +0800)] 
added compiled css file

12 years agoMerge pull request #6057 from ph-One/patch-3
Mark Otto [Thu, 29 Nov 2012 02:41:36 +0000 (18:41 -0800)] 
Merge pull request #6057 from ph-One/patch-3

Update Makefile's UglifyJS commands

12 years agoFix the carousel after we scoped selectors
Mark Otto [Wed, 28 Nov 2012 23:40:51 +0000 (15:40 -0800)] 
Fix the carousel after we scoped selectors

12 years agoMerge branch 'trsteel88-master' into 2.2.2-wip
Mark Otto [Wed, 28 Nov 2012 23:35:16 +0000 (15:35 -0800)] 
Merge branch 'trsteel88-master' into 2.2.2-wip

12 years agoUpdate Makefile 6057/head
Kyle A. Matheny [Wed, 28 Nov 2012 23:33:05 +0000 (23:33 +0000)] 
Update Makefile

Fixed both instances of uglifyjs usage.

12 years agoFixes #5533: Remove filter gradient from disabled links on dropdowns
Mark Otto [Wed, 28 Nov 2012 10:22:37 +0000 (02:22 -0800)] 
Fixes #5533: Remove filter gradient from disabled links on dropdowns

12 years agoFixes #5594: Vertical button groups show use max-width, not width, and be scoped...
Mark Otto [Wed, 28 Nov 2012 10:21:34 +0000 (02:21 -0800)] 
Fixes #5594: Vertical button groups show use max-width, not width, and be scoped to immediate children buttons only