0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-02 14:24:19 +01:00
Commit Graph

5550 Commits

Author SHA1 Message Date
Jacob Thornton
31ab07b32a Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-11 14:59:57 -07:00
Jacob Thornton
bf2ab457ea fix comment in tooltip 2013-08-11 14:59:39 -07:00
Mark Otto
a88888aaeb fix broken components page, also likely from @kevinsuttle's #9332 2013-08-11 14:49:50 -07:00
Mark Otto
da75d0d30b Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-11 14:44:39 -07:00
Mark Otto
65c0f847e9 fix borked js docs layout, likely from @kevinsuttle's latest PR 2013-08-11 14:44:32 -07:00
Jacob Thornton
5c6b995971 add event prefixes 2013-08-11 14:39:11 -07:00
Jacob Thornton
6393a78bf0 fixes #9279 2013-08-11 14:32:32 -07:00
Mark Otto
b4081e6cd4 Merge pull request #9347 from kevinSuttle/header
Ensure proper use and location of role="banner"
2013-08-11 14:09:46 -07:00
Kevin Suttle
f38241d77e Ensure proper use and location of role="banner"
http://blog.paciellogroup.com/2013/02/using-wai-aria-landmarks-2013/#tablex

http://www.w3.org/TR/wai-aria/roles#banner
2013-08-11 16:34:48 -04:00
Mark Otto
0b9efa9565 fix indentation 2013-08-11 13:20:24 -07:00
Mark Otto
a19ed6dcc1 Merge branch 'aria-nav' of https://github.com/kevinSuttle/bootstrap into kevinSuttle-aria-nav 2013-08-11 13:15:52 -07:00
Mark Otto
6b6241feaa fixes #9241: enable collapsing for labels, in addition to badges, when empty 2013-08-11 12:43:43 -07:00
Kevin Suttle
aa454134ec Use nav for proper HTML5 ARIA role mapping
http://www.w3.org/html/wg/drafts/html/master/sections.html#the-nav-element

http://dev.w3.org/html5/spec/sections.html#the-nav-element

http://blog.paciellogroup.com/2013/02/using-wai-aria-landmarks-2013/#tablex
2013-08-10 22:33:53 -04:00
Mark Otto
d5290c61d8 fixes #9217 manually--use main element instead of div in home and default layouts 2013-08-10 16:11:34 -07:00
Mark Otto
308d40a729 remove customize layout now that we're bringing it back for rc2 2013-08-10 16:11:10 -07:00
Mark Otto
5eac5dab5d Merge pull request #9245 from jlaswell/patch-1
Update components.html
2013-08-10 15:39:28 -07:00
Mark Otto
1b04535f69 Merge pull request #9230 from ggam/patch-14
Changed "Standard pagination" to "Default pagination"
2013-08-10 15:30:00 -07:00
Jacob Thornton
1abb7947c2 fixes #9222 2013-08-10 14:09:05 -07:00
Jacob Thornton
7998c45570 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-10 13:35:48 -07:00
Jacob Thornton
a4f0e8d37a fixes #9111 2013-08-10 13:35:20 -07:00
Chris Rebert
da417c3e7e Use protocol-relative URL in example 2013-08-09 18:01:11 -07:00
Chris Rebert
d48387aa4d Fixes #9260 2013-08-09 17:55:12 -07:00
Chris Rebert
b2b44a53b7 getting-started docs: rephrase to avoid "helpful...help" 2013-08-09 17:48:29 -07:00
Chris Rebert
d0ac0f30b4 Merge pull request #9273 from liuyl/navbars
navbar.less
2013-08-09 00:59:43 -07:00
liuyl
d557fa2839 navbar.less 2013-08-09 15:44:10 +08:00
Chris Rebert
32369b2f78 Merge pull request #9271 from liuyl/panels
refactor panels.less
2013-08-09 00:28:08 -07:00
liuyl
ee62c37f17 panels 2013-08-09 15:24:38 +08:00
Jacob Thornton
dbed9da774 fixes #6159 2013-08-09 00:16:47 -07:00
Jacob Thornton
e46708f7ce Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-08 23:08:40 -07:00
Jacob Thornton
dec00eeeaf add loading class for mdo to style on customizer 2013-08-08 23:07:14 -07:00
Chris Rebert
f86f6ee955 fix 'Calcuated' typo & run grunt; thanks @FagnerMartinsBrack
fixes typo introduced in 2b6ec38987
2013-08-08 13:31:22 -07:00
Chris Rebert
d3a26a5afe Fix Find/Replace-o; good catch, @FagnerMartinsBrack!
Problem introduced in 6b23a66c29
2013-08-08 12:07:27 -07:00
jlaswell
64888ce0b0 Update components.html
Keeping bs-examples consistent with code provided.
2013-08-08 12:31:48 -04:00
Guillermo González de Agüero
5c98288122 Changed "Standard pagination" to "Default pagination" 2013-08-08 12:26:06 +02:00
Jacob
d22bd3a660 Merge pull request #9089 from jdiamond/3.0.0-wip
accordion's data-parent can't contain dots
2013-08-07 23:37:05 -07:00
Jacob Thornton
d320123374 zip js as well … 2013-08-07 23:15:03 -07:00
Jacob Thornton
89b69ed770 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Conflicts:
	_layouts/customize.html
2013-08-07 23:10:11 -07:00
Jacob Thornton
b35b65d0b3 first prototype of new customizer 2013-08-07 23:06:29 -07:00
Mark Otto
f3104a3e3b Merge pull request #9200 from geedmo/3.0.0-wip
Update to use @list-group-border-radius
2013-08-07 18:11:15 -07:00
Mark Otto
8cc00901a0 Merge pull request #9201 from ggam/patch-11
Added panel-variant mixin
2013-08-07 18:10:52 -07:00
Chris Rebert
c587114f99 Merge pull request #9210 from twbs/browserstack-travis-pr-fix-take-2
apparently PRs against twbs/bootstrap have the same Travis slug
2013-08-07 13:32:45 -07:00
Chris Rebert
887125d9f5 apparently PRs against twbs/bootstrap have the same Travis slug 2013-08-07 13:30:00 -07:00
Guillermo González de Agüero
f90ac58410 Updated panels.less to use variant-panel mixin 2013-08-07 20:19:12 +02:00
Guillermo González de Agüero
a24bc28de8 Added panel-variant mixin 2013-08-07 20:15:12 +02:00
geedmo
2f786aa0c1 Update to use @list-group-border-radius 2013-08-07 14:47:47 -03:00
Mark Otto
d490c35af3 Merge pull request #9198 from bwhitty/3.0.0-wip
Fixed #9196 - malformed HTML in doc
2013-08-07 08:34:33 -07:00
Mark Otto
554a476546 Merge pull request #9191 from ggam/patch-10
Fixed link to JavaScript buttons plugin
2013-08-07 08:25:42 -07:00
Braden Whitten
a4638259a5 Fixed #9196 - malformed HTML in doc
Stray <h3> was being closed by an </h2>. Updated to valid HTML. Fixes #9196
2013-08-07 09:18:12 -04:00
Guillermo González de Agüero
50d5a6d17a Fixed link to JavaScript buttons plugin 2013-08-07 12:42:46 +02:00
Mark Otto
03258683ed property order 2013-08-07 00:28:44 -07:00