]> git.ipfire.org Git - thirdparty/bootstrap.git/log
thirdparty/bootstrap.git
13 years agoFixes issue with Opera flickering on the collapse plugin when reset is called without... 1421/head
Mark Reeder [Mon, 30 Jan 2012 05:14:07 +0000 (21:14 -0800)] 
Fixes issue with Opera flickering on the collapse plugin when reset is called without specifying the size

https://github.com/twitter/bootstrap/issues/1208

13 years agoMerge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
Jacob Thornton [Mon, 30 Jan 2012 03:07:14 +0000 (19:07 -0800)] 
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip

Conflicts:
docs/assets/bootstrap.zip

13 years agoadd license for responsive and rebuild
Jacob Thornton [Mon, 30 Jan 2012 03:04:26 +0000 (19:04 -0800)] 
add license for responsive and rebuild

13 years agosubnav adjustments
Mark Otto [Mon, 30 Jan 2012 01:03:05 +0000 (17:03 -0800)] 
subnav adjustments

13 years agomove vars and mixins for default grid back to appropriate files
Mark Otto [Mon, 30 Jan 2012 00:58:51 +0000 (16:58 -0800)] 
move vars and mixins for default grid back to appropriate files

13 years agoMerge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Mark Otto [Mon, 30 Jan 2012 00:55:56 +0000 (16:55 -0800)] 
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip

Conflicts:
docs/assets/bootstrap.zip

13 years agoremove .collapse from navbar responsive docs
Mark Otto [Mon, 30 Jan 2012 00:54:51 +0000 (16:54 -0800)] 
remove .collapse from navbar responsive docs

13 years agorebuild zip
Jacob Thornton [Mon, 30 Jan 2012 00:46:40 +0000 (16:46 -0800)] 
rebuild zip

13 years agoreran make
Mark Otto [Mon, 30 Jan 2012 00:43:03 +0000 (16:43 -0800)] 
reran make

13 years agoMerge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Mark Otto [Mon, 30 Jan 2012 00:42:37 +0000 (16:42 -0800)] 
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip

Conflicts:
docs/assets/bootstrap.zip

13 years agofix broken navbar collapse
Mark Otto [Mon, 30 Jan 2012 00:35:55 +0000 (16:35 -0800)] 
fix broken navbar collapse

13 years agoremove dist dir
Jacob Thornton [Mon, 30 Jan 2012 00:33:29 +0000 (16:33 -0800)] 
remove dist dir

13 years agocheck in dist dir for hb5 + update images to point to correct spot for builder
Jacob Thornton [Mon, 30 Jan 2012 00:19:41 +0000 (16:19 -0800)] 
check in dist dir for hb5 + update images to point to correct spot for builder

13 years agoMerge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Mark Otto [Sun, 29 Jan 2012 22:23:06 +0000 (14:23 -0800)] 
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip

13 years agoupdate navbar collapse everywhere and remake
Mark Otto [Sun, 29 Jan 2012 22:22:51 +0000 (14:22 -0800)] 
update navbar collapse everywhere and remake

13 years agoupdate collapsible nav in navbar
Mark Otto [Sun, 29 Jan 2012 22:07:14 +0000 (14:07 -0800)] 
update collapsible nav in navbar

13 years agoMerge pull request #1404 from ChadMoran/patch-1
Mark Otto [Sun, 29 Jan 2012 21:29:50 +0000 (13:29 -0800)] 
Merge pull request #1404 from ChadMoran/patch-1

warningText and warningBackground docs fix

13 years agoMerge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Mark Otto [Sun, 29 Jan 2012 21:25:36 +0000 (13:25 -0800)] 
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip

13 years agofix form styles on prepend/append for consistency, update code docs with examples...
Mark Otto [Sun, 29 Jan 2012 21:25:13 +0000 (13:25 -0800)] 
fix form styles on prepend/append for consistency, update code docs with examples of the code snippets

