2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-15 11:59:39 +03:00
Commit Graph

5594 Commits

Author SHA1 Message Date
Mark Otto efe62a7ef4 rename and refactor a smidge to add medium grid mixins 2013-08-12 00:36:22 -07:00
Mark Otto f50aea30c4 Merge branch 'patch-12' of https://github.com/ggam/bootstrap into ggam-patch-12 2013-08-12 00:31:28 -07:00
Mark Otto a2b9988eb9 Media query (grid and responsive utilities) overhaul
Grid classes have been changed to account for a fourth set of classes,
meaning we now have XS, S, M, and L options. Specifically, we made the
following changes:

* Renames `.col-` to `.col-xs-`
* Adds `.col-md-` for devices 992px wide and up
* Remaps `.col-lg-` for devices 1200px wide and up

Alongside that, we've updated our media queries to better handle
advanced grid layouts:

* All column classes now kick in when they hit a `min-width`, undoing
the #9128 fix in
https://github.com/twbs/bootstrap/commit/db45a60cc86190a060f0baf0b3961cb
c690f3a65
* All column offsets, pushes, and pulls are scoped to an appropriate
range, meaning a `min-width` and `max-width` (thanks for the idea,
@eratzlaff)

We've also modified the widths of our grid containers for the small
device grid (now a max 720px instead of 728px) and large device grid
(now a max 1140px instead of 1170px) to avoid horizontal scrollbar
problems in Firefox (likely due to box-sizing, which is why we didn't
see it in 2.x).

Similarly, we've updated the responsive ultility classes to match the
new four media query approach of the grid system. That means we've:

* Added new `.visible-xs` and `.hidden-xs` classes
* Reassigns visible and hidden classes for small, medium, and large to
matching grid system media queries
* Updates docs examples to match grid system and account for fourth
utility range

-----

Fixes the following:

* #9135: fourth grid tier
* #9302: undoes previous range change for small grid system, so no need
to update any docs here
* #8755: consistent grid and responsive utilities schemas)
* #9195, #9216, and #9227: no more horizontal scrollbars
2013-08-12 00:28:50 -07:00
Mark Otto 95affa32e6 simplify padding in list groups and margins on badges within 2013-08-11 21:17:49 -07:00
Mark Otto a0f301995c Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-11 20:46:22 -07:00
Mark Otto ac74655998 add another var 2013-08-11 20:45:51 -07:00
Mark Otto c52a3508c6 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Conflicts:
	dist/css/bootstrap.min.css
2013-08-11 20:45:42 -07:00
Mark Otto 9e316beba1 Merge pull request #9355 from kevinSuttle/aside
Map 'role="complementary"' to proper HTML5 aside element
2013-08-11 20:43:18 -07:00
Kevin Suttle 9d5473255b Map 'role="complementary"' to proper aside element
http://blog.paciellogroup.com/2013/02/using-wai-aria-landmarks-2013/#tablex

http://www.w3.org/TR/wai-aria/roles#complementary
2013-08-11 23:40:22 -04:00
Mark Otto 2a8e5765b9 Merge pull request #9353 from kevinSuttle/contentinfo
Map "contentinfo" role to HTML5 footer element
2013-08-11 20:34:58 -07:00
Mark Otto 2ae8be3b31 Customizer field updates for variables 2013-08-11 20:33:58 -07:00
Mark Otto 0819cfc450 addressing #9189 manually, part 7: thumbnails vars 2013-08-11 19:32:16 -07:00
Kevin Suttle 1355c58cf2 Map "contentinfo" role to HTML5 footer element
http://blog.paciellogroup.com/2013/02/using-wai-aria-landmarks-2013/#tablex

