]>
git.ipfire.org Git - thirdparty/bootstrap.git/log
Jacob Thornton [Sat, 10 Sep 2011 23:50:42 +0000 (16:50 -0700)]
tooltip 1 word
Jacob Thornton [Sat, 10 Sep 2011 21:52:45 +0000 (14:52 -0700)]
adds twipsy js to regular index for positioning
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
Jacob Thornton [Sat, 10 Sep 2011 21:04:22 +0000 (14:04 -0700)]
add some more events to alerts and modal and update docs
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
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
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
Jacob Thornton [Sat, 10 Sep 2011 20:17:08 +0000 (13:17 -0700)]
finish up rounding out tests for all js plugins
Mark Otto [Sat, 10 Sep 2011 20:04:17 +0000 (13:04 -0700)]
conflict
Mark Otto [Sat, 10 Sep 2011 20:00:07 +0000 (13:00 -0700)]
trying to solve firefox active outline, make .input less specific
Jacob Thornton [Sat, 10 Sep 2011 19:49:21 +0000 (12:49 -0700)]
more tests, more js goodness
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
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
Mark Otto [Sat, 10 Sep 2011 04:50:41 +0000 (21:50 -0700)]
adding docs for customizing the grid
Mark Otto [Sat, 10 Sep 2011 04:43:19 +0000 (21:43 -0700)]
fix the stacked form legend style
Mark Otto [Sat, 10 Sep 2011 03:47:38 +0000 (20:47 -0700)]
start updating the grid docs for customizing it
Mark Otto [Fri, 9 Sep 2011 23:00:59 +0000 (16:00 -0700)]
add version # to docs
Mark Otto [Fri, 9 Sep 2011 17:04:07 +0000 (10:04 -0700)]
adding nested columns to the grid section
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
Mark Otto [Fri, 9 Sep 2011 07:02:47 +0000 (00:02 -0700)]
bug fixing
Jacob Thornton [Fri, 9 Sep 2011 07:00:03 +0000 (00:00 -0700)]
remove aria-control stuff
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
Mark Otto [Fri, 9 Sep 2011 06:02:13 +0000 (23:02 -0700)]
resolve conflict
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
Jacob Thornton [Fri, 9 Sep 2011 03:21:03 +0000 (20:21 -0700)]
some more js love - update the docs with tabs/pills plugin
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
Jacob Thornton [Fri, 9 Sep 2011 02:13:08 +0000 (19:13 -0700)]
tabssss
Mark Otto [Thu, 8 Sep 2011 17:47:05 +0000 (10:47 -0700)]
tweaks to table styles to make them use @basefont and @baseline
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
Mark Otto [Thu, 8 Sep 2011 16:43:37 +0000 (09:43 -0700)]
what up breadcrumbs, we added you
Mark Otto [Wed, 7 Sep 2011 06:32:20 +0000 (23:32 -0700)]
remove active state from dropdown
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
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
Jacob Thornton [Wed, 7 Sep 2011 06:20:56 +0000 (23:20 -0700)]
move javascript from examples into docs
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
Mark Otto [Sun, 4 Sep 2011 21:02:56 +0000 (14:02 -0700)]
addng docs for the themes stuff and examples
Mark Otto [Sun, 4 Sep 2011 05:53:21 +0000 (22:53 -0700)]
adding temp theme file to help with customization; still needs work
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
Mark Otto [Sat, 3 Sep 2011 06:35:28 +0000 (23:35 -0700)]
updated address examples
Mark Otto [Sat, 3 Sep 2011 06:28:01 +0000 (23:28 -0700)]
adding support for and example ul in block-messages
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
Jacob Thornton [Sat, 3 Sep 2011 06:15:38 +0000 (23:15 -0700)]
adds small js section to docs index
Mark Otto [Sat, 3 Sep 2011 06:09:59 +0000 (23:09 -0700)]
adding link support to regular text in the topbar
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
Mark Otto [Sat, 3 Sep 2011 05:09:49 +0000 (22:09 -0700)]
resolve conflict
Mark Otto [Sat, 3 Sep 2011 05:09:12 +0000 (22:09 -0700)]
fix repeated margin-left
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
Mark Otto [Sat, 3 Sep 2011 04:54:11 +0000 (21:54 -0700)]
tweak readonly, disabled, and uneditable form elements
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
Jacob Thornton [Sat, 3 Sep 2011 04:06:20 +0000 (21:06 -0700)]
more js chagnes
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
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
Jacob Thornton [Fri, 2 Sep 2011 22:07:12 +0000 (15:07 -0700)]
welcome to 1.2.0
Mark Otto [Fri, 2 Sep 2011 19:46:47 +0000 (12:46 -0700)]
fix broken checkbox in ie7
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
Mark Otto [Fri, 2 Sep 2011 19:31:14 +0000 (12:31 -0700)]
fix docs.css spacing, add gradient support for ie9 back
Mark Otto [Fri, 2 Sep 2011 19:24:28 +0000 (12:24 -0700)]
cleanup docs and fix gradient in masthead
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
Mark Otto [Fri, 2 Sep 2011 19:02:36 +0000 (12:02 -0700)]
resolve
Mark Otto [Fri, 2 Sep 2011 19:02:20 +0000 (12:02 -0700)]
button tweaks
Jacob Thornton [Fri, 2 Sep 2011 19:01:41 +0000 (12:01 -0700)]
\9 for 8 or less ie
Mark Otto [Fri, 2 Sep 2011 18:54:17 +0000 (11:54 -0700)]
resolve conflicts
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
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
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
Mark Otto [Fri, 2 Sep 2011 16:52:33 +0000 (09:52 -0700)]
merge in master after merging a pull request, add comment
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
pthrasher [Fri, 2 Sep 2011 16:48:32 +0000 (12:48 -0400)]
ran make build
Mark Otto [Fri, 2 Sep 2011 16:48:31 +0000 (09:48 -0700)]
cleanup and tweaks
pthrasher [Fri, 2 Sep 2011 16:45:03 +0000 (12:45 -0400)]
incorporated idea from @markdotto in #138
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
pthrasher [Fri, 2 Sep 2011 15:19:05 +0000 (11:19 -0400)]
ran make build, issues #136 and #138
pthrasher [Fri, 2 Sep 2011 14:43:26 +0000 (10:43 -0400)]
Fix for issue #136. Now nests fine in both layouts.
Mark Otto [Fri, 2 Sep 2011 08:03:16 +0000 (01:03 -0700)]
add old dropdown support to tabs dropdowns
Mark Otto [Fri, 2 Sep 2011 07:58:07 +0000 (00:58 -0700)]
fix dropdown bug, remove second topbar from docs now
Mark Otto [Fri, 2 Sep 2011 07:56:03 +0000 (00:56 -0700)]
remove active state from buttons by moving the :active before :disabled
Mark Otto [Fri, 2 Sep 2011 07:52:22 +0000 (00:52 -0700)]
resolve conflicts
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
Jacob Thornton [Fri, 2 Sep 2011 07:47:06 +0000 (00:47 -0700)]
add doc styles back to topbar-inner
Jacob Thornton [Fri, 2 Sep 2011 07:42:22 +0000 (00:42 -0700)]
fix for dropdown
Jacob Thornton [Fri, 2 Sep 2011 07:32:57 +0000 (00:32 -0700)]
remake
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
Jacob Thornton [Fri, 2 Sep 2011 07:31:19 +0000 (00:31 -0700)]
div > ul ftw
Mark Otto [Fri, 2 Sep 2011 07:29:54 +0000 (00:29 -0700)]
move comment so less compiles
Mark Otto [Fri, 2 Sep 2011 07:29:27 +0000 (00:29 -0700)]
resolve conflict
Mark Otto [Fri, 2 Sep 2011 07:28:54 +0000 (00:28 -0700)]
add backwards compatability for dropdowns in topbar
Jacob Thornton [Fri, 2 Sep 2011 07:26:58 +0000 (00:26 -0700)]
this works O_O
Jacob Thornton [Fri, 2 Sep 2011 07:21:55 +0000 (00:21 -0700)]
> seems to work O_O
Jacob Thornton [Fri, 2 Sep 2011 07:17:13 +0000 (00:17 -0700)]
backwards compat for old nav o_O
Mark Otto [Fri, 2 Sep 2011 07:02:44 +0000 (00:02 -0700)]
remove inset shadow from disabled buttons
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
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
Mark Otto [Wed, 31 Aug 2011 23:27:28 +0000 (16:27 -0700)]
merging in remote and recompiling
Mark Otto [Wed, 31 Aug 2011 23:26:47 +0000 (16:26 -0700)]
spelling mistakes and undo of one comment
Jacob Thornton [Wed, 31 Aug 2011 17:55:53 +0000 (10:55 -0700)]
try daves background thing again...
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
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
Jacob Thornton [Wed, 31 Aug 2011 06:25:37 +0000 (23:25 -0700)]
revert dhg mdo suggestion for fixing ie
Jacob Thornton [Wed, 31 Aug 2011 06:08:34 +0000 (23:08 -0700)]
ie7 background toggle open
Jacob Thornton [Wed, 31 Aug 2011 06:03:01 +0000 (23:03 -0700)]
remove * hack for ie7 + remove -1 margin bug for ie7