13 years agoFixed @warningText and @warningBackground colors in docs 1403/head 1404/head
Chad Moran [Sun, 29 Jan 2012 21:20:39 +0000 (13:20 -0800)] 
Fixed @warningText and @warningBackground colors in docs

13 years agoMerge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
Jacob Thornton [Sun, 29 Jan 2012 21:16:02 +0000 (13:16 -0800)] 
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip

13 years agofix animated/striped gradients in progress bars
Mark Otto [Sun, 29 Jan 2012 21:15:38 +0000 (13:15 -0800)] 
fix animated/striped gradients in progress bars

13 years agomove building zip file into docs/makefile
Jacob Thornton [Sun, 29 Jan 2012 21:15:37 +0000 (13:15 -0800)] 
move building zip file into docs/makefile

13 years agorefined pager styles to give a border on the links and improved hover state
Mark Otto [Sun, 29 Jan 2012 21:12:13 +0000 (13:12 -0800)] 
refined pager styles to give a border on the links and improved hover state

13 years agoupdate text on icons note
Mark Otto [Sun, 29 Jan 2012 21:09:10 +0000 (13:09 -0800)] 
update text on icons note

13 years agofix js readme api capitalization
Mark Otto [Sun, 29 Jan 2012 21:07:31 +0000 (13:07 -0800)] 
fix js readme api capitalization

13 years agolast minute addition of a simple fluid grid for our fluid examples; it needs work...
Mark Otto [Sun, 29 Jan 2012 21:06:57 +0000 (13:06 -0800)] 
last minute addition of a simple fluid grid for our fluid examples; it needs work, so we're not documenting it now

13 years agoupdate hero example and examples overview
Mark Otto [Sun, 29 Jan 2012 10:27:45 +0000 (02:27 -0800)] 
update hero example and examples overview

13 years agoremove form docs from the styles and markup, it's no longer needed
Mark Otto [Sun, 29 Jan 2012 08:07:01 +0000 (00:07 -0800)] 
remove form docs from the styles and markup, it's no longer needed

13 years agoadd swatches to the color variables in less docs page
Mark Otto [Sun, 29 Jan 2012 07:58:39 +0000 (23:58 -0800)] 
add swatches to the color variables in less docs page

13 years agoMerge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Mark Otto [Sun, 29 Jan 2012 07:41:18 +0000 (23:41 -0800)] 
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip

13 years agoremoving required .navbar-static class, rewrote docs to reflect the change, and updat...
Mark Otto [Sun, 29 Jan 2012 07:40:52 +0000 (23:40 -0800)] 
removing required .navbar-static class, rewrote docs to reflect the change, and updated the upgrade docs page to include the navbar section

13 years agoMerge pull request #1367 from lukeman/update-example-layouts
Mark Otto [Sun, 29 Jan 2012 07:29:10 +0000 (23:29 -0800)] 
Merge pull request #1367 from lukeman/update-example-layouts

[2.0-wip] update example layouts

13 years agoupdate all example pages to latest version 1367/head
Luke Hatcher [Sun, 29 Jan 2012 06:48:51 +0000 (01:48 -0500)] 
update all example pages to latest version

13 years agorevamped the thumbnails examples to make them work and look better at higher resolution
Mark Otto [Sun, 29 Jan 2012 06:48:25 +0000 (22:48 -0800)] 
revamped the thumbnails examples to make them work and look better at higher resolution

13 years agonamespace progress bars and labels classes
Mark Otto [Sun, 29 Jan 2012 06:14:51 +0000 (22:14 -0800)] 
namespace progress bars and labels classes

13 years agoupdates to responsive and docs for responsive navbar
Mark Otto [Sun, 29 Jan 2012 06:03:14 +0000 (22:03 -0800)] 
updates to responsive and docs for responsive navbar

13 years agoclarify and tweak media queries
Mark Otto [Sun, 29 Jan 2012 04:34:07 +0000 (20:34 -0800)] 
clarify and tweak media queries

