]> git.ipfire.org Git - thirdparty/bootstrap.git/log
thirdparty/bootstrap.git
13 years agotooltip 1 word
Jacob Thornton [Sat, 10 Sep 2011 23:50:42 +0000 (16:50 -0700)] 
tooltip 1 word

13 years agoadds twipsy js to regular index for positioning
Jacob Thornton [Sat, 10 Sep 2011 21:52:45 +0000 (14:52 -0700)] 
adds twipsy js to regular index for positioning

13 years agoMerge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip
Jacob Thornton [Sat, 10 Sep 2011 21:04:51 +0000 (14:04 -0700)] 
Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip

13 years agoadd some more events to alerts and modal and update docs
Jacob Thornton [Sat, 10 Sep 2011 21:04:22 +0000 (14:04 -0700)] 
add some more events to alerts and modal and update docs

13 years agoMerge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip
Mark Otto [Sat, 10 Sep 2011 20:18:24 +0000 (13:18 -0700)] 
Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip

13 years agoadding .brand to topbar for alternative to using an h3 for wordmark; spelling mistake...
Mark Otto [Sat, 10 Sep 2011 20:18:10 +0000 (13:18 -0700)] 
adding .brand to topbar for alternative to using an h3 for wordmark; spelling mistakes fixed

13 years agoMerge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip
Jacob Thornton [Sat, 10 Sep 2011 20:17:43 +0000 (13:17 -0700)] 
Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip

13 years agofinish up rounding out tests for all js plugins
Jacob Thornton [Sat, 10 Sep 2011 20:17:08 +0000 (13:17 -0700)] 
finish up rounding out tests for all js plugins

13 years agoconflict
Mark Otto [Sat, 10 Sep 2011 20:04:17 +0000 (13:04 -0700)] 
conflict

13 years agotrying to solve firefox active outline, make .input less specific
Mark Otto [Sat, 10 Sep 2011 20:00:07 +0000 (13:00 -0700)] 
trying to solve firefox active outline, make .input less specific

13 years agomore tests, more js goodness
Jacob Thornton [Sat, 10 Sep 2011 19:49:21 +0000 (12:49 -0700)] 
more tests, more js goodness

13 years agoMerge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip
Jacob Thornton [Sat, 10 Sep 2011 05:48:57 +0000 (22:48 -0700)] 
Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip

Conflicts:
bootstrap-1.3.0.css

13 years agomove js plugins to root dir, begin writing tests, and change modal plugin to be more...
Jacob Thornton [Sat, 10 Sep 2011 05:47:49 +0000 (22:47 -0700)] 
move js plugins to root dir, begin writing tests, and change modal plugin to be more boss like

13 years agoadding docs for customizing the grid
Mark Otto [Sat, 10 Sep 2011 04:50:41 +0000 (21:50 -0700)] 
adding docs for customizing the grid

13 years agofix the stacked form legend style
Mark Otto [Sat, 10 Sep 2011 04:43:19 +0000 (21:43 -0700)] 
fix the stacked form legend style

13 years agostart updating the grid docs for customizing it
Mark Otto [Sat, 10 Sep 2011 03:47:38 +0000 (20:47 -0700)] 
start updating the grid docs for customizing it

13 years agoadd version # to docs
Mark Otto [Fri, 9 Sep 2011 23:00:59 +0000 (16:00 -0700)] 
add version # to docs

13 years agoadding nested columns to the grid section
Mark Otto [Fri, 9 Sep 2011 17:04:07 +0000 (10:04 -0700)] 
adding nested columns to the grid section

13 years agoMerge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip
Mark Otto [Fri, 9 Sep 2011 07:03:01 +0000 (00:03 -0700)] 
Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip

13 years agobug fixing
Mark Otto [Fri, 9 Sep 2011 07:02:47 +0000 (00:02 -0700)] 
bug fixing

13 years agoremove aria-control stuff
Jacob Thornton [Fri, 9 Sep 2011 07:00:03 +0000 (00:00 -0700)] 
remove aria-control stuff

13 years agomake dropdown menus appear above other elements on the page with a z-index
Mark Otto [Fri, 9 Sep 2011 06:08:38 +0000 (23:08 -0700)] 
make dropdown menus appear above other elements on the page with a z-index

