]>
git.ipfire.org Git - thirdparty/bootstrap.git/log
Mark Otto [Thu, 18 Jul 2013 21:43:38 +0000 (14:43 -0700)]
Merge pull request #8517 from cvrebert/gloss-unicode
add comments to gloss Unicode codepoint hex
Mark Otto [Thu, 18 Jul 2013 20:05:53 +0000 (13:05 -0700)]
clarify IE support and rearrange getting started docs a bit
Chris Rebert [Thu, 18 Jul 2013 18:49:39 +0000 (11:49 -0700)]
add comments to gloss Unicode codepoint hex
Mark Otto [Thu, 18 Jul 2013 09:23:38 +0000 (02:23 -0700)]
fixes #8206: Use navbar height var to compute vertical padding on navbar-brand
Mark Otto [Thu, 18 Jul 2013 09:19:13 +0000 (02:19 -0700)]
for some reason iOS is shitting the bed on the .navbar-toggle unless it gets fixed dimensions
Mark Otto [Thu, 18 Jul 2013 09:05:41 +0000 (02:05 -0700)]
Quick pass at new touch and favicons
Mark Otto [Thu, 18 Jul 2013 08:46:31 +0000 (01:46 -0700)]
twerk comment
Mark Otto [Thu, 18 Jul 2013 08:25:28 +0000 (01:25 -0700)]
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Mark Otto [Thu, 18 Jul 2013 08:25:08 +0000 (01:25 -0700)]
Fixes #8374: ensure navbar is always at least 50px
fat [Thu, 18 Jul 2013 08:08:19 +0000 (01:08 -0700)]
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Conflicts:
docs/assets/js/bootstrap.min.js
fat [Thu, 18 Jul 2013 08:07:11 +0000 (01:07 -0700)]
cleaner way of preventing double click events + clean up tests for jshint
Mark Otto [Thu, 18 Jul 2013 08:04:54 +0000 (01:04 -0700)]
Fixes #8397: better navbar padding with grid gutter stuff
fat [Thu, 18 Jul 2013 07:59:31 +0000 (00:59 -0700)]
get button js working with actual form elements p cooll
Mark Otto [Thu, 18 Jul 2013 07:56:36 +0000 (00:56 -0700)]
spacing and local var rename
Mark Otto [Thu, 18 Jul 2013 07:55:36 +0000 (00:55 -0700)]
Merge branch 'patch-1' of https://github.com/bassjobsen/bootstrap into bassjobsen-patch-1
Mark Otto [Thu, 18 Jul 2013 07:50:57 +0000 (00:50 -0700)]
run make on mixin changes from #8380
Mark Otto [Thu, 18 Jul 2013 07:50:15 +0000 (00:50 -0700)]
Merge pull request #8380 from joeybaker/patch-1
Remove unneeded prefixes from some mixins
Mark Otto [Thu, 18 Jul 2013 07:48:02 +0000 (00:48 -0700)]
change characters
Mark Otto [Thu, 18 Jul 2013 07:43:48 +0000 (00:43 -0700)]
Merge branch '3.0.0-wip' of https://github.com/mauricew/bootstrap into mauricew-3.0.0-wip
Mark Otto [Thu, 18 Jul 2013 07:23:35 +0000 (00:23 -0700)]
Vurrriables and shit
Mark Otto [Thu, 18 Jul 2013 07:10:22 +0000 (00:10 -0700)]
Fixes #8452: adds `.active` to table classes
Mark Otto [Thu, 18 Jul 2013 06:56:38 +0000 (23:56 -0700)]
make on collapse changes
Mark Otto [Thu, 18 Jul 2013 06:56:27 +0000 (23:56 -0700)]
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Mark Otto [Thu, 18 Jul 2013 06:56:20 +0000 (23:56 -0700)]
Fixes #8441: remove `@font-size-mini`
Mark Otto [Thu, 18 Jul 2013 06:55:58 +0000 (23:55 -0700)]
Bump tooltips to use `@font-size-small` (11px to 12px)
Mark Otto [Thu, 18 Jul 2013 06:54:09 +0000 (23:54 -0700)]
Drop `.nav-header` for `.dropdown-header`
* Since we no longer have `.nav-list`, I've nuked the `.nav-header`
* However, dropdowns can still have section headings, so I've kept that
around with the addition of `.dropdown-header`
* Restyled it a smidge as well
fat [Thu, 18 Jul 2013 06:52:55 +0000 (23:52 -0700)]
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
fat [Thu, 18 Jul 2013 06:52:29 +0000 (23:52 -0700)]
fixes #7880
Mark Otto [Thu, 18 Jul 2013 06:41:05 +0000 (23:41 -0700)]
fixes #8477: use var for rounded image border-radius
Mark Otto [Thu, 18 Jul 2013 06:34:31 +0000 (23:34 -0700)]
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Conflicts:
docs/assets/js/bootstrap.min.js
Mark Otto [Thu, 18 Jul 2013 06:34:04 +0000 (23:34 -0700)]
fixes #8491: add vars for table padding
Mark Otto [Thu, 18 Jul 2013 06:33:34 +0000 (23:33 -0700)]
make on prev js changes
fat [Thu, 18 Jul 2013 06:30:05 +0000 (23:30 -0700)]
fixes #7777
fat [Thu, 18 Jul 2013 06:25:26 +0000 (23:25 -0700)]
fixes #7776
fat [Thu, 18 Jul 2013 06:15:50 +0000 (23:15 -0700)]
fixes #7755
fat [Thu, 18 Jul 2013 06:02:15 +0000 (23:02 -0700)]
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
fat [Thu, 18 Jul 2013 06:01:33 +0000 (23:01 -0700)]
fix #7660
Mark Otto [Thu, 18 Jul 2013 05:17:30 +0000 (22:17 -0700)]
Merge pull request #8511 from twitter/bs3_remove_examples
BS3: Move examples to @twbs/bootstrap-examples
fat [Thu, 18 Jul 2013 04:38:52 +0000 (21:38 -0700)]
versioning perhaps for jquery i don't even know man
fat [Thu, 18 Jul 2013 04:35:28 +0000 (21:35 -0700)]
rebuild js + fixes #7583
fat [Thu, 18 Jul 2013 04:30:38 +0000 (21:30 -0700)]
make sure triggering element is visible before focusing #7521
fat [Thu, 18 Jul 2013 04:17:39 +0000 (21:17 -0700)]
fix @muan's unit test ;)
fat [Thu, 18 Jul 2013 04:14:02 +0000 (21:14 -0700)]
Merge branch '3.0.0-wip' of git://github.com/muan/bootstrap into muan-3.0.0-wip
Conflicts:
docs/assets/js/bootstrap.min.js
fat [Thu, 18 Jul 2013 04:10:33 +0000 (21:10 -0700)]
remove duh ugly
fat [Thu, 18 Jul 2013 04:08:50 +0000 (21:08 -0700)]
fix #7000
Mark Otto [Thu, 18 Jul 2013 04:04:27 +0000 (21:04 -0700)]
fix link to grid example
Mark Otto [Thu, 18 Jul 2013 04:02:50 +0000 (21:02 -0700)]
remove colophon include because there's only one layout using it now
Mark Otto [Thu, 18 Jul 2013 03:44:55 +0000 (20:44 -0700)]
link order
Mark Otto [Thu, 18 Jul 2013 03:44:27 +0000 (20:44 -0700)]
Merge branch '3.0.0-wip' into bs3_remove_examples
Conflicts:
docs/_includes/nav-getting-started.html
docs/examples/navbar-fixed-top.html
docs/examples/navbar-static-top.html
docs/examples/navbar.html
docs/getting-started.html
fat [Thu, 18 Jul 2013 03:30:09 +0000 (20:30 -0700)]
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
fat [Thu, 18 Jul 2013 03:29:41 +0000 (20:29 -0700)]
fixes #6691
Mark Otto [Thu, 18 Jul 2013 03:18:03 +0000 (20:18 -0700)]
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Mark Otto [Thu, 18 Jul 2013 03:17:56 +0000 (20:17 -0700)]
fix broken docs callouts
fat [Thu, 18 Jul 2013 02:33:49 +0000 (19:33 -0700)]
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Mark Otto [Thu, 18 Jul 2013 02:33:30 +0000 (19:33 -0700)]
Merge branch '3.0.0-docs-calloutfam' of https://github.com/juthilo/bootstrap-wip into juthilo-3.0.0-docs-calloutfam
Conflicts:
docs/components.html
docs/css.html
docs/customize.html
fat [Thu, 18 Jul 2013 02:33:21 +0000 (19:33 -0700)]
rebuild doe
fat [Thu, 18 Jul 2013 02:28:43 +0000 (19:28 -0700)]
maybe fix this old ass issue #5973
Mark Otto [Thu, 18 Jul 2013 02:26:37 +0000 (19:26 -0700)]
Fixes #8360: Add mention of IE compatibility mode to docs
Mark Otto [Thu, 18 Jul 2013 02:20:08 +0000 (19:20 -0700)]
Move license FAQs to the docs, add link to side nav
Mark Otto [Thu, 18 Jul 2013 02:08:08 +0000 (19:08 -0700)]
Fixes #8356: Move browser compatibility from wiki into real docs
Mark Otto [Thu, 18 Jul 2013 00:21:11 +0000 (17:21 -0700)]
Update readme to point previous releases to GitHub project releases (fixes #8508)
Mark Otto [Thu, 18 Jul 2013 00:20:47 +0000 (17:20 -0700)]
Remove changelog in favor of GitHub releases
Mark Otto [Tue, 16 Jul 2013 20:36:02 +0000 (13:36 -0700)]
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Mark Otto [Tue, 16 Jul 2013 18:49:04 +0000 (11:49 -0700)]
remove margin from left side of navs since it's no longer being set
Mark Otto [Tue, 16 Jul 2013 18:27:33 +0000 (11:27 -0700)]
Merge pull request #8498 from cvrebert/patch-1
Add missing backtick in comment
Mark Otto [Tue, 16 Jul 2013 18:26:48 +0000 (11:26 -0700)]
remove webkit-overflow-scrolling from modal for now /cc #8495
Chris Rebert [Tue, 16 Jul 2013 17:49:59 +0000 (10:49 -0700)]
Add missing backtick in comment
Mark Otto [Mon, 15 Jul 2013 19:00:10 +0000 (12:00 -0700)]
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Mark Otto [Mon, 15 Jul 2013 19:00:01 +0000 (12:00 -0700)]
fix broken scrollspy example
Mark Otto [Sun, 14 Jul 2013 23:56:56 +0000 (16:56 -0700)]
Merge pull request #8478 from juthilo/3.0.0-customizer
Update customizer
Julian Thilo [Sun, 14 Jul 2013 10:50:14 +0000 (12:50 +0200)]
Update customizer
Add all the new things to customizer:
* `@headings-font-family`
* `@container-*`
* darker `@btn-default-bg`
Mark Otto [Thu, 11 Jul 2013 21:17:11 +0000 (14:17 -0700)]
Merge pull request #8453 from cvrebert/retina-rename
rename .retina-image => .img-retina
Mark Otto [Thu, 11 Jul 2013 21:16:58 +0000 (14:16 -0700)]
Merge pull request #8454 from bassjobsen/patch-2
Update forms.less
Mark Otto [Thu, 11 Jul 2013 21:16:29 +0000 (14:16 -0700)]
Merge pull request #8455 from cvrebert/control-group-dead
rm .control-group from docs since it's no longer in the LESS
Chris Rebert [Thu, 11 Jul 2013 19:57:44 +0000 (12:57 -0700)]
rm .control-group from docs since it's no longer in the LESS
Bass Jobsen [Thu, 11 Jul 2013 19:24:06 +0000 (21:24 +0200)]
Update forms.less
All variables should be set in variables.less?
Chris Rebert [Thu, 11 Jul 2013 19:07:35 +0000 (12:07 -0700)]
rename .retina-image => .img-retina
Mark Otto [Tue, 9 Jul 2013 19:43:15 +0000 (12:43 -0700)]
Merge pull request #8426 from liuyl/simplify-type
simplify type.less
Mark Otto [Tue, 9 Jul 2013 19:41:07 +0000 (12:41 -0700)]
Merge pull request #8430 from juthilo/3.0.0-docs-fixes
Dustin the docs again
Julian Thilo [Tue, 9 Jul 2013 13:32:28 +0000 (15:32 +0200)]
Dustin the docs again
* Fix alllll the links!
* Change all `*.js` in JS plugin docs (no mo `bootstrap-`)
* Fully remove `tr.info`
* Bring nav includes up to date
liuyl [Tue, 9 Jul 2013 01:22:36 +0000 (09:22 +0800)]
simplify type.less
Mark Otto [Mon, 8 Jul 2013 13:57:37 +0000 (06:57 -0700)]
Merge pull request #8415 from cvrebert/code.less-cleanup
code.less: cleanup styles that get immediately overriden later in the file
Mark Otto [Mon, 8 Jul 2013 13:56:57 +0000 (06:56 -0700)]
Merge pull request #8414 from cvrebert/dropdowns-LESS-nesting
use LESS nesting more in dropdowns.less
Mark Otto [Mon, 8 Jul 2013 13:56:35 +0000 (06:56 -0700)]
Merge pull request #8413 from cvrebert/misc-less-refactoring
refactor {badges,jumbotron,media,popover,print}.less (mostly nesting)
Mark Otto [Mon, 8 Jul 2013 13:55:50 +0000 (06:55 -0700)]
Merge pull request #8412 from cvrebert/pagination-nesting
use nesting more in pagination.less
Mark Otto [Mon, 8 Jul 2013 13:55:16 +0000 (06:55 -0700)]
Merge pull request #8411 from cvrebert/navbar-LESS-nesting
more nesting in navbar.less
Mark Otto [Mon, 8 Jul 2013 13:54:39 +0000 (06:54 -0700)]
Merge pull request #8410 from cvrebert/buttons-nesting
more nesting in buttons.less
Chris Rebert [Sun, 7 Jul 2013 05:24:03 +0000 (22:24 -0700)]
code.less: cleanup styles that get immediately overriden later in the file
Chris Rebert [Sun, 7 Jul 2013 05:27:56 +0000 (22:27 -0700)]
use LESS nesting more in dropdowns.less
Chris Rebert [Sun, 7 Jul 2013 05:02:58 +0000 (22:02 -0700)]
refactor {badges,jumbotron,media,popover,print}.less (mostly nesting)
Chris Rebert [Sun, 7 Jul 2013 21:52:00 +0000 (14:52 -0700)]
use nesting more in pagination.less
Chris Rebert [Sun, 7 Jul 2013 21:40:18 +0000 (14:40 -0700)]
more nesting in navbar.less
Chris Rebert [Sun, 7 Jul 2013 05:13:37 +0000 (22:13 -0700)]
more nesting in buttons.less
Mark Otto [Mon, 8 Jul 2013 01:27:43 +0000 (18:27 -0700)]
Merge pull request #8408 from cvrebert/progress-bar-variant-mixin
extract .progress-bar-variant mix-in
Mark Otto [Mon, 8 Jul 2013 01:26:54 +0000 (18:26 -0700)]
Merge pull request #8407 from cvrebert/label-variant-mixin
extract .label-variant mix-in
Mark Otto [Mon, 8 Jul 2013 01:26:26 +0000 (18:26 -0700)]
Merge pull request #8406 from cvrebert/navs-nesting
more nesting in navs.less
Mark Otto [Mon, 8 Jul 2013 01:25:48 +0000 (18:25 -0700)]
Merge pull request #8405 from cvrebert/button-groups-nesting
more nesting in button-groups.less
Mark Otto [Mon, 8 Jul 2013 01:25:17 +0000 (18:25 -0700)]
Merge pull request #8404 from cvrebert/alert-variant
extract .alert-variant mix-in
Chris Rebert [Sun, 7 Jul 2013 22:06:16 +0000 (15:06 -0700)]
extract .progress-bar-variant mix-in
Chris Rebert [Sun, 7 Jul 2013 21:26:51 +0000 (14:26 -0700)]
extract .label-variant mix-in