rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-04 16:24:22 +01:00
Code Issues Actions Packages Releases Activity
4,523 Commits 108 Branches 89 Tags 547 MiB
19de2e8603
Commit Graph

4523 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
fat-kun
ee91afba63 Merge pull request #6481 from pseidemann/patch-1 
don't remove title attribute for tooltips
 2013-02-05 20:13:57 -08:00
fat-kun
566380b257 Merge pull request #6488 from nanek/dropdowns-remove-touchstart 
Remove touchstart from bootstrap-dropdown.js.
 2013-02-05 20:08:42 -08:00
fat
c25e8182ba Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip 2013-02-05 20:01:25 -08:00
fat
45656fc7fc update jquery to 1.9 2013-02-05 20:00:50 -08:00
Mark Otto
31fdb2e25e Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip 2013-02-05 19:59:25 -08:00
Mark Otto
28e1702052 nuke rogue conflict comment and remake 2013-02-05 19:59:02 -08:00
Mark Otto
43da258bd9 Merge branch '2.3.0-wip' into 3.0.0-wip 
Conflicts:
	docs/assets/css/bootstrap-responsive.css
	docs/assets/css/bootstrap.css
	docs/examples/hero.html
	less/buttons.less
	less/carousel.less
	less/close.less
	less/dropdowns.less
	less/labels-badges.less
	less/mixins.less
	less/navbar.less
	less/navs.less
	less/pagination.less
	less/responsive-navbar.less
	less/scaffolding.less
	less/sprites.less
	less/thumbnails.less
	less/type.less
 2013-02-05 19:53:44 -08:00
Mark Otto
c97d304c0c derp, fix broke css and recompile 2013-02-05 19:43:49 -08:00
Mark Otto
9443eb6e21 restore comma between selectors 2013-02-05 19:40:32 -08:00
Mark Otto
15c7e73abd Merge branch '2.3.0-wip' of https://github.com/patrickhlauke/bootstrap into patrickhlauke-2.3.0-wip 
Conflicts:
	docs/assets/css/bootstrap.css
	less/navbar.less
 2013-02-05 19:39:49 -08:00
fat-kun
31b9240dd0 Merge pull request #6737 from openwide-java/fix-tooltip-positioning-for-ie8 
Fix tooltip positioning for IE8 broken in 2.3.0
 2013-02-05 19:22:34 -08:00
Mark Otto
e4a74607b0 simplify media docs 2013-02-05 01:12:39 -08:00
Mark Otto
b65293dec0 reorganize progress bars docs 2013-02-05 01:11:41 -08:00
Mark Otto
3949623eee simpler alerts docs 2013-02-05 01:07:43 -08:00
Mark Otto
238566b445 mo betta thumbnails docs 2013-02-05 01:01:23 -08:00
Mark Otto
2576e6d1d6 reorder counters docs 2013-02-05 00:59:22 -08:00
Mark Otto
cf78f4b010 pagination docs cleanup 2013-02-05 00:54:48 -08:00
Mark Otto
1f673b77bb simpler breadcrumbs docs 2013-02-05 00:51:19 -08:00
Mark Otto
74c8a5611d Increase margins and line-height on h3; overhaul button dropdown docs 2013-02-05 00:49:54 -08:00
Mark Otto
c09b994eea Add justified button groups for link buttons; reorganize dropdowns and button groups docs sections 2013-02-05 00:30:03 -08:00
Mark Otto
5c1cc722e7 Forgot to remove base-css.mustache 2013-02-05 00:22:20 -08:00
Mark Otto
cb0fed6693 Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip 2013-02-04 11:25:46 -08:00
Mark Otto
2c92b5f6a4 Remove base-css.html after recent merges 2013-02-04 11:12:32 -08:00
Mark Otto
0a3e3a50fe Merge branch '2.3.0-wip' into 3.0.0-wip 
Conflicts:
	docs/assets/css/bootstrap.css
	less/type.less
 2013-02-04 11:12:09 -08:00