13 years agoresolve conflict
Mark Otto [Fri, 9 Sep 2011 06:02:13 +0000 (23:02 -0700)] 
resolve conflict

13 years agoupdate the modals and alert-messages to use the same .close styles, save for some...
Mark Otto [Fri, 9 Sep 2011 06:01:28 +0000 (23:01 -0700)] 
update the modals and alert-messages to use the same .close styles, save for some positioning in the modal after knocking down the modal padding

13 years agosome more js love - update the docs with tabs/pills plugin
Jacob Thornton [Fri, 9 Sep 2011 03:21:03 +0000 (20:21 -0700)] 
some more js love - update the docs with tabs/pills plugin

13 years agoMerge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip
Jacob Thornton [Fri, 9 Sep 2011 02:13:26 +0000 (19:13 -0700)] 
Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip

13 years agotabssss
Jacob Thornton [Fri, 9 Sep 2011 02:13:08 +0000 (19:13 -0700)] 
tabssss

13 years agotweaks to table styles to make them use @basefont and @baseline
Mark Otto [Thu, 8 Sep 2011 17:47:05 +0000 (10:47 -0700)] 
tweaks to table styles to make them use @basefont and @baseline

13 years agobump css to 1.3.0, update makefile to reflect that, update form css to prepend form...
Mark Otto [Thu, 8 Sep 2011 17:36:56 +0000 (10:36 -0700)] 
bump css to 1.3.0, update makefile to reflect that, update form css to prepend form to the .clearfix to prevent some bullshit, small tweaks elsewhere

13 years agowhat up breadcrumbs, we added you
Mark Otto [Thu, 8 Sep 2011 16:43:37 +0000 (09:43 -0700)] 
what up breadcrumbs, we added you

13 years agoremove active state from dropdown
Mark Otto [Wed, 7 Sep 2011 06:32:20 +0000 (23:32 -0700)] 
remove active state from dropdown

13 years agoMerge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip
Mark Otto [Wed, 7 Sep 2011 06:30:45 +0000 (23:30 -0700)] 
Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip

13 years agoupdate diagrams to use smaller border radius, add new container-app example
Mark Otto [Wed, 7 Sep 2011 06:30:21 +0000 (23:30 -0700)] 
update diagrams to use smaller border radius, add new container-app example

13 years agomove javascript from examples into docs
Jacob Thornton [Wed, 7 Sep 2011 06:20:56 +0000 (23:20 -0700)] 
move javascript from examples into docs

13 years agofirst pass at enabling active states in dropdowns in topbar and fixing the bug of...
Mark Otto [Wed, 7 Sep 2011 04:54:00 +0000 (21:54 -0700)] 
first pass at enabling active states in dropdowns in topbar and fixing the bug of having an active class on parent dropdown

13 years agoaddng docs for the themes stuff and examples
Mark Otto [Sun, 4 Sep 2011 21:02:56 +0000 (14:02 -0700)] 
addng docs for the themes stuff and examples

13 years agoadding temp theme file to help with customization; still needs work
Mark Otto [Sun, 4 Sep 2011 05:53:21 +0000 (22:53 -0700)] 
adding temp theme file to help with customization; still needs work

13 years agoMerge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip
Mark Otto [Sat, 3 Sep 2011 06:35:44 +0000 (23:35 -0700)] 
Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip

13 years agoupdated address examples
Mark Otto [Sat, 3 Sep 2011 06:35:28 +0000 (23:35 -0700)] 
updated address examples

13 years agoadding support for and example ul in block-messages
Mark Otto [Sat, 3 Sep 2011 06:28:01 +0000 (23:28 -0700)] 
adding support for and example ul in block-messages

13 years agoMerge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip
Jacob Thornton [Sat, 3 Sep 2011 06:16:06 +0000 (23:16 -0700)] 
Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip

13 years agoadds small js section to docs index
Jacob Thornton [Sat, 3 Sep 2011 06:15:38 +0000 (23:15 -0700)] 
adds small js section to docs index

13 years agoadding link support to regular text in the topbar
Mark Otto [Sat, 3 Sep 2011 06:09:59 +0000 (23:09 -0700)] 
adding link support to regular text in the topbar

