]> git.ipfire.org Git - thirdparty/bootstrap.git/log
thirdparty/bootstrap.git
13 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.

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

13 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

13 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

13 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

13 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

13 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

13 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

13 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

13 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

13 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

13 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

13 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

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

13 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

13 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

13 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

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

13 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

13 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

13 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

13 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

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

13 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

13 years agoSet focus back to input field after clicking an item 6099/head
Marcel Korpel [Sat, 1 Dec 2012 14:19:41 +0000 (15:19 +0100)] 
Set focus back to input field after clicking an item
Test 'focus is still set' added

Fixes issue #5933

13 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

13 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

13 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

13 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

13 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

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

13 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

13 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

13 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

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

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

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

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

13 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

13 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

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

13 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

13 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

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

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

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

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

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

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

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

13 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

13 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

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

13 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

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

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

13 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

13 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

13 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

13 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

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

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

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

13 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

13 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

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

13 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

13 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

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

13 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

13 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

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

13 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

13 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

13 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

13 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

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

13 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

13 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

13 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

13 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.

13 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

13 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

13 years agoFixes #5616: scope carousel state classes to immediate children only
Mark Otto [Wed, 28 Nov 2012 10:17:50 +0000 (02:17 -0800)] 
Fixes #5616: scope carousel state classes to immediate children only

13 years agoFixes #5930: redeclare font-size for popoves in btn-groups
Mark Otto [Wed, 28 Nov 2012 10:10:23 +0000 (02:10 -0800)] 
Fixes #5930: redeclare font-size for popoves in btn-groups

13 years agoFixes #5927: Scope button group 5px button left margin to immediate children
Mark Otto [Wed, 28 Nov 2012 09:51:04 +0000 (01:51 -0800)] 
Fixes #5927: Scope button group 5px button left margin to immediate children

13 years agoFixes #5940: Prevent @headingsColor from changing alert colors
Mark Otto [Wed, 28 Nov 2012 09:48:34 +0000 (01:48 -0800)] 
Fixes #5940: Prevent @headingsColor from changing alert colors

13 years agoFixes #4852: IE8 popover carets fixed
Mark Otto [Wed, 28 Nov 2012 09:38:21 +0000 (01:38 -0800)] 
Fixes #4852: IE8 popover carets fixed

* IE8 refused a negative z-index to place the previous :after behind the .arrow, so I had to flip the styles.
* .arrow is the gray border/background, .arrow:after is now the white inner arrow
* Added a hex IE8 fallback to ensure the arrow shows for <IE9 as rgba() isn't supported
* Simplified some of the CSS for the popover carets

13 years agohelp-block margin-top should also apply after a span.uneditable-input
Zulfiqar Ali [Wed, 28 Nov 2012 08:47:59 +0000 (16:47 +0800)] 
help-block margin-top should also apply after a span.uneditable-input

13 years agoFixes #5963: Add large button example to icons, fix vertical alignment in large buttons
Mark Otto [Wed, 28 Nov 2012 08:46:09 +0000 (00:46 -0800)] 
Fixes #5963: Add large button example to icons, fix vertical alignment in large buttons

13 years agoFixes #6010: Navbar dropdown caret should match link hover color
Mark Otto [Wed, 28 Nov 2012 08:42:17 +0000 (00:42 -0800)] 
Fixes #6010: Navbar dropdown caret should match link hover color

13 years agoFixes #6012: Updated docs sidenav media queries and reset width for exactly 980px
Mark Otto [Wed, 28 Nov 2012 08:37:55 +0000 (00:37 -0800)] 
Fixes #6012: Updated docs sidenav media queries and reset width for exactly 980px

13 years agoFixes #6035: use font-size vars in button groups
Mark Otto [Wed, 28 Nov 2012 08:31:52 +0000 (00:31 -0800)] 
Fixes #6035: use font-size vars in button groups

13 years agoFixes #5935: Updated vertical gradient mixin
Mark Otto [Wed, 28 Nov 2012 08:19:35 +0000 (00:19 -0800)] 
Fixes #5935: Updated vertical gradient mixin

13 years agoleave it to the developer to decide how to use the content of the popover 6028/head
Swaagie [Tue, 27 Nov 2012 14:07:31 +0000 (15:07 +0100)] 
leave it to the developer to decide how to use the content of the popover

13 years agohelp-block margin-top should also apply after a span.input 6018/head
Zulfiqar Ali [Mon, 26 Nov 2012 23:30:54 +0000 (07:30 +0800)] 
help-block margin-top should also apply after a span.input

13 years agoMerge branch '2.2.2-wip' into exploratory
Mark Otto [Fri, 23 Nov 2012 06:04:21 +0000 (22:04 -0800)] 
Merge branch '2.2.2-wip' into exploratory

Conflicts:
less/button-groups.less

13 years agofix image sizes on homepage
Mark Otto [Thu, 22 Nov 2012 20:26:54 +0000 (12:26 -0800)] 
fix image sizes on homepage

13 years agoFixes #5986: single toggle button html examples
Mark Otto [Thu, 22 Nov 2012 20:06:36 +0000 (12:06 -0800)] 
Fixes #5986: single toggle button html examples

13 years agoSimpler footer for docs
Mark Otto [Thu, 22 Nov 2012 07:29:20 +0000 (23:29 -0800)] 
Simpler footer for docs

* Remove back to top link (ya'll are lazy :P)
* Center text
* Decrease vertical padding