]>
git.ipfire.org Git - thirdparty/bootstrap.git/log
Giuliano Velli [Fri, 7 Sep 2012 08:13:26 +0000 (10:13 +0200)]
Merge branch 'media-component' of github.com:wpbrains/bootstrap into media-component
Giuliano Velli [Tue, 24 Apr 2012 15:23:14 +0000 (17:23 +0200)]
Modified the file to conform to bootstrap standards and fix an IE7 css selector issue
Signed-off-by: Giuliano Velli <giuliano@giusi.org>
Giuliano Velli [Tue, 24 Apr 2012 15:23:14 +0000 (17:23 +0200)]
Merge branch 'media-component' of github.com:wpbrains/bootstrap into media-component
Conflicts:
docs/components.html
Signed-off-by: Giuliano Velli <wpbrains@giusi.org>
Giuliano Velli [Fri, 20 Apr 2012 15:54:51 +0000 (17:54 +0200)]
Added Medias code and documentation
Fix for Issue #1711
Added media.less and edited bootstrap.less and responsive.less to
manage media components.
Added a section to the documentation (Media, in components.html) outlining how Medias work. Edited bootstrap.css and bootstrap-responsive.css to add the code for the demos
Signed-off-by: Giuliano Velli <wpbrains@giusi.org>
Giuliano Velli [Fri, 20 Apr 2012 15:54:51 +0000 (17:54 +0200)]
Added Medias code and documentation
Added media.less and edited bootstrap.less and responsive.less to manage media components.
Added a section to the documentation (Media, in components.html) outlining how Medias work. Edited bootstrap.css and bootstrap-responsive.css to add the code for the demos
Signed-off-by: Giuliano Velli <wpbrains@giusi.org>
Jacob Thornton [Sun, 15 Apr 2012 23:45:13 +0000 (16:45 -0700)]
add bootstrap + bootstrap.min.js to gh-pages for @remy
Chris Aniszczyk [Sun, 8 Apr 2012 00:17:39 +0000 (17:17 -0700)]
Update the LICENSE to the actual APLv2
Mark Otto [Thu, 22 Mar 2012 07:33:18 +0000 (00:33 -0700)]
Updated readme to include blog mention
Jacob Thornton [Mon, 12 Mar 2012 21:09:38 +0000 (14:09 -0700)]
2.0.2 derp
Jacob Thornton [Mon, 12 Mar 2012 21:03:24 +0000 (14:03 -0700)]
make docs again for 2.0.2
Jacob Thornton [Mon, 12 Mar 2012 21:00:19 +0000 (14:00 -0700)]
2.0.2
Jacob Thornton [Mon, 12 Mar 2012 20:56:50 +0000 (13:56 -0700)]
remove test file
Jacob Thornton [Mon, 12 Mar 2012 20:45:36 +0000 (13:45 -0700)]
remove commented out width
Jacob Thornton [Mon, 12 Mar 2012 20:37:44 +0000 (13:37 -0700)]
remove collapse class on open so that dropdowns are viewable
Jacob Thornton [Mon, 12 Mar 2012 20:31:38 +0000 (13:31 -0700)]
can't have overflo: visible for "in" which is present during entirity of transition.
Mark Otto [Mon, 12 Mar 2012 19:44:47 +0000 (12:44 -0700)]
button group sizes for ie7 fixes
Mark Otto [Mon, 12 Mar 2012 16:57:10 +0000 (09:57 -0700)]
adding border variable for dropdowns, making dropdown carets use dropdown vars
Mark Otto [Mon, 12 Mar 2012 16:38:12 +0000 (09:38 -0700)]
improve button docs
Mark Otto [Mon, 12 Mar 2012 07:21:52 +0000 (00:21 -0700)]
fix apple touch icons in examples
Mark Otto [Mon, 12 Mar 2012 07:15:27 +0000 (00:15 -0700)]
add a super jank fix for horizontal-forms and .input-prepend/append in IE7
Mark Otto [Mon, 12 Mar 2012 06:43:19 +0000 (23:43 -0700)]
enable buttons in input-append and input-prepend
Mark Otto [Mon, 12 Mar 2012 06:34:22 +0000 (23:34 -0700)]
more homepage links cleanup, ditching the middots
Mark Otto [Mon, 12 Mar 2012 06:33:52 +0000 (23:33 -0700)]
more homepage links cleanup
Mark Otto [Mon, 12 Mar 2012 06:33:08 +0000 (23:33 -0700)]
clean up links on docs homepage and add link to direct download with docs
Mark Otto [Mon, 12 Mar 2012 06:21:38 +0000 (23:21 -0700)]
resolve #1972, allowing add-ons at beginning and end of input-prepend/append
Mark Otto [Mon, 12 Mar 2012 06:14:36 +0000 (23:14 -0700)]
fix more spacing issues with input append/prepend
Mark Otto [Mon, 12 Mar 2012 06:12:45 +0000 (23:12 -0700)]
simplify code for input-prepend/append in inline and search forms
Mark Otto [Mon, 12 Mar 2012 05:58:14 +0000 (22:58 -0700)]
remove need for floats and IE hacks for input-prepend and input-append--boom
Mark Otto [Mon, 12 Mar 2012 05:45:10 +0000 (22:45 -0700)]
rewrite the fluid grid mixin to be simpler, per #2370
Mark Otto [Mon, 12 Mar 2012 05:43:35 +0000 (22:43 -0700)]
fix overflow on .collapse.in to enable dropdowns within an open collapse
Mark Otto [Mon, 12 Mar 2012 05:28:37 +0000 (22:28 -0700)]
enable button groups in modal-footer by removing 5px added margin between .btn
Mark Otto [Mon, 12 Mar 2012 05:26:07 +0000 (22:26 -0700)]
merge #2476 to allow for custom popover arrow colors
Mark Otto [Mon, 12 Mar 2012 05:25:34 +0000 (22:25 -0700)]
Merge branch 'luk3thomas-popover_arrow_colors' into 2.0.2-wip
Mark Otto [Mon, 12 Mar 2012 04:44:00 +0000 (21:44 -0700)]
fix vertical align issue with labels in IE9
Mark Otto [Mon, 12 Mar 2012 04:21:51 +0000 (21:21 -0700)]
add block level input mixin for border-box box-sizing
Mark Otto [Mon, 12 Mar 2012 04:12:59 +0000 (21:12 -0700)]
remove text indent on carets (not needed) and add inline replacement mixin
Mark Otto [Mon, 12 Mar 2012 03:38:17 +0000 (20:38 -0700)]
remove the unused text-indent on dropdown carets
Mark Otto [Mon, 12 Mar 2012 03:16:39 +0000 (20:16 -0700)]
fix broken dropdowns in ie7 per #2333
Mark Otto [Mon, 12 Mar 2012 03:03:55 +0000 (20:03 -0700)]
fix lingering tables bug
Mark Otto [Mon, 12 Mar 2012 01:18:18 +0000 (18:18 -0700)]
fix table border bug with double borders on theads and use of colgroup
Mark Otto [Mon, 12 Mar 2012 00:53:17 +0000 (17:53 -0700)]
use variable for navbar text line-height
Mark Otto [Mon, 12 Mar 2012 00:38:23 +0000 (17:38 -0700)]
Merge branch 'zerkms-master' into 2.0.2-wip
Conflicts:
Makefile
Mark Otto [Mon, 12 Mar 2012 00:28:28 +0000 (17:28 -0700)]
updated apple touch icons and moved input responsive fix from <480 to <767
Mark Otto [Sun, 11 Mar 2012 22:15:55 +0000 (15:15 -0700)]
fix overflowing thumbnails in responsive <767px layouts
Mark Otto [Sun, 11 Mar 2012 21:41:52 +0000 (14:41 -0700)]
in responsive layouts <767px, ensure inputs are not larger than 100% with box-sizing and a max-width
Ivan Kurnosov [Sun, 11 Mar 2012 21:24:18 +0000 (10:24 +1300)]
Grammar fix in js/README.md
Mark Otto [Sun, 11 Mar 2012 20:48:47 +0000 (13:48 -0700)]
vertical align middle on images, run make to rebuild
Mark Otto [Sun, 11 Mar 2012 20:48:30 +0000 (13:48 -0700)]
Merge branch 'Gavrisimo-patch-1' into 2.0.2-wip
Mark Otto [Sun, 11 Mar 2012 20:48:04 +0000 (13:48 -0700)]
update grid system mixins in less docs for new grid
Mark Otto [Sun, 11 Mar 2012 08:06:48 +0000 (00:06 -0800)]
tweak button sizes on homepage
Mark Otto [Sun, 11 Mar 2012 02:15:28 +0000 (18:15 -0800)]
ensure right align dropdown example doesn't go all the way off page
Mark Otto [Sun, 11 Mar 2012 02:03:59 +0000 (18:03 -0800)]
fix gradient mixins by escaping them, add notes on progress bars
Mark Otto [Sun, 11 Mar 2012 01:38:09 +0000 (17:38 -0800)]
fix js typo per #2471
Mark Otto [Sun, 11 Mar 2012 00:23:52 +0000 (16:23 -0800)]
Merge pull request #2503 from maxbublik/patch-1
ignore Apple Double files
Mark Otto [Sun, 11 Mar 2012 00:21:34 +0000 (16:21 -0800)]
add vars for navbar search
Mark Otto [Sun, 11 Mar 2012 00:15:54 +0000 (16:15 -0800)]
clean up search form in navbar, add new variable for placeholder text color
Mark Otto [Sun, 11 Mar 2012 00:06:56 +0000 (16:06 -0800)]
fix #2510, docs typo
Mark Otto [Sun, 11 Mar 2012 00:01:06 +0000 (16:01 -0800)]
massive update to customize page to include all the new variables (and ensure they're being used in the .less files)
Mark Otto [Sat, 10 Mar 2012 23:41:41 +0000 (15:41 -0800)]
simplify notes around using button dropdowns
Mark Otto [Sat, 10 Mar 2012 23:37:28 +0000 (15:37 -0800)]
remove unused images, update examples to include soundready
Mark Otto [Sat, 10 Mar 2012 23:15:13 +0000 (15:15 -0800)]
add new example site thumbnail
Mark Otto [Sat, 10 Mar 2012 23:14:54 +0000 (15:14 -0800)]
change title attr to re-include twitter
Mark Otto [Sat, 10 Mar 2012 23:09:35 +0000 (15:09 -0800)]
remove unused example diagrams
Mark Otto [Sat, 10 Mar 2012 22:36:58 +0000 (14:36 -0800)]
make pre font-size a percentage of @baseFontSize
Mark Otto [Sat, 10 Mar 2012 22:20:46 +0000 (14:20 -0800)]
fix typo per #2494
Mark Otto [Sat, 10 Mar 2012 22:12:29 +0000 (14:12 -0800)]
Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip
Conflicts:
docs/assets/bootstrap.zip
Mark Otto [Sat, 10 Mar 2012 21:40:58 +0000 (13:40 -0800)]
add button sizes to docs for button dropdowns, clean up styles for them
Mark Otto [Sat, 10 Mar 2012 21:24:46 +0000 (13:24 -0800)]
make nav padding and negative margins the same
Jacob Thornton [Sat, 10 Mar 2012 21:01:17 +0000 (13:01 -0800)]
stop doing oldschool escape substitution
Jacob Thornton [Sat, 10 Mar 2012 20:45:09 +0000 (12:45 -0800)]
rebuild with latest grid changes - need 1.3 to build!
Jacob Thornton [Sat, 10 Mar 2012 20:42:39 +0000 (12:42 -0800)]
Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip
Conflicts:
docs/assets/bootstrap.zip
docs/assets/css/bootstrap-responsive.css
docs/assets/css/bootstrap.css
Jacob Thornton [Sat, 10 Mar 2012 20:41:41 +0000 (12:41 -0800)]
Merge branch 'new_grid' into 2.0.2-wip
Conflicts:
docs/assets/bootstrap.zip
docs/assets/css/bootstrap-responsive.css
docs/assets/css/bootstrap.css
less/mixins.less
Maxim Pshenichnikov [Sat, 10 Mar 2012 20:11:03 +0000 (00:11 +0400)]
ignore Apple Double files
Mark Otto [Sat, 10 Mar 2012 19:37:34 +0000 (11:37 -0800)]
simplify buttons docs section by changing a buttons to button elements
Mark Otto [Sat, 10 Mar 2012 19:29:57 +0000 (11:29 -0800)]
rebold headings
Mark Otto [Sat, 10 Mar 2012 19:27:07 +0000 (11:27 -0800)]
fix the font-family var by using inherit instead of empty string, fix font-weight in docs for jumbotron
Mark Otto [Sat, 10 Mar 2012 19:23:47 +0000 (11:23 -0800)]
Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip
Conflicts:
docs/assets/bootstrap.zip
Mark Otto [Sat, 10 Mar 2012 19:23:05 +0000 (11:23 -0800)]
clear up nav variables
Jacob Thornton [Fri, 9 Mar 2012 19:12:45 +0000 (11:12 -0800)]
Merge pull request #2480 from jonathanmaron/master
fat
Milos Gavrilovic [Fri, 9 Mar 2012 13:52:50 +0000 (14:52 +0100)]
Add `vertical-align: middle;` to `img` elements
More info: h5bp.com/i/440
Jonathan Maron [Fri, 9 Mar 2012 06:38:14 +0000 (07:38 +0100)]
Fixed double copy action in Makefile.
Luke Thomas [Fri, 9 Mar 2012 01:02:29 +0000 (19:02 -0600)]
added ability to set custom colors for popover arrow mixin
Jacob Thornton [Thu, 8 Mar 2012 19:42:12 +0000 (11:42 -0800)]
remove non existent dist dir from phony makefil
Jacob Thornton [Thu, 8 Mar 2012 19:39:50 +0000 (11:39 -0800)]
rebuild
Jacob Thornton [Thu, 8 Mar 2012 19:39:33 +0000 (11:39 -0800)]
Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip
Jacob Thornton [Thu, 8 Mar 2012 19:39:00 +0000 (11:39 -0800)]
add version to min js
Jacob Thornton [Thu, 8 Mar 2012 19:14:56 +0000 (11:14 -0800)]
Merge pull request #2177 from phopkins/typeahead_friendly
[2.0.2-wip] Typeahead friendly
Jacob Thornton [Thu, 8 Mar 2012 19:09:33 +0000 (11:09 -0800)]
give pages custom titles based on names
Mark Otto [Wed, 7 Mar 2012 19:02:15 +0000 (11:02 -0800)]
Merge pull request #2449 from burningTyger/master
Examples typo
burningTyger [Wed, 7 Mar 2012 14:38:12 +0000 (15:38 +0100)]
fix for typo
Mark Otto [Wed, 7 Mar 2012 05:44:34 +0000 (21:44 -0800)]
Merge pull request #2443 from tarsis/master
uglify-js install information in compiling section at less.html. Improve issue #1756 in 2.0.2 wip
Mark Otto [Wed, 7 Mar 2012 05:16:57 +0000 (21:16 -0800)]
Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip
Mark Otto [Wed, 7 Mar 2012 05:16:40 +0000 (21:16 -0800)]
Merge pull request #2436 from gruvii/2.0.2-wip
Add new headings vars to type.less
Mark Otto [Wed, 7 Mar 2012 05:13:29 +0000 (21:13 -0800)]
set font-family for inputs and such via basefontfamily
Mark Otto [Wed, 7 Mar 2012 05:12:43 +0000 (21:12 -0800)]
adding well sizes
Mark Figueredo [Tue, 6 Mar 2012 21:45:43 +0000 (16:45 -0500)]
Added use of new headings variables.
Mark Otto [Tue, 6 Mar 2012 07:50:03 +0000 (23:50 -0800)]
move padding from container to body for max-width: 767; responsive layout
Mark Otto [Tue, 6 Mar 2012 07:07:54 +0000 (23:07 -0800)]
Merge branch 'davewasmer-master' into 2.0.2-wip
Mark Otto [Tue, 6 Mar 2012 07:06:27 +0000 (23:06 -0800)]
fix input grid sizing, fix background color on form actions and append add-ons
Mark Otto [Tue, 6 Mar 2012 07:00:37 +0000 (23:00 -0800)]
clearing up progress bar docs and resetting the striped one to match default bar (blue instead of green)