13 years agoupdated hero example, added fluid example, resolved issue with tabs and fluid nav
Mark Otto [Sat, 3 Sep 2011 06:01:38 +0000 (23:01 -0700)] 
updated hero example, added fluid example, resolved issue with tabs and fluid nav

13 years agoresolve conflict
Mark Otto [Sat, 3 Sep 2011 05:09:49 +0000 (22:09 -0700)] 
resolve conflict

13 years agofix repeated margin-left
Mark Otto [Sat, 3 Sep 2011 05:09:12 +0000 (22:09 -0700)] 
fix repeated margin-left

13 years agoupdated container mixin to be fixed-container instead so we can keep the .container...
Mark Otto [Sat, 3 Sep 2011 05:08:38 +0000 (22:08 -0700)] 
updated container mixin to be fixed-container instead so we can keep the .container in scaffolding while removing the repeated code

13 years agotweak readonly, disabled, and uneditable form elements
Mark Otto [Sat, 3 Sep 2011 04:54:11 +0000 (21:54 -0700)] 
tweak readonly, disabled, and uneditable form elements

13 years agoMerge branch 'js-examples' into 1.3-wip
Jacob Thornton [Sat, 3 Sep 2011 04:06:49 +0000 (21:06 -0700)] 
Merge branch 'js-examples' into 1.3-wip

Conflicts:
bootstrap-1.2.0.css

13 years agomore js chagnes
Jacob Thornton [Sat, 3 Sep 2011 04:06:20 +0000 (21:06 -0700)] 
more js chagnes

13 years agoMerge branch 'master' of github.com:twitter/bootstrap into js-examples
Jacob Thornton [Sat, 3 Sep 2011 04:04:25 +0000 (21:04 -0700)] 
Merge branch 'master' of github.com:twitter/bootstrap into js-examples

Conflicts:
bootstrap-1.2.0.css
bootstrap-1.2.0.min.css
lib/patterns.less
lib/scaffolding.less

13 years agoimprove CSS properties for centering content, the container, and fluid container...
Mark Otto [Sat, 3 Sep 2011 04:00:01 +0000 (21:00 -0700)] 
improve CSS properties for centering content, the container, and fluid container so as to not override properties where possible

13 years agowelcome to 1.2.0 v1.2.0
Jacob Thornton [Fri, 2 Sep 2011 22:07:12 +0000 (15:07 -0700)] 
welcome to 1.2.0

13 years agofix broken checkbox in ie7
Mark Otto [Fri, 2 Sep 2011 19:46:47 +0000 (12:46 -0700)] 
fix broken checkbox in ie7

13 years agoremove rounded corners on buttons from IE9 so gradients don't bleed out
Mark Otto [Fri, 2 Sep 2011 19:35:41 +0000 (12:35 -0700)] 
remove rounded corners on buttons from IE9 so gradients don't bleed out

13 years agofix docs.css spacing, add gradient support for ie9 back
Mark Otto [Fri, 2 Sep 2011 19:31:14 +0000 (12:31 -0700)] 
fix docs.css spacing, add gradient support for ie9 back

13 years agocleanup docs and fix gradient in masthead
Mark Otto [Fri, 2 Sep 2011 19:24:28 +0000 (12:24 -0700)] 
cleanup docs and fix gradient in masthead

13 years agoadd reset filter to preboot for turning off gradients in IE when necessary; make...
Mark Otto [Fri, 2 Sep 2011 19:19:43 +0000 (12:19 -0700)] 
add reset filter to preboot for turning off gradients in IE when necessary; make :disabled [disabled] for crossbrowser usage

13 years agoresolve
Mark Otto [Fri, 2 Sep 2011 19:02:36 +0000 (12:02 -0700)] 
resolve

13 years agobutton tweaks
Mark Otto [Fri, 2 Sep 2011 19:02:20 +0000 (12:02 -0700)] 
button tweaks

13 years ago\9 for 8 or less ie
Jacob Thornton [Fri, 2 Sep 2011 19:01:41 +0000 (12:01 -0700)] 
\9 for 8 or less ie

13 years agoresolve conflicts
Mark Otto [Fri, 2 Sep 2011 18:54:17 +0000 (11:54 -0700)] 
resolve conflicts