13 years agoremove benefits from homepage html
Mark Otto [Sun, 29 Jan 2012 04:27:18 +0000 (20:27 -0800)] 
remove benefits from homepage html

13 years agoupdate docs to simplify some css
Mark Otto [Sun, 29 Jan 2012 04:26:27 +0000 (20:26 -0800)] 
update docs to simplify some css

13 years agofix alert close position
Mark Otto [Sun, 29 Jan 2012 02:46:41 +0000 (18:46 -0800)] 
fix alert close position

13 years agoupdate components page to include docs for the new navbar collapse feature, re-add...
Mark Otto [Sun, 29 Jan 2012 02:39:36 +0000 (18:39 -0800)] 
update components page to include docs for the new navbar collapse feature, re-add responsive.less to downloader

13 years agofix dropdowns in subnav
Mark Otto [Sun, 29 Jan 2012 02:27:09 +0000 (18:27 -0800)] 
fix dropdowns in subnav

13 years agomore responsive tweaks for tablet
Mark Otto [Sun, 29 Jan 2012 02:25:05 +0000 (18:25 -0800)] 
more responsive tweaks for tablet

13 years agofix the navbar click and a few jank responsive problems
Mark Otto [Sun, 29 Jan 2012 02:11:31 +0000 (18:11 -0800)] 
fix the navbar click and a few jank responsive problems

13 years agoremove background from accordion, and use border instead
Mark Otto [Sun, 29 Jan 2012 00:48:03 +0000 (16:48 -0800)] 
remove background from accordion, and use border instead

13 years agoremove padding from first-child of inline radios/checkboxes
Mark Otto [Sun, 29 Jan 2012 00:37:43 +0000 (16:37 -0800)] 
remove padding from first-child of inline radios/checkboxes

13 years agofix goign between small view large view with responsive collapse
Jacob Thornton [Sun, 29 Jan 2012 00:21:55 +0000 (16:21 -0800)] 
fix goign between small view large view with responsive collapse

13 years agoturn off brand hover for now + get nav toggling in mobile
Jacob Thornton [Sat, 28 Jan 2012 23:42:07 +0000 (15:42 -0800)] 
turn off brand hover for now + get nav toggling in mobile

13 years agoMerge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
Jacob Thornton [Sat, 28 Jan 2012 23:15:38 +0000 (15:15 -0800)] 
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip

13 years agoblah
Jacob Thornton [Sat, 28 Jan 2012 23:14:57 +0000 (15:14 -0800)] 
blah

13 years agoadd in a navbar button for toggling the nav items
Mark Otto [Sat, 28 Jan 2012 23:09:23 +0000 (15:09 -0800)] 
add in a navbar button for toggling the nav items

13 years agoMerge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Mark Otto [Sat, 28 Jan 2012 22:51:14 +0000 (14:51 -0800)] 
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip

13 years agovertical align inline checkboxes/radios to improve rendering in topbar
Mark Otto [Sat, 28 Jan 2012 22:50:56 +0000 (14:50 -0800)] 
vertical align inline checkboxes/radios to improve rendering in topbar

13 years agoMerge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
Jacob Thornton [Sat, 28 Jan 2012 22:48:20 +0000 (14:48 -0800)] 
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip

13 years agoremove uglify variable from makefile
Jacob Thornton [Sat, 28 Jan 2012 22:47:59 +0000 (14:47 -0800)] 
remove uglify variable from makefile

13 years agochange .span* inputs to use content-sizing: border-box; to make them behave as block...
Mark Otto [Sat, 28 Jan 2012 22:30:45 +0000 (14:30 -0800)] 
change .span* inputs to use content-sizing: border-box; to make them behave as block level elements

13 years agocomment for progress bars firefox keyframes
Mark Otto [Sat, 28 Jan 2012 22:20:27 +0000 (14:20 -0800)] 
comment for progress bars firefox keyframes

13 years agoMerge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Mark Otto [Sat, 28 Jan 2012 21:30:34 +0000 (13:30 -0800)] 
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip

13 years agofix tabs-below typo
Mark Otto [Sat, 28 Jan 2012 21:30:15 +0000 (13:30 -0800)] 
fix tabs-below typo

13 years agoMerge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
Jacob Thornton [Sat, 28 Jan 2012 21:17:07 +0000 (13:17 -0800)] 
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip

13 years agotypahead does case insensitive matching with simple sorter + accepts highlighter...
Jacob Thornton [Sat, 28 Jan 2012 21:16:05 +0000 (13:16 -0800)] 
typahead does case insensitive matching with simple sorter + accepts highlighter option

13 years agorestore IE filters, but reset them on buttons
Mark Otto [Sat, 28 Jan 2012 21:13:01 +0000 (13:13 -0800)] 
restore IE filters, but reset them  on buttons

13 years agoadd checkbox/radio border for ios in responsive
Mark Otto [Sat, 28 Jan 2012 21:07:01 +0000 (13:07 -0800)] 
add checkbox/radio border for ios in responsive

13 years agofix border and border radius on radios/checkboxes for iOS, fix forms docs alignment...
Mark Otto [Sat, 28 Jan 2012 20:58:26 +0000 (12:58 -0800)] 
fix border and border radius on radios/checkboxes for iOS, fix forms docs alignment on small devices

13 years agoreset border-radius only for ie9?
Mark Otto [Sat, 28 Jan 2012 20:49:26 +0000 (12:49 -0800)] 
reset border-radius only for ie9?

13 years agoMerge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Mark Otto [Sat, 28 Jan 2012 20:43:45 +0000 (12:43 -0800)] 
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip

13 years agodarken buttons, uncomment out firefox keyframes from progress bars
Mark Otto [Sat, 28 Jan 2012 20:43:19 +0000 (12:43 -0800)] 
darken buttons, uncomment out firefox keyframes from progress bars

13 years agoadd trailing ;
Jacob Thornton [Sat, 28 Jan 2012 20:14:41 +0000 (12:14 -0800)] 
add trailing ;

13 years agoMerge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
Jacob Thornton [Sat, 28 Jan 2012 20:09:16 +0000 (12:09 -0800)] 
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip

13 years agofix z-index issue with modals for popovers,tooltips,and dropdowns
Jacob Thornton [Sat, 28 Jan 2012 20:08:41 +0000 (12:08 -0800)] 
fix z-index issue with modals for popovers,tooltips,and dropdowns

13 years agoupdate mixins to fix radial gradient
Mark Otto [Sat, 28 Jan 2012 20:03:26 +0000 (12:03 -0800)] 
update mixins to fix radial gradient

13 years agoincrease padding on modal-header after decreasing h3 line-height
Mark Otto [Sat, 28 Jan 2012 19:24:34 +0000 (11:24 -0800)] 
increase padding on modal-header after decreasing h3 line-height

13 years agoMerge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Mark Otto [Sat, 28 Jan 2012 19:22:07 +0000 (11:22 -0800)] 
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip

13 years agonav, buttons, and docs updates to account for outline: 0; on :active
Mark Otto [Sat, 28 Jan 2012 19:21:39 +0000 (11:21 -0800)] 
nav, buttons, and docs updates to account for outline: 0; on :active

13 years agoMerge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
Jacob Thornton [Sat, 28 Jan 2012 19:04:05 +0000 (11:04 -0800)] 
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip

13 years agoclean up js api for dropdowns
Jacob Thornton [Sat, 28 Jan 2012 19:03:39 +0000 (11:03 -0800)] 
clean up js api for dropdowns

13 years agoMerge pull request #1339 from lookfirst/nodebug
Jacob Thornton [Sat, 28 Jan 2012 18:47:22 +0000 (10:47 -0800)] 
Merge pull request #1339 from lookfirst/nodebug

2.0-wip: no debugger

13 years agono debugger 1339/head
Jon Stevens [Sat, 28 Jan 2012 10:25:13 +0000 (02:25 -0800)] 
no debugger

