]>
git.ipfire.org Git - thirdparty/bootstrap.git/log
Bruno Amaral [Sun, 18 Aug 2013 17:47:40 +0000 (18:47 +0100)]
fixes two type-os in glyphicons
Mark Otto [Sun, 18 Aug 2013 17:35:26 +0000 (10:35 -0700)]
Merge pull request #9767 from twbs/bs3_restore_glyphicons
BS3: Restore Glyphicons
Mark Otto [Sun, 18 Aug 2013 17:28:32 +0000 (10:28 -0700)]
Merge branch '3.0.0-wip' into bs3_restore_glyphicons
Conflicts:
dist/css/bootstrap.min.css
Mark Otto [Sun, 18 Aug 2013 17:27:53 +0000 (10:27 -0700)]
Merge pull request #9785 from mikepage/patch-1
Update mixins.less to fix error .button-variant is undefined in Grunt
Mark Otto [Sun, 18 Aug 2013 17:26:50 +0000 (10:26 -0700)]
reformat all the things
Mike Pagé [Sun, 18 Aug 2013 17:23:42 +0000 (19:23 +0200)]
Update mixins.less
Mark Otto [Sun, 18 Aug 2013 17:12:33 +0000 (10:12 -0700)]
Merge branch '3.0.0-wip' of https://github.com/iatek/bootstrap into iatek-3.0.0-wip
Mark Otto [Sun, 18 Aug 2013 17:08:18 +0000 (10:08 -0700)]
combine and simplify caret border widths
Mark Otto [Sun, 18 Aug 2013 17:07:34 +0000 (10:07 -0700)]
Merge branch 'fixcaret' of https://github.com/liuyl/bootstrap into liuyl-fixcaret
Mark Otto [Sun, 18 Aug 2013 17:02:32 +0000 (10:02 -0700)]
remove padding from justified nav masthead and footer
Mark Otto [Sun, 18 Aug 2013 17:00:30 +0000 (10:00 -0700)]
Merge branch 'remove-body-content' of https://github.com/lipis/bootstrap into lipis-remove-body-content
Mark Otto [Sun, 18 Aug 2013 17:00:20 +0000 (10:00 -0700)]
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Mark Otto [Sun, 18 Aug 2013 16:58:21 +0000 (09:58 -0700)]
fixes #9769: use navbar border radius var in theme
Chris Rebert [Sun, 18 Aug 2013 16:01:41 +0000 (09:01 -0700)]
Merge pull request #9782 from minddust/3.0.0-wip
Update progressbar docs
Stephan Groß [Sun, 18 Aug 2013 15:17:07 +0000 (17:17 +0200)]
Update progressbar
there is no gradient in 3.x
liuyl [Sun, 18 Aug 2013 12:13:48 +0000 (20:13 +0800)]
fixed caret
iatek [Sun, 18 Aug 2013 11:20:56 +0000 (07:20 -0400)]
updates to migration
iatek [Sun, 18 Aug 2013 11:19:53 +0000 (07:19 -0400)]
updates to migration
Panayiotis Lipiridis [Sun, 18 Aug 2013 10:25:23 +0000 (12:25 +0200)]
Got rid of body-content from examples
Mark Otto [Sun, 18 Aug 2013 09:11:57 +0000 (02:11 -0700)]
update urls
Mark Otto [Sun, 18 Aug 2013 09:04:39 +0000 (02:04 -0700)]
bad copypasta
Mark Otto [Sun, 18 Aug 2013 09:04:10 +0000 (02:04 -0700)]
Merge branch '3.0.0-wip' into bs3_restore_glyphicons
Mark Otto [Sun, 18 Aug 2013 08:55:47 +0000 (01:55 -0700)]
remove carousel icons include
Mark Otto [Sun, 18 Aug 2013 08:46:26 +0000 (01:46 -0700)]
Upgrade to latest glyphicons
Mark Otto [Sun, 18 Aug 2013 08:32:33 +0000 (01:32 -0700)]
remove old glyphicons mention
Mark Otto [Sun, 18 Aug 2013 08:23:45 +0000 (01:23 -0700)]
docs layout and alignment refinement
Mark Otto [Sun, 18 Aug 2013 07:36:51 +0000 (00:36 -0700)]
Restore glyphicons
fat [Sun, 18 Aug 2013 07:29:15 +0000 (00:29 -0700)]
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
fat [Sun, 18 Aug 2013 07:28:52 +0000 (00:28 -0700)]
bunch of updates to customizer
Mark Otto [Sun, 18 Aug 2013 06:55:05 +0000 (23:55 -0700)]
Merge pull request #9761 from wangsai/fix-eamples-respondjs
add IE's Conditional comments for respondjs and html5shiv
saiwang [Sun, 18 Aug 2013 06:28:52 +0000 (14:28 +0800)]
add IE's Conditional comments for respondjs and html5shiv
Mark Otto [Sun, 18 Aug 2013 05:11:27 +0000 (22:11 -0700)]
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Mark Otto [Sun, 18 Aug 2013 05:11:21 +0000 (22:11 -0700)]
Update docs text a bit
fat [Sun, 18 Aug 2013 04:50:01 +0000 (21:50 -0700)]
add dependency support to customizer
Mark Otto [Sun, 18 Aug 2013 04:18:00 +0000 (21:18 -0700)]
Reorder bootstrap.less to match docs oder
Mark Otto [Sun, 18 Aug 2013 04:17:35 +0000 (21:17 -0700)]
Add data-dependency to less and js files in customizer
Mark Otto [Sun, 18 Aug 2013 04:01:58 +0000 (21:01 -0700)]
sub headings for modals and mobile devices on browser support
Mark Otto [Sun, 18 Aug 2013 04:00:20 +0000 (21:00 -0700)]
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Mark Otto [Sun, 18 Aug 2013 04:00:13 +0000 (21:00 -0700)]
Navbar update
Addresses a few different cases where the navbar has and doesn't have a
container, and accordingly adjusts the padding and margin of key
elements.
Mark Otto [Sun, 18 Aug 2013 03:35:31 +0000 (20:35 -0700)]
Favicon in navbar example
Mark Otto [Sun, 18 Aug 2013 03:33:52 +0000 (20:33 -0700)]
Update jumbotron
* Defaults to no rounded corners and full width in the viewport
* When in a container, the jumbotron has extra padding and will have
rounded corners
* Updates default jumbotron example to show the full width default
display
Fixes #9759.
fat [Sun, 18 Aug 2013 03:29:36 +0000 (20:29 -0700)]
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
fat [Sun, 18 Aug 2013 03:28:58 +0000 (20:28 -0700)]
add small fix for tooltip consistency + fix customizer syntax issue
Mark Otto [Sun, 18 Aug 2013 03:11:18 +0000 (20:11 -0700)]
copy edit
Mark Otto [Sun, 18 Aug 2013 02:17:25 +0000 (19:17 -0700)]
Merge pull request #9756 from twbs/bs3_theme
BS3: Add optional theme (fixes #8706)
Mark Otto [Sun, 18 Aug 2013 02:14:13 +0000 (19:14 -0700)]
generic comment
Mark Otto [Sun, 18 Aug 2013 02:09:33 +0000 (19:09 -0700)]
Merge branch '3.0.0-wip' into bs3_theme
fat [Sun, 18 Aug 2013 02:07:59 +0000 (19:07 -0700)]
use correct arg name
fat [Sun, 18 Aug 2013 02:04:58 +0000 (19:04 -0700)]
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
fat [Sun, 18 Aug 2013 02:04:41 +0000 (19:04 -0700)]
add logging
Mark Otto [Sun, 18 Aug 2013 02:00:35 +0000 (19:00 -0700)]
Merge branch '3.0.0-wip' into bs3_theme
Mark Otto [Sun, 18 Aug 2013 02:00:22 +0000 (19:00 -0700)]
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Mark Otto [Sun, 18 Aug 2013 02:00:05 +0000 (19:00 -0700)]
update examples to use new .btn-lg class
Mark Otto [Sun, 18 Aug 2013 01:59:50 +0000 (18:59 -0700)]
Finish first pass at and docment Bootstrap v2-ish theme
* Adds new "theme" example
* Adds new theme.less file to provide all the overrides and additional
styles for the theme
* theme.less compiles, via Grunt, to two new files to `dist/css`,
bootstrap-theme.css and bootstrap-theme.min.css
fat [Sun, 18 Aug 2013 01:41:51 +0000 (18:41 -0700)]
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
fat [Sun, 18 Aug 2013 01:41:36 +0000 (18:41 -0700)]
move customizer onto gists
Chris Rebert [Sun, 18 Aug 2013 00:44:42 +0000 (17:44 -0700)]
fix typo in JS docs
Chris Rebert [Sun, 18 Aug 2013 00:41:47 +0000 (17:41 -0700)]
improve grammar in "Disabling responsiveness" docs
Chris Rebert [Sun, 18 Aug 2013 00:38:53 +0000 (17:38 -0700)]
comma & <code> in "Modals and mobile devices" docs
Mark Otto [Sun, 18 Aug 2013 00:31:58 +0000 (17:31 -0700)]
Merge branch '3.0.0-wip' into bs3_theme
Conflicts:
dist/css/bootstrap.min.css
Mark Otto [Sun, 18 Aug 2013 00:27:05 +0000 (17:27 -0700)]
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Chris Rebert [Sun, 18 Aug 2013 00:26:54 +0000 (17:26 -0700)]
improve grammar in "Alternate customization methods" docs
Mark Otto [Sun, 18 Aug 2013 00:26:52 +0000 (17:26 -0700)]
Fix navbar brand alignment by removing header padding when above 768px
Mark Otto [Sun, 18 Aug 2013 00:26:36 +0000 (17:26 -0700)]
Add alert for customizer errors
Mark Otto [Sun, 18 Aug 2013 00:26:05 +0000 (17:26 -0700)]
Delete the customizer layout (again?)
fat [Sat, 17 Aug 2013 23:44:54 +0000 (16:44 -0700)]
add the customizer builder to the default grunt task
fat [Sat, 17 Aug 2013 23:19:09 +0000 (16:19 -0700)]
rebuild
fat [Sat, 17 Aug 2013 23:18:26 +0000 (16:18 -0700)]
fixes #9745
fat [Sat, 17 Aug 2013 23:13:48 +0000 (16:13 -0700)]
fixes #9674
fat [Sat, 17 Aug 2013 23:11:41 +0000 (16:11 -0700)]
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
fat [Sat, 17 Aug 2013 23:11:05 +0000 (16:11 -0700)]
fixes #9543
Mark Otto [Sat, 17 Aug 2013 23:10:35 +0000 (16:10 -0700)]
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Mark Otto [Sat, 17 Aug 2013 22:58:04 +0000 (15:58 -0700)]
Update description in composer
fat [Sat, 17 Aug 2013 22:54:42 +0000 (15:54 -0700)]
add some crap
fat [Sat, 17 Aug 2013 22:49:27 +0000 (15:49 -0700)]
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
fat [Sat, 17 Aug 2013 22:48:29 +0000 (15:48 -0700)]
add role=menu to html
Mark Otto [Sat, 17 Aug 2013 22:46:42 +0000 (15:46 -0700)]
Fixes #9752: clear floats in .panel-body
Mark Otto [Sat, 17 Aug 2013 22:43:02 +0000 (15:43 -0700)]
Fixes #9749: provide js bin link in readme for easier bug reports
Mark Otto [Sat, 17 Aug 2013 22:35:15 +0000 (15:35 -0700)]
smaller example screenshots, fixes #9748
Mark Otto [Sat, 17 Aug 2013 22:21:38 +0000 (15:21 -0700)]
More consistent naming with screen size variables using xs, sm, md, and lg
Mark Otto [Sat, 17 Aug 2013 22:08:02 +0000 (15:08 -0700)]
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Mark Otto [Sat, 17 Aug 2013 22:07:53 +0000 (15:07 -0700)]
update non-responsive docs and example to really disable it
fat [Sat, 17 Aug 2013 22:07:26 +0000 (15:07 -0700)]
fixes #9585
fat [Sat, 17 Aug 2013 22:06:29 +0000 (15:06 -0700)]
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
fat [Sat, 17 Aug 2013 22:05:59 +0000 (15:05 -0700)]
fixes #9579
Mark Otto [Sat, 17 Aug 2013 22:02:38 +0000 (15:02 -0700)]
add nonresponsive template to examples
Mark Otto [Sat, 17 Aug 2013 21:49:58 +0000 (14:49 -0700)]
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Mark Otto [Sat, 17 Aug 2013 21:42:55 +0000 (14:42 -0700)]
brand, not title, in navbar examples
fat [Sat, 17 Aug 2013 21:42:44 +0000 (14:42 -0700)]
add doc comment for #9517
Mark Otto [Sat, 17 Aug 2013 21:27:21 +0000 (14:27 -0700)]
more specific panel titles and docs notes
fat [Sat, 17 Aug 2013 21:25:16 +0000 (14:25 -0700)]
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
fat [Sat, 17 Aug 2013 21:25:04 +0000 (14:25 -0700)]
rebuild
fat [Sat, 17 Aug 2013 21:24:38 +0000 (14:24 -0700)]
fixes #9362
Mark Otto [Sat, 17 Aug 2013 21:15:43 +0000 (14:15 -0700)]
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Mark Otto [Sat, 17 Aug 2013 21:15:33 +0000 (14:15 -0700)]
2px border on thead th elements for just a tad more separation
Mark Otto [Sat, 17 Aug 2013 21:15:14 +0000 (14:15 -0700)]
Update helper classes to reflect changes and mention mixins
Mark Otto [Sat, 17 Aug 2013 21:11:05 +0000 (14:11 -0700)]
mo betta heading examples labels
Mark Otto [Sat, 17 Aug 2013 21:09:35 +0000 (14:09 -0700)]
more accurate grid classes in examples
fat [Sat, 17 Aug 2013 20:43:58 +0000 (13:43 -0700)]
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Conflicts:
dist/css/bootstrap.min.css
fat [Sat, 17 Aug 2013 20:40:28 +0000 (13:40 -0700)]
add comment addressing #9023