Mark Otto
1f6a988190 Fixes #6794: incorrect docs mention of th element 2013-02-04 11:11:25 -08:00
Mark Otto
db8a78fae6 Fixes #6794: incorrect docs mention of th element 2013-02-04 11:11:04 -08:00
Joseph Price
4b86a91e53 fix typo 2013-02-04 09:10:48 -05:00
Mark Otto
7ec817ea46 Merge pull request #6638 from GeoffYoung/2.3.0-wip 
Update package.json to current Recess version
 2013-02-02 19:53:22 -08:00
Mark Otto
9480eb89cb Revamp button mixins and pseudo states 
* Remove .darken-button-states and .buttonBackground mixins (latter wasn't being used anyway)
* Create new .btn-pseudo-states mixin for setting button background and border colors for default and pseudo states
 2013-02-02 19:16:15 -08:00
Mark Otto
2f7087eae9 Merge branch '3.0.0-wip' of https://github.com/vickash/bootstrap into vickash-3.0.0-wip 2013-02-02 19:08:59 -08:00
Mark Otto
d6048031ed Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip 2013-02-02 18:58:08 -08:00
Mark Otto
b1f1d7871f Add changelog file to repo instead of relying on the wiki 2013-02-02 18:57:24 -08:00
Mark Otto
5638b2559a Verion number in JS makefile 2013-02-02 18:50:13 -08:00
Mark Otto
3d74c670d3 Rearrange forms content 2013-02-02 18:30:52 -08:00
Mark Otto
6993fadf7e Simplify input and input group sizing 
* Remove .input-mini because who really needs inputs that small
* Remove unnecessary border-radius resets from large and small input groups
 2013-02-02 17:31:26 -08:00
Mark Otto
04aae2f56c Merge branch '3.0.0-wip' of https://github.com/gilbarbara/bootstrap into gilbarbara-3.0.0-wip 2013-02-02 17:01:29 -08:00
Joseph Price
1fe4ed8823 reordered access of options in tooltip and popover to allow overriding data attrs from js 2013-02-02 18:58:56 -05:00
Mark Otto
c64aa26d06 Add @btn-color variable and use in buttons and carets; fixes dropup caret as well 2013-02-02 13:03:18 -08:00
Mark Otto
dbe8aed76e Merge pull request #6763 from rjregenold/2.3.0-wip 
fixes jankiness with anchor tags in carousel.
 2013-02-02 12:35:39 -08:00
Luke Page
6b9bb547bf Move to new selector interpolation, supported from 1.3.1 2013-02-02 07:58:27 +00:00
Mark Otto
94e256c016 Refactor navbar dividers 
* Instead of .divider-vertical, use .divider
* Makes use of .nav-divider mixin
* Dividers are horizontal to start, matching the default state of navbar nav links
* Dividers become vertical above 768px via media queries
 2013-02-01 22:56:09 -08:00
Mark Otto
dad9889aeb Fixes #6657: Upgrade Normalize to 2.1.0 2013-02-01 21:49:54 -08:00
Mark Otto
0bfbf1446d Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip 2013-02-01 21:44:35 -08:00
Mark Otto
8f0bc9e79b Merge branch 'dospuntocero-master' into 2.3.0-wip 2013-02-01 21:41:13 -08:00
Mark Otto
d2ea2cdedd add horizontal-three-color gradient test 2013-02-01 21:41:02 -08:00
Mark Otto
d53af49afe Refactor colors and progress bars 
* Buttons and progress bars now make use of more semantic global @brand- colors
* Progress bars have been rewritten to reduce the number of possible selectors
* Instead of .progress .bar, it's .progress-bar for individual bars of color, ultimately making for less CSS
 2013-02-01 16:21:38 -08:00
Mark Otto
f328ebbc73 Merge pull request #6776 from ndabas/fix-inline-lists-ie7 
Fix inline lists for IE7
 2013-02-01 13:04:17 -08:00
Nikhil Dabas
b7b2e4f8a1 Fixing inline lists for IE7 2013-02-02 02:04:30 +05:30
Mark Otto
2553d74b54 Merge branch '2.3.0-wip' into 3.0.0-wip 
Conflicts:
	docs/examples/hero.html
	docs/examples/sticky-footer-navbar.html
 2013-02-01 10:34:25 -08:00
Mark Otto
7d655c3549 Use button element instead of a for responsive navbar buttons 2013-02-01 10:33:36 -08:00