]> git.ipfire.org Git - thirdparty/bootstrap.git/log
thirdparty/bootstrap.git
13 years agoAdd a test case for issue #908 (twipsy doesn't respect custom classes) 907/head
Nicklas Ansman Giertz [Fri, 6 Jan 2012 10:32:11 +0000 (11:32 +0100)] 
Add a test case for issue #908 (twipsy doesn't respect custom classes)

The test case verifies that a custom class is respected.

13 years agoMake twipsy respect custom classes when using a custom template 906/head
Nicklas Ansman Giertz [Fri, 6 Jan 2012 10:16:29 +0000 (11:16 +0100)] 
Make twipsy respect custom classes when using a custom template

If you had a custom class to the root object twipsy would overwrite
that class ($tip[0].className = 'twipsy'), now this has been changed
so it removes only classes that twipsy adds.

13 years agobreaking out patterns.less even more, removing unnecessary div from checkbox and...
Mark Otto [Thu, 5 Jan 2012 18:01:42 +0000 (10:01 -0800)] 
breaking out patterns.less even more, removing unnecessary div from checkbox and radio lists--now just labels and inputs

13 years agoMerge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Mark Otto [Thu, 5 Jan 2012 09:37:06 +0000 (01:37 -0800)] 
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip

Conflicts:
bootstrap.css

13 years agoadd a quick little example of icons in buttons
Mark Otto [Thu, 5 Jan 2012 09:36:05 +0000 (01:36 -0800)] 
add a quick little example of icons in buttons

13 years agotweaks abound, updated prettify styles, new sidenav component started, sprite icons...
Mark Otto [Thu, 5 Jan 2012 09:34:14 +0000 (01:34 -0800)] 
tweaks abound, updated prettify styles, new sidenav component started, sprite icons started

13 years agoactuall use interval option :P
Jacob Thornton [Tue, 3 Jan 2012 06:57:04 +0000 (22:57 -0800)] 
actuall use interval option :P

13 years agoclean up options implementation for carousel
Jacob Thornton [Tue, 3 Jan 2012 06:55:51 +0000 (22:55 -0800)] 
clean up options implementation for carousel

13 years agoease-in-out slide transition
Jacob Thornton [Tue, 3 Jan 2012 06:33:49 +0000 (22:33 -0800)] 
ease-in-out slide transition

13 years agobasic carousel implementation
Jacob Thornton [Tue, 3 Jan 2012 06:30:57 +0000 (22:30 -0800)] 
basic carousel implementation

13 years agoplaceholder design for carousel
Jacob Thornton [Tue, 3 Jan 2012 03:13:02 +0000 (19:13 -0800)] 
placeholder design for carousel

13 years agoadd quotes to courier new
Jacob Thornton [Tue, 3 Jan 2012 00:05:14 +0000 (16:05 -0800)] 
add quotes to courier new

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

Conflicts:
bootstrap.css

13 years agostart playing with carousel stuff
Jacob Thornton [Tue, 3 Jan 2012 00:04:01 +0000 (16:04 -0800)] 
start playing with carousel stuff

13 years agomissing parantheses
Mark Otto [Sat, 31 Dec 2011 00:01:29 +0000 (16:01 -0800)] 
missing parantheses

13 years agoborder radius on large button toolbar
Mark Otto [Tue, 27 Dec 2011 23:39:34 +0000 (17:39 -0600)] 
border radius on large button toolbar

13 years agoadd appended input example to docs, fix help-text wrapping issue by clearing float
Mark Otto [Tue, 27 Dec 2011 23:04:55 +0000 (17:04 -0600)] 
add appended input example to docs, fix help-text wrapping issue by clearing float

13 years agofix quotes in font-family usage
Mark Otto [Tue, 27 Dec 2011 22:50:27 +0000 (16:50 -0600)] 
fix quotes in font-family usage

13 years agofix tables for rowspan
Mark Otto [Tue, 27 Dec 2011 22:25:22 +0000 (16:25 -0600)] 
fix tables for rowspan

13 years agoallow select with size attr to not have fixed height
Mark Otto [Tue, 27 Dec 2011 22:08:07 +0000 (16:08 -0600)] 
allow select with size attr to not have fixed height

13 years agoadd ie7 inline block mixin and add ability to center pagination
Mark Otto [Tue, 27 Dec 2011 21:51:36 +0000 (15:51 -0600)] 
add ie7 inline block mixin and add ability to center pagination

