0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-12 00:08:59 +01:00
Commit Graph

2956 Commits

Author SHA1 Message Date
♒∆✝
685785d2c2 Merge pull request #4159 from ixti/opera11-transitions-fix
Fix transition end name for opera 11+12
2012-07-23 17:58:38 -07:00
Mark Otto
5b8838aeac more alignment fixes for customize page 2012-07-23 12:51:48 -07:00
Mark Otto
b05fc00d59 fixes #4148, readme typo 2012-07-23 12:51:36 -07:00
Aleksey V Zapparov
76cfe17002 Fix transition end name for opera 11+12
Fix transition end name for Opera 11 and Opera 12.
Should fix issues: #3896, #3897, #4157, #4158
2012-07-23 20:56:18 +02:00
Jacob Thornton
e25bcb93fc Merge branch '2.1.0-wip' of https://github.com/twitter/bootstrap into 2.1.0-wip 2012-07-22 18:29:01 -07:00
Jacob Thornton
dcf75697ec some progress on affix plugin 2012-07-22 18:28:39 -07:00
♒∆✝
cf70fb629f Merge pull request #3842 from alienlebarge/2.1.0-wip
<img /> tag with `height` attr are not responsive
2012-07-22 14:59:08 -07:00
Jacob Thornton
fa1e1e34df Merge branch '2.1.0-wip' of https://github.com/twitter/bootstrap into 2.1.0-wip 2012-07-22 14:52:13 -07:00
Jacob Thornton
fae6c36874 adds minLength #3960 2012-07-22 14:50:52 -07:00
♒∆✝
48fc0ad569 Merge pull request #4104 from lookfirst/2.1.0-wip-fix-destroy
namespace the events for popover/tooltip
2012-07-22 14:40:09 -07:00
Jon Stevens
d76c899142 remove the ns option 2012-07-22 14:36:23 -07:00
Mark Otto
e9f374f041 Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip 2012-07-22 14:31:58 -07:00
Mark Otto
5b8ff7061b fixes #4136: use @dropdownBorder var, but keep IE7-8 fallback 2012-07-22 14:31:39 -07:00
Jon Stevens
393f4a7b42 simplify things to one line. pull #4104 2012-07-22 14:19:11 -07:00
Jacob Thornton
8281a9023a *face palm* 2012-07-22 13:21:44 -07:00
Jacob Thornton
77dea2c5eb change haunt to write 2012-07-22 13:00:17 -07:00
Jacob Thornton
6c2fa9430c add haunt w/ issue guideline spec 2012-07-22 12:57:39 -07:00
Mark Otto
b9105b98f9 move from downloads.html to customize.html to better match purpose of page, fix up customize page layout to match other docs, link style refinement to jumbotrons 2012-07-20 22:06:47 -07:00
Mark Otto
ee750bbce1 tweak docs masthead links hover 2012-07-20 21:38:28 -07:00
Jon Stevens
117f65d431 on destroy, also hide. issue #3880, pull #4104 2012-07-20 09:47:12 -07:00
Mark Otto
1d4660beea nuke commented out code from last fix 2012-07-19 21:25:42 -07:00
Mark Otto
3c1a0fbda4 fixes #4103: simpler fix for tfoot in .table-border 2012-07-19 21:25:24 -07:00
Mark Otto
89d7ec5290 fixes #4102: properly round top left corners of .table-border with caption/colgroup; also fix css tests page layout and footer 2012-07-19 21:06:42 -07:00
Mark Otto
6c23fff4d6 misc docs content changes 2012-07-18 01:06:52 -07:00
Mark Otto
c8fa2600f2 copy change 2012-07-17 23:38:29 -07:00
Mark Otto
aac3736eea fixes #3845: add .btn-link for transparent buttons styled as links 2012-07-17 23:32:52 -07:00
Mark Otto
cb1a59caa0 Merge branch '2.1.0-wip' of https://github.com/gcoop/bootstrap into gcoop-2.1.0-wip
Conflicts:
	docs/base-css.html
	docs/templates/pages/base-css.mustache
2012-07-17 23:14:58 -07:00
Mark Otto
ba90d0fc5e Merge pull request #4110 from purwandi/develop
Moved JS to bottom on extends page
2012-07-17 22:44:26 -07:00
Mark Otto
326b665065 de-scope nav-header from .nav 2012-07-17 22:40:38 -07:00
Purwandi
a8316c780d Merge branch '2.1.0-wip' of https://github.com/twitter/bootstrap into develop 2012-07-18 12:33:16 +07:00
Mark Otto
39f8996d6a fix dropdown vars and make hover state be link color again, add gradient to dropdown link hovers, fix caret positions and active states on nav tabs, tweak nav link padding 2012-07-17 22:26:53 -07:00
Purwandi
51c9fa1697 Moved JS to bottom on extends page 2012-07-18 12:19:02 +07:00
Mark Otto
6a663081a7 remove separate examples page, add to getting started page 2012-07-17 21:45:57 -07:00
Mark Otto
a1ad6d124a Merge branch '2.1.0-wip' of https://github.com/benjaminoakes/bootstrap into benjaminoakes-2.1.0-wip
Conflicts:
	docs/extend.html
	docs/templates/pages/extend.mustache
2012-07-17 20:57:20 -07:00
Mark Otto
62f6368344 center masthead bg pattern 2012-07-17 20:22:55 -07:00
Mark Otto
25bc298aff pngcrush masthead pattern to save 10k 2012-07-17 19:55:02 -07:00
Mark Otto
4008d666a5 new pattern for masthead 2012-07-17 19:54:29 -07:00
Mark Otto
16fa610ea4 Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip 2012-07-17 19:11:51 -07:00
Mark Otto
478396fd4e remove list-type declarations from ul and ol elements since those should just use browser defaults 2012-07-17 19:11:41 -07:00
Jon Stevens
2ee9b2717b namespace the events for popover/tooltip so that they can be cleanly removed. issue #3880 2012-07-16 16:01:11 -07:00
Ben Oakes
426e7d9fbd Compiled; ignoring bootstrap.css change to avoid conflicts 2012-07-16 09:31:18 -04:00
Ben Oakes
9581cbfe32 Two of the three apps are for Linux/Windows; adjust accordingly 2012-07-16 09:29:49 -04:00
Mark Otto
40ab928315 Merge pull request #4083 from martinbean/2.1.0-wip
Moved JS to bottom as per best practices
2012-07-15 16:26:42 -07:00
Mark Otto
e20d2dfe9d docs cleanup and blockquote cleanup for .pull-right option 2012-07-15 16:13:25 -07:00
Mark Otto
750badabf7 copy edits and tweaks to utility classes to ensure they always are specific enough 2012-07-13 14:43:51 -07:00
Martin Bean
74b167b86d Moved JS to bottom as per best practices 2012-07-13 22:25:47 +01:00
Mark Otto
463de252a9 update static assets section of extend page, copy changes elsewhere 2012-07-13 14:20:25 -07:00
Mark Otto
6e622ee763 more content edits to Extend 2012-07-13 11:18:35 -07:00
Mark Otto
93b1519017 content edits to Extend page 2012-07-13 11:17:22 -07:00
Mark Otto
5cb116beb8 cleanup subnav example 2012-07-13 10:58:20 -07:00