13 years agoupdate the file input to undo the damage of the generic input selector
Mark Otto [Fri, 2 Sep 2011 18:53:58 +0000 (11:53 -0700)] 
update the file input to undo the damage of the generic input selector

13 years agoMerge branch '1.2-wip' of github.com:twitter/bootstrap into 1.2-wip
Jacob Thornton [Fri, 2 Sep 2011 18:49:41 +0000 (11:49 -0700)] 
Merge branch '1.2-wip' of github.com:twitter/bootstrap into 1.2-wip

Conflicts:
bootstrap-1.2.0.css
bootstrap-1.2.0.min.css

13 years agoMerge branch 'master' of github.com:twitter/bootstrap into 1.2-wip
Jacob Thornton [Fri, 2 Sep 2011 18:49:03 +0000 (11:49 -0700)] 
Merge branch 'master' of github.com:twitter/bootstrap into 1.2-wip

Conflicts:
bootstrap-1.2.0.css

13 years agomerge in master after merging a pull request, add comment
Mark Otto [Fri, 2 Sep 2011 16:52:33 +0000 (09:52 -0700)] 
merge in master after merging a pull request, add comment

13 years agoMerge pull request #138 from pthrasher/master
Mark Otto [Fri, 2 Sep 2011 16:51:32 +0000 (09:51 -0700)] 
Merge pull request #138 from pthrasher/master

Fix for popover issue from #136

13 years agoran make build 138/head
pthrasher [Fri, 2 Sep 2011 16:48:32 +0000 (12:48 -0400)] 
ran make build

13 years agocleanup and tweaks
Mark Otto [Fri, 2 Sep 2011 16:48:31 +0000 (09:48 -0700)] 
cleanup and tweaks

13 years agoincorporated idea from @markdotto in #138
pthrasher [Fri, 2 Sep 2011 16:45:03 +0000 (12:45 -0400)] 
incorporated idea from @markdotto in #138

13 years agoremove fixed width from topbar form to allow for applying classes to resize it
Mark Otto [Fri, 2 Sep 2011 16:35:26 +0000 (09:35 -0700)] 
remove fixed width from topbar form to allow for applying classes to resize it

13 years agoran make build, issues #136 and #138
pthrasher [Fri, 2 Sep 2011 15:19:05 +0000 (11:19 -0400)] 
ran make build, issues #136 and #138

13 years agoFix for issue #136. Now nests fine in both layouts.
pthrasher [Fri, 2 Sep 2011 14:43:26 +0000 (10:43 -0400)] 
Fix for issue #136. Now nests fine in both layouts.

13 years agoadd old dropdown support to tabs dropdowns
Mark Otto [Fri, 2 Sep 2011 08:03:16 +0000 (01:03 -0700)] 
add old dropdown support to tabs dropdowns

13 years agofix dropdown bug, remove second topbar from docs now
Mark Otto [Fri, 2 Sep 2011 07:58:07 +0000 (00:58 -0700)] 
fix dropdown bug, remove second topbar from docs now

13 years agoremove active state from buttons by moving the :active before :disabled
Mark Otto [Fri, 2 Sep 2011 07:56:03 +0000 (00:56 -0700)] 
remove active state from buttons by moving the :active before :disabled

13 years agoresolve conflicts
Mark Otto [Fri, 2 Sep 2011 07:52:22 +0000 (00:52 -0700)] 
resolve conflicts

13 years agoadd temp second topbar to nav section, fix it's compatibility issues
Mark Otto [Fri, 2 Sep 2011 07:50:05 +0000 (00:50 -0700)] 
add temp second topbar to nav section, fix it's compatibility issues

13 years agoadd doc styles back to topbar-inner
Jacob Thornton [Fri, 2 Sep 2011 07:47:06 +0000 (00:47 -0700)] 
add doc styles back to topbar-inner

13 years agofix for dropdown
Jacob Thornton [Fri, 2 Sep 2011 07:42:22 +0000 (00:42 -0700)] 
fix for dropdown

13 years agoremake
Jacob Thornton [Fri, 2 Sep 2011 07:32:57 +0000 (00:32 -0700)] 
remake