13 years agoclean up some css for github issues: input prepend z-index, modals revamped for respo...
Mark Otto [Tue, 27 Dec 2011 21:40:58 +0000 (15:40 -0600)] 
clean up some css for github issues: input prepend z-index, modals revamped for responsive

13 years agocapitalize Less in makefile, add print less file (not yet compiled)
Mark Otto [Tue, 27 Dec 2011 19:51:50 +0000 (13:51 -0600)] 
capitalize Less in makefile, add print less file (not yet compiled)

13 years agoremove button from topbar for testing
Mark Otto [Tue, 27 Dec 2011 18:40:30 +0000 (12:40 -0600)] 
remove button from topbar for testing

13 years agoremove negative margin from .brand in docs, update navbar to support buttons up thurr
Mark Otto [Tue, 27 Dec 2011 18:39:39 +0000 (12:39 -0600)] 
remove negative margin from .brand in docs, update navbar to support buttons up thurr

13 years agoclean up some comments and fix a bug with buttons in navbar by removing too generic...
Mark Otto [Mon, 26 Dec 2011 23:25:25 +0000 (17:25 -0600)] 
clean up some comments and fix a bug with buttons in navbar by removing too generic of a link color

13 years agoMerge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Mark Otto [Mon, 26 Dec 2011 22:47:10 +0000 (16:47 -0600)] 
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip

Conflicts:
bootstrap.css