http://www.w3.org/TR/wai-aria/roles#contentinfo
2013-08-11 22:26:40 -04:00
Mark Otto bf4900072d Drop the font-weight on panel labels since heading elements already get it 2013-08-11 19:20:23 -07:00
Mark Otto fca5c812c5 Restore prior docs spacing 2013-08-11 19:19:56 -07:00
Mark Otto 85ec6e741d Follow up commit: fix collapse clearing and navbar brand/nav spacing 2013-08-11 19:19:44 -07:00
Mark Otto f47a1905e2 Merge pull request #9352 from kevinSuttle/aria-forms
Give forms and search fields proper ARIA roles
2013-08-11 19:18:36 -07:00
Mark Otto ba8026e00f Refactor navbars to simplify things
* `.navbar-brand` is no longer centered, thus removing need for
max-width and a few lines of code
* Clear floats of `.navbar-brand` in the `.nav-collapse` like we did in
2.x, thus simplifying some clearing and other things.
* Restyle the `.navbar-toggle` button to align it's bars up with the
text and flow of the document.
* Restyle the `.navbar-brand` to not use padding on left/right as to
avoid negative margin and other fuckery. This limits the ability to put
a bg color on the brand, but I think that's fine for now.
2013-08-11 19:06:26 -07:00
Kevin Suttle a86f5d24f8 Give forms and search fields proper ARIA roles
http://blog.paciellogroup.com/2013/02/using-wai-aria-landmarks-2013/#tablex

http://www.w3.org/TR/wai-aria/roles#form

http://www.w3.org/TR/wai-aria/roles#search
2013-08-11 21:45:50 -04:00
fat 63425cd804 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-11 18:42:34 -07:00
fat 8bdffecf8f rebuild + first bit of customizer urls 2013-08-11 18:42:13 -07:00
Mark Otto c2cfd3153b addressing #9189 manually, part 6: add a navbar margin var, but avoid the navbar-nav var because that should really be customizable 2013-08-11 18:32:52 -07:00
Mark Otto e9650f51bf addressing #9189 manually, part 5: don't bother with a .label font-weight var and let's just use bold because windows hates 500 2013-08-11 18:10:42 -07:00
Mark Otto a66cdb0c30 addressing #9189 manually, part 4: input group background var 2013-08-11 18:09:56 -07:00
Mark Otto 83f1a75e7a addressing #9189 manually, part 3: forms 2013-08-11 18:06:26 -07:00
Chris Rebert 12b9058df9 Merge pull request #9351 from vsn4ik/quotes_in_nav_main
Move quotes in nav-main.html
2013-08-11 17:59:27 -07:00
Mark Otto 286636755a spacing 2013-08-11 17:47:53 -07:00
Mark Otto 58b90dae15 addressing #9189 manually, part 2: dropdown header and disabled link colors (and refactor commenting styles) 2013-08-11 17:47:30 -07:00
vsn4ik 06da490707 Move quotes in nav-main.html 2013-08-12 04:46:07 +04:00
Mark Otto 8b76e0d0f0 addressing #9189 manually, part 1: code and pre vars 2013-08-11 17:23:19 -07:00
Mark Otto 32f6cbf9d0 Merge pull request #9211 from zacwasielewski/responsive-visibility-utilities-as-less-mixins
Make visibility utility classes responsive when used as LESS mixins
2013-08-11 17:03:24 -07:00
Mark Otto 83c236f570 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-11 16:07:57 -07:00
Mark Otto 1ff1dfb2bd fixes #9348 by ditching a comment 2013-08-11 16:07:45 -07:00
Jacob Thornton 92c2ad98e7 fixes #8983 2013-08-11 15:41:06 -07:00
Jacob Thornton b8ed111a18 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-11 15:17:30 -07:00
Jacob Thornton 89b3cb0dac fixes #9318 2013-08-11 15:17:04 -07:00
Mark Otto 9b07b999d2 Merge pull request #9286 from neilhem/3.0.0-wip
set img-circle class in percents
2013-08-11 15:15:53 -07:00
Jacob Thornton c49ecc5f21 refresh scrollspy after page 'loads' 2013-08-11 15:03:48 -07:00
Mark Otto 39899e46cd Merge pull request #9229 from ggam/patch-13
Removed Glyphicons mention from carousel.less
2013-08-11 15:02:07 -07:00
Mark Otto 0561cfec6b fixes #8900: nuke empty space between panel heading and list group 2013-08-11 15:01:16 -07:00
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