Commit Graph

1084 Commits

Author SHA1 Message Date
Jacob Thornton
ac6e667ad9 Merge branch 'master' into 2.0.2-wip
Conflicts:
	docs/assets/bootstrap.zip
2012-02-18 23:31:37 -08:00
Jacob Thornton
3d58b46226 fix bootstrap-button toggle regression + tests 2012-02-18 23:29:58 -08:00
Mark Otto
1948e985a3 merge in and remake for responsive navbar dropdown fix 2012-02-18 20:09:34 -08:00
Mark Otto
bbb2fb3395 fix right aligned dropdowns 2012-02-18 20:06:38 -08:00
Mark Otto
29e6ef7c70 clarify forms in navbar per #2072 2012-02-18 15:23:38 -08:00
Mark Otto
1a1816b5bd clarify misc components subhead 2012-02-18 15:17:25 -08:00
Mark Otto
b776cae902 add mention of js compilation to single file in customize page per #2003 2012-02-17 21:18:08 -08:00
Mark Otto
ec05ebc5ed add small section to navbar docs on text in the component, per #2035 2012-02-17 20:53:12 -08:00
Mark Otto
1455bc9f8f removing duplicate reset filter since we changed the main button to use buttonBackground mixin, per #2024 2012-02-17 20:47:02 -08:00
Mark Otto
b559f2b8d0 fix duplicate input prepend/append css selectors per #2026 2012-02-17 20:40:56 -08:00
Mark Otto
e7d45184f1 swap last .btn-dark reference 2012-02-17 20:25:49 -08:00
Mark Otto
5d02b8c3c6 fix grid typo in subnav 2012-02-17 14:41:41 -08:00
Mark Otto
7fa1578c49 fix page header example and docs per #2048 2012-02-17 14:39:30 -08:00
Jacob Thornton
7ec09d0db9 2.0.1 2012-02-16 22:42:38 -08:00
Mark Otto
091622644a bring back checkbox borders to iOS by conditionalizing the border: 0; on it to IE7-9; fix word break on pre in IE 2012-02-16 22:34:30 -08:00
Mark Otto
6f6adfb52f change clearfix mixin to drop parens that prevent it from being a class, too 2012-02-16 22:04:11 -08:00
Mark Otto
268e7d67ab add mini buttons per #1971 2012-02-16 21:28:16 -08:00
Mark Otto
61e2201c64 fix buttons focus state and swap a buttons for button buttons 2012-02-16 21:25:40 -08:00
Mark Otto
489276f5be fix responsive media queries to use 979 and 980 where appropro 2012-02-16 21:08:52 -08:00
Mark Otto
0369c1fcfc add mention of navbar vertical divider in docs 2012-02-16 21:04:16 -08:00
Jacob Thornton
c3d3cf7262 add note about popover placement 2012-02-16 20:46:35 -08:00
Jacob Thornton
9d12b2d601 don't try next if not next 2012-02-16 20:43:57 -08:00
Jacob Thornton
b3e4e5ae22 add idea to modal markup exmaple 2012-02-16 20:33:15 -08:00
Jacob Thornton
1520ec446c rebuild bro 2012-02-16 20:30:18 -08:00
Jacob Thornton
6da16a6def fix dropdown links 2012-02-16 20:30:00 -08:00
Jacob Thornton
e730f8adb5 null out interval so that pause doesn't resume on next or prev 2012-02-16 20:22:01 -08:00
Jacob Thornton
f9b578260f rebuild alerts 2012-02-16 20:05:09 -08:00
Jacob Thornton
a8c478e051 Merge branch '2.0.1-wip' of https://github.com/twitter/bootstrap into 2.0.1-wip
Conflicts:
	docs/assets/bootstrap.zip
2012-02-13 18:42:57 -08:00
Jacob Thornton
6e77c9d123 add semicolons to the end of js files 2012-02-13 18:41:02 -08:00
Mark Otto
64ea59234f change up fonts on form elements to remove unnecessary font-family on label element, per #1950 2012-02-13 08:18:19 -08:00
Mark Otto
da94850844 fix filename mention in js docs per #1938 2012-02-12 22:50:21 -08:00
Mark Otto
ce5976fb29 ensure help-block is block per #1937 2012-02-12 22:49:06 -08:00
Mark Otto
cbe10bd591 clean up nav-header in responsive 2012-02-12 21:11:56 -08:00
Mark Otto
944c7298d3 adding makeRow and makeColumn mixins for generating more semantic layouts 2012-02-12 20:46:39 -08:00
Mark Otto
3e00c1261f allow .input-prepend/.input-append to work in .navbar per #1681 2012-02-12 20:28:22 -08:00
Mark Otto
be6fdd9a62 add docs for alt form control sizing per #1700 2012-02-12 20:10:48 -08:00
Mark Otto
4d1f1f0fc7 add typography pattern .page-header to components per #1701 2012-02-12 20:07:25 -08:00
Mark Otto
81d101a6a7 update docs on fixed nav per #1726 2012-02-12 19:50:36 -08:00
Mark Otto
5fc62c5fcc clear up scaffolding page to separate fixed from fluid grid systems 2012-02-12 16:59:29 -08:00
Mark Otto
ac9ac4ddae add note to button dropdowns about js plugin dependency per #1746 2012-02-12 15:49:04 -08:00
Mark Otto
163c98ea7e clean up modals.less comments, add new class for optional use on modal forms to remove bottom margin 2012-02-12 15:43:04 -08:00
Mark Otto
a57dbada0f change classname from .btn-dark to .btn-inverse, change use text 2012-02-12 15:18:20 -08:00
Mark Otto
b8493ed8b7 Merge branch '2.0.1-wip' of https://github.com/simonfranz/bootstrap into simonfranz-2.0.1-wip 2012-02-12 15:14:27 -08:00
Mark Otto
1b32e982ad add hero-unit docs per #1880 2012-02-12 14:47:09 -08:00
Mark Otto
0ff88f2db3 enable the use of .nav-header in dropdowns per #1827 2012-02-12 14:10:07 -08:00
Mark Otto
a9e469e75a add navbar background hover variable and fix uneditable-input with append/prepend controls 2012-02-12 14:01:58 -08:00
Mark Otto
86b6ea4b5f lower z-index of fixed subnav to prevent overlap of dropdown items in .navbar-fixed 2012-02-12 13:33:23 -08:00
Mark Otto
de6f3d4a6f Merge branch '2.0.1-wip' of github.com:twitter/bootstrap into 2.0.1-wip
Conflicts:
	docs/assets/bootstrap.zip
2012-02-12 13:27:29 -08:00
Mark Otto
ebe547b6a0 Merge branch 'patch-2' of https://github.com/cwiederspan/bootstrap into cwiederspan-patch-2 2012-02-12 13:20:17 -08:00
Mark Otto
24df7f1e1d update ff comment in buttons 2012-02-12 13:20:08 -08:00