13 years agoremove js for table sorts
Jacob Thornton [Sat, 28 Jan 2012 09:48:45 +0000 (01:48 -0800)] 
remove js for table sorts

13 years agoMerge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
Jacob Thornton [Sat, 28 Jan 2012 09:35:36 +0000 (01:35 -0800)] 
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip

13 years agoall unit tests passing in ie7
Jacob Thornton [Sat, 28 Jan 2012 09:35:13 +0000 (01:35 -0800)] 
all unit tests passing in ie7

13 years agoupdated upgrading page
Mark Otto [Sat, 28 Jan 2012 09:34:07 +0000 (01:34 -0800)] 
updated upgrading page

13 years agoMerge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
Jacob Thornton [Sat, 28 Jan 2012 08:46:21 +0000 (00:46 -0800)] 
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip

13 years agoclean up application js a bit
Jacob Thornton [Sat, 28 Jan 2012 08:46:04 +0000 (00:46 -0800)] 
clean up application js a bit

13 years agochange text on js docs page to improve rendering on iphone, update responsive for...
Mark Otto [Sat, 28 Jan 2012 08:43:25 +0000 (00:43 -0800)] 
change text on js docs page to improve rendering on iphone, update responsive for carousel considerations

13 years agoMerge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Mark Otto [Sat, 28 Jan 2012 08:39:34 +0000 (00:39 -0800)] 
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip

13 years agomodal refinements in docs and general responsiveness
Mark Otto [Sat, 28 Jan 2012 08:39:22 +0000 (00:39 -0800)] 
modal refinements in docs and general responsiveness

13 years agoMerge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
Jacob Thornton [Sat, 28 Jan 2012 08:37:12 +0000 (00:37 -0800)] 
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip

13 years agoremove quick start section to simplify landing page + start rewriting application...
Jacob Thornton [Sat, 28 Jan 2012 08:36:37 +0000 (00:36 -0800)] 
remove quick start section to simplify landing page + start rewriting application js to work ie7

13 years agoremove fixed width from labels table
Mark Otto [Sat, 28 Jan 2012 08:34:54 +0000 (00:34 -0800)] 
remove fixed width from labels table

13 years agoextend block level smalls to h2s in docs
Mark Otto [Sat, 28 Jan 2012 08:31:55 +0000 (00:31 -0800)] 
extend block level smalls to h2s in docs

13 years agoblock level page-header h1 small for readability on 480px and under
Mark Otto [Sat, 28 Jan 2012 08:29:38 +0000 (00:29 -0800)] 
block level page-header h1 small for readability on 480px and under

13 years agoscope subnav link styles to first child, and no dropdowns
Mark Otto [Sat, 28 Jan 2012 08:27:49 +0000 (00:27 -0800)] 
scope subnav link styles to first child, and no dropdowns

13 years agodrop span2-4 on form examples to 1-3
Mark Otto [Sat, 28 Jan 2012 08:25:54 +0000 (00:25 -0800)] 
drop span2-4 on form examples to 1-3

13 years agoMerge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Mark Otto [Sat, 28 Jan 2012 08:23:44 +0000 (00:23 -0800)] 
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip

13 years agorewrite the code section of the type docs
Mark Otto [Sat, 28 Jan 2012 08:23:30 +0000 (00:23 -0800)] 
rewrite the code section of the type docs

13 years agoMerge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
Jacob Thornton [Sat, 28 Jan 2012 08:04:06 +0000 (00:04 -0800)] 
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip

13 years agofix failing typeahead tests
Jacob Thornton [Sat, 28 Jan 2012 08:03:26 +0000 (00:03 -0800)] 
fix failing typeahead tests

13 years agogive append/prepend inputs higher z-index on focus
Mark Otto [Sat, 28 Jan 2012 07:53:56 +0000 (23:53 -0800)] 
give append/prepend inputs higher z-index on focus