13 years agoclean up dead elements in firefox (which is droping transitionEnd events :(
Jacob Thornton [Sun, 25 Dec 2011 07:06:16 +0000 (23:06 -0800)] 
clean up dead elements in firefox (which is droping transitionEnd events :(

13 years agoMerge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
Jacob Thornton [Sun, 25 Dec 2011 06:56:40 +0000 (22:56 -0800)] 
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip

13 years agomove position of twipsy into getPosition so it can easily be extended for svg use
Jacob Thornton [Sun, 25 Dec 2011 06:56:01 +0000 (22:56 -0800)] 
move position of twipsy into getPosition so it can easily be extended for svg use

13 years agofix for linux
Jacob Thornton [Sun, 25 Dec 2011 06:31:39 +0000 (22:31 -0800)] 
fix for linux

13 years agoMerge pull request #842 from jonathaningram/patch-2
Jacob Thornton [Sun, 25 Dec 2011 06:16:48 +0000 (22:16 -0800)] 
Merge pull request #842 from jonathaningram/patch-2

Add close and closed hooks for alert

13 years agoMerge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
Jacob Thornton [Sun, 25 Dec 2011 06:15:29 +0000 (22:15 -0800)] 
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip

13 years agoupdate docs for placement
Jacob Thornton [Sun, 25 Dec 2011 06:15:04 +0000 (22:15 -0800)] 
update docs for placement

13 years agoMerge pull request #846 from purwandi/2.0-wip
Jacob Thornton [Fri, 23 Dec 2011 16:20:47 +0000 (08:20 -0800)] 
Merge pull request #846 from purwandi/2.0-wip

Fix id tabs on docs component

13 years agoFix id tabs on docs component 846/head
Purwandi [Fri, 23 Dec 2011 14:39:29 +0000 (21:39 +0700)] 
Fix id tabs on docs component

13 years agofix unit test for twipsy
Jacob Thornton [Fri, 23 Dec 2011 03:28:58 +0000 (19:28 -0800)] 
fix unit test for twipsy

13 years agomore js cleanup after gnarly merge
Jacob Thornton [Fri, 23 Dec 2011 03:25:29 +0000 (19:25 -0800)] 
more js cleanup after gnarly merge

13 years agocheck for prettyprint on window
Jacob Thornton [Fri, 23 Dec 2011 03:17:41 +0000 (19:17 -0800)] 
check for prettyprint on window

13 years agoMerge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
Jacob Thornton [Fri, 23 Dec 2011 03:15:09 +0000 (19:15 -0800)] 
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip

Conflicts:
bootstrap.css
docs/assets/js/application.js
docs/base-css.html
docs/components.html
docs/index.html
docs/javascript.html
docs/less.html
docs/scaffolding.html
docs/upgrading.html

13 years agochange above below to top bottom and add "inside" placement option
Jacob Thornton [Fri, 23 Dec 2011 03:10:32 +0000 (19:10 -0800)] 
change above below to top bottom and add "inside" placement option

13 years agoUpdate docs to show available events on alert 842/head
Jonathan Ingram [Thu, 22 Dec 2011 05:47:42 +0000 (16:47 +1100)] 
Update docs to show available events on alert

13 years agoFrom #822
Jonathan Ingram [Thu, 22 Dec 2011 05:41:26 +0000 (16:41 +1100)] 
From #822

13 years agoclean up all the js across all the doc pages
Jacob Thornton [Thu, 22 Dec 2011 02:42:43 +0000 (18:42 -0800)] 
clean up all the js across all the doc pages

13 years agominor cleanups
Jacob Thornton [Thu, 22 Dec 2011 01:38:05 +0000 (17:38 -0800)] 
minor cleanups

13 years agoremove inline input field CSS since that's not required as all inputs are inline...
Mark Otto [Thu, 22 Dec 2011 01:32:14 +0000 (19:32 -0600)] 
remove inline input field CSS since that's not required as all inputs are inline-block anyway

13 years agoupdate comment on select bg bug and confirmed it was fixed, scoped responsive .span...
Mark Otto [Thu, 22 Dec 2011 01:31:01 +0000 (19:31 -0600)] 
update comment on select bg bug and confirmed it was fixed, scoped responsive .span* to .row

13 years agoMerge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Mark Otto [Thu, 22 Dec 2011 00:39:02 +0000 (18:39 -0600)] 
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip

Conflicts:
bootstrap.css
docs/javascript.html

13 years agofix dropdowns in components docs page
Mark Otto [Thu, 22 Dec 2011 00:38:03 +0000 (18:38 -0600)] 
fix dropdowns in components docs page

13 years agoupdate thumbnails to keep images from going past edges of thumbnails
Mark Otto [Thu, 22 Dec 2011 00:21:55 +0000 (18:21 -0600)] 
update thumbnails to keep images from going past edges of thumbnails

13 years agofix mobile example sites, remove unused JS from docs index
Mark Otto [Wed, 21 Dec 2011 22:41:46 +0000 (16:41 -0600)] 
fix mobile example sites, remove unused JS from docs index

13 years agorename media grid to thumbnails, recompile bootstrap, fix examples for mobile phones
Mark Otto [Wed, 21 Dec 2011 22:26:21 +0000 (16:26 -0600)] 
rename media grid to thumbnails, recompile bootstrap, fix examples for mobile phones

13 years agoupdated all docs to jQuery 1.7, move all docs JS to application.js, and move dropdown...
Mark Otto [Wed, 21 Dec 2011 22:22:20 +0000 (16:22 -0600)] 
updated all docs to jQuery 1.7, move all docs JS to application.js, and move dropdowns css to dedicated file

13 years agoMerge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
Jacob Thornton [Wed, 21 Dec 2011 22:03:18 +0000 (14:03 -0800)] 
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip

Conflicts:
bootstrap.css

13 years agodocs updates, forms updated to include error states and more examples, remove text...
Mark Otto [Wed, 21 Dec 2011 22:00:50 +0000 (16:00 -0600)] 
docs updates, forms updated to include error states and more examples, remove text-shadow from gradientbar mixin to fix bug

13 years agoanimate -> animation
Jacob Thornton [Wed, 21 Dec 2011 21:29:12 +0000 (13:29 -0800)] 
animate -> animation

13 years agoupdate more readme changes - introduce target specificty convention to more plugins
Jacob Thornton [Wed, 21 Dec 2011 07:28:48 +0000 (23:28 -0800)] 
update more readme changes - introduce target specificty convention to more plugins

13 years agoadd default margin for popover and twipsy
Jacob Thornton [Wed, 21 Dec 2011 06:12:23 +0000 (22:12 -0800)] 
add default margin for popover and twipsy

13 years agoupdate all to new on api + add animation support to tabs
Jacob Thornton [Wed, 21 Dec 2011 03:37:41 +0000 (19:37 -0800)] 
update all to new on api + add animation support to tabs

13 years agogiant refactor - all spec passing again...
Jacob Thornton [Wed, 21 Dec 2011 02:02:47 +0000 (18:02 -0800)] 
giant refactor - all spec passing again...

13 years agoMerge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Mark Otto [Tue, 20 Dec 2011 06:59:20 +0000 (22:59 -0800)] 
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip

13 years agomostly docs updates, but also some bug fixes per github issues
Mark Otto [Tue, 20 Dec 2011 06:58:56 +0000 (22:58 -0800)] 
mostly docs updates, but also some bug fixes per github issues

13 years agorename transitions to transition and fix scrollspy example
Jacob Thornton [Thu, 15 Dec 2011 02:45:33 +0000 (18:45 -0800)] 
rename transitions to transition and fix scrollspy example

13 years agorename transitions js file, fix link in js docs
Mark Otto [Tue, 13 Dec 2011 18:05:19 +0000 (10:05 -0800)] 
rename transitions js file, fix link in js docs

13 years agoupdated docs to include other less apps
Mark Otto [Mon, 12 Dec 2011 17:51:41 +0000 (09:51 -0800)] 
updated docs to include other less apps

13 years agoupdated buttons docs
Mark Otto [Sun, 11 Dec 2011 10:38:58 +0000 (02:38 -0800)] 
updated buttons docs

13 years agoclearer grid vars docs language
Mark Otto [Sun, 11 Dec 2011 10:05:50 +0000 (02:05 -0800)] 
clearer grid vars docs language

13 years agoupdated footers everywhere
Mark Otto [Sun, 11 Dec 2011 10:03:16 +0000 (02:03 -0800)] 
updated footers everywhere

13 years agocenter example sites in docs on mobile
Mark Otto [Sun, 11 Dec 2011 09:58:06 +0000 (01:58 -0800)] 
center example sites in docs on mobile

13 years agofix specificity on pills
Mark Otto [Sun, 11 Dec 2011 09:03:57 +0000 (01:03 -0800)] 
fix specificity on pills

13 years agoMerge branch 'add-vertical-nav-divider' of https://github.com/evnm/bootstrap into...
Mark Otto [Sun, 11 Dec 2011 08:58:10 +0000 (00:58 -0800)] 
Merge branch 'add-vertical-nav-divider' of https://github.com/evnm/bootstrap into evnm-add-vertical-nav-divider

Conflicts:
bootstrap.css

13 years agoMerge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Mark Otto [Sun, 11 Dec 2011 06:30:17 +0000 (22:30 -0800)] 
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip

13 years agounstyle image inputs
Mark Otto [Sun, 11 Dec 2011 06:29:49 +0000 (22:29 -0800)] 
unstyle image inputs

13 years agotweaks and increase specificity of pills and active classes
Mark Otto [Sun, 11 Dec 2011 06:21:08 +0000 (22:21 -0800)] 
tweaks and increase specificity of pills and active classes

13 years agoMerge pull request #777 from ceejayoz/2.0-wip
Mark Otto [Sat, 10 Dec 2011 23:05:09 +0000 (15:05 -0800)] 
Merge pull request #777 from ceejayoz/2.0-wip

Updated bordered-table example to use correct class in docs

13 years agoremove uber large responsive stuff
Mark Otto [Fri, 9 Dec 2011 22:39:23 +0000 (14:39 -0800)] 
remove uber large responsive stuff

13 years agoupdated index page to add featured sites, more docs tweaks
Mark Otto [Fri, 9 Dec 2011 22:34:38 +0000 (14:34 -0800)] 
updated index page to add featured sites, more docs tweaks

13 years agohelp tables not look like shit on mobile maybe? also fix bordered table example
Mark Otto [Fri, 9 Dec 2011 20:51:54 +0000 (12:51 -0800)] 
help tables not look like shit on mobile maybe? also fix bordered table example

13 years agoupdate js in footer, add max-width to img
Mark Otto [Fri, 9 Dec 2011 20:10:01 +0000 (12:10 -0800)] 
update js in footer, add max-width to img

13 years agoadd jank js for prototyping new topbar to all docs pages
Mark Otto [Fri, 9 Dec 2011 19:41:00 +0000 (11:41 -0800)] 
add jank js for prototyping new topbar to all docs pages

13 years agoMerge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Mark Otto [Fri, 9 Dec 2011 19:33:02 +0000 (11:33 -0800)] 
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip

Conflicts:
bootstrap.css

13 years agoupdated to include sub nav and pip nav, new docs updates, topbar nav refinements...
Mark Otto [Fri, 9 Dec 2011 19:32:07 +0000 (11:32 -0800)] 
updated to include sub nav and pip nav, new docs updates, topbar nav refinements for media queried settings

13 years agofix docs for bordered-table 777/head
Chris Sternal-Johnson [Thu, 8 Dec 2011 19:42:42 +0000 (14:42 -0500)] 
fix docs for bordered-table

13 years agoAdd vertical nav divider example in components doc page. 728/head
Evan Meagher [Fri, 2 Dec 2011 19:37:39 +0000 (11:37 -0800)] 
Add vertical nav divider example in components doc page.

13 years agoMerge remote-tracking branch 'upstream/2.0-wip' into add-vertical-nav-divider
Evan Meagher [Fri, 2 Dec 2011 18:47:46 +0000 (10:47 -0800)] 
Merge remote-tracking branch 'upstream/2.0-wip' into add-vertical-nav-divider

13 years agodefine constructor on prototypes
Jacob Thornton [Thu, 1 Dec 2011 06:42:22 +0000 (22:42 -0800)] 
define constructor on prototypes

13 years agoMerge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
Jacob Thornton [Thu, 1 Dec 2011 06:05:49 +0000 (22:05 -0800)] 
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip

Conflicts:
bootstrap.css

13 years agostart of carousel
Jacob Thornton [Thu, 1 Dec 2011 06:05:09 +0000 (22:05 -0800)] 
start of carousel

13 years agoadding temp idea for subnav to docs
Mark Otto [Wed, 30 Nov 2011 09:00:55 +0000 (01:00 -0800)] 
adding temp idea for subnav to docs

13 years agoadding step nav to components
Mark Otto [Wed, 30 Nov 2011 08:39:38 +0000 (00:39 -0800)] 
adding step nav to components

13 years agoupdate all leads on docs pages
Mark Otto [Wed, 30 Nov 2011 07:56:01 +0000 (23:56 -0800)] 
update all leads on docs pages

13 years agoupdates to add warning for bordered tables to docs, fix to spacing on prettyprint...
Mark Otto [Wed, 30 Nov 2011 07:48:27 +0000 (23:48 -0800)] 
updates to add warning for bordered tables to docs, fix to spacing on prettyprint pre blocks

13 years agoadding bordered table to docs and showing it works with colspan
Mark Otto [Wed, 30 Nov 2011 07:16:38 +0000 (23:16 -0800)] 
adding bordered table to docs and showing it works with colspan

13 years agoAdd vertical nav divider.
Evan Meagher [Wed, 30 Nov 2011 07:16:09 +0000 (23:16 -0800)] 
Add vertical nav divider.

13 years agoMerge branch 'form-feedback-fix' of https://github.com/tinyfly/bootstrap into tinyfly...
Mark Otto [Wed, 30 Nov 2011 06:53:12 +0000 (22:53 -0800)] 
Merge branch 'form-feedback-fix' of https://github.com/tinyfly/bootstrap into tinyfly-form-feedback-fix

Conflicts:
bootstrap.css

13 years agoMerge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Mark Otto [Wed, 30 Nov 2011 06:35:58 +0000 (22:35 -0800)] 
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip

Conflicts:
bootstrap.css
bootstrap.min.css

13 years agomisc docs updates, revamped tables CSS save for grid columns and tablesorter options
Mark Otto [Wed, 30 Nov 2011 06:35:03 +0000 (22:35 -0800)] 
misc docs updates, revamped tables CSS save for grid columns and tablesorter options

13 years agoMerge pull request #722 from tinyfly/grid-input-size-fix
Mark Otto [Wed, 30 Nov 2011 03:17:12 +0000 (19:17 -0800)] 
Merge pull request #722 from tinyfly/grid-input-size-fix

Match input grid classes to the new 12-col grid.

13 years agoscope form feedback states to .control-group instead of unused .clearfix 725/head
Jeff Adams [Tue, 29 Nov 2011 20:06:31 +0000 (14:06 -0600)] 
scope form feedback states to .control-group instead of unused .clearfix

13 years agoadd input width calculation fix from #408 to the 2.0 branch 722/head
Jeff Adams [Tue, 29 Nov 2011 17:12:32 +0000 (11:12 -0600)] 
add input width calculation fix from #408 to the 2.0 branch