13 years agoMerge branch '1.2-wip' of github.com:twitter/bootstrap into 1.2-wip
Jacob Thornton [Fri, 2 Sep 2011 07:32:09 +0000 (00:32 -0700)] 
Merge branch '1.2-wip' of github.com:twitter/bootstrap into 1.2-wip

Conflicts:
bootstrap-1.2.0.css
bootstrap-1.2.0.min.css
lib/patterns.less

13 years agodiv > ul ftw
Jacob Thornton [Fri, 2 Sep 2011 07:31:19 +0000 (00:31 -0700)] 
div > ul ftw

13 years agomove comment so less compiles
Mark Otto [Fri, 2 Sep 2011 07:29:54 +0000 (00:29 -0700)] 
move comment so less compiles

13 years agoresolve conflict
Mark Otto [Fri, 2 Sep 2011 07:29:27 +0000 (00:29 -0700)] 
resolve conflict

13 years agoadd backwards compatability for dropdowns in topbar
Mark Otto [Fri, 2 Sep 2011 07:28:54 +0000 (00:28 -0700)] 
add backwards compatability for dropdowns in topbar

13 years agothis works O_O
Jacob Thornton [Fri, 2 Sep 2011 07:26:58 +0000 (00:26 -0700)] 
this works O_O

13 years ago> seems to work O_O
Jacob Thornton [Fri, 2 Sep 2011 07:21:55 +0000 (00:21 -0700)] 
> seems to work O_O

13 years agobackwards compat for old nav o_O
Jacob Thornton [Fri, 2 Sep 2011 07:17:13 +0000 (00:17 -0700)] 
backwards compat for old nav o_O

13 years agoremove inset shadow from disabled buttons
Mark Otto [Fri, 2 Sep 2011 07:02:44 +0000 (00:02 -0700)] 
remove inset shadow from disabled buttons

13 years agoMerge branch '1.2-wip' of github.com:twitter/bootstrap into 1.2-wip
Jacob Thornton [Fri, 2 Sep 2011 05:54:59 +0000 (22:54 -0700)] 
Merge branch '1.2-wip' of github.com:twitter/bootstrap into 1.2-wip

Conflicts:
bootstrap-1.2.0.css

13 years agofor html5 style all inputs -- then unstyle checkbox, radio, button, reset, submit
Jacob Thornton [Fri, 2 Sep 2011 05:53:24 +0000 (22:53 -0700)] 
for html5 style all inputs -- then unstyle checkbox, radio, button, reset, submit

13 years agomerging in remote and recompiling
Mark Otto [Wed, 31 Aug 2011 23:27:28 +0000 (16:27 -0700)] 
merging in remote and recompiling

13 years agospelling mistakes and undo of one comment
Mark Otto [Wed, 31 Aug 2011 23:26:47 +0000 (16:26 -0700)] 
spelling mistakes and undo of one comment

13 years agotry daves background thing again...
Jacob Thornton [Wed, 31 Aug 2011 17:55:53 +0000 (10:55 -0700)] 
try daves background thing again...

13 years agoMerge branch 'master' of github.com:twitter/bootstrap into 1.2-wip
Jacob Thornton [Wed, 31 Aug 2011 06:37:46 +0000 (23:37 -0700)] 
Merge branch 'master' of github.com:twitter/bootstrap into 1.2-wip

Conflicts:
README.md
bootstrap-1.2.0.css

13 years agorename all 1.1.1 stuff -> 1.2.0 and remove templates dir and fluid.html
Jacob Thornton [Wed, 31 Aug 2011 06:34:19 +0000 (23:34 -0700)] 
rename all 1.1.1 stuff -> 1.2.0 and remove templates dir and fluid.html

13 years agorevert dhg mdo suggestion for fixing ie
Jacob Thornton [Wed, 31 Aug 2011 06:25:37 +0000 (23:25 -0700)] 
revert dhg mdo suggestion for fixing ie

13 years agoie7 background toggle open
Jacob Thornton [Wed, 31 Aug 2011 06:08:34 +0000 (23:08 -0700)] 
ie7 background toggle open

13 years agoremove * hack for ie7 + remove -1 margin bug for ie7
Jacob Thornton [Wed, 31 Aug 2011 06:03:01 +0000 (23:03 -0700)] 
remove * hack for ie7 + remove -1 margin bug for ie7