0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-05 17:24:20 +01:00
Commit Graph

68 Commits

Author SHA1 Message Date
Donald Pipowitch
7037c6fc72 refactored and renamed grid mixins 2014-01-28 10:48:45 +01:00
Mark Otto
82c52a7e9d Fixes #11801: use correct variables for grid containers 2013-12-15 10:38:54 -08:00
Mark Otto
6273604601 Add .container-fluid variation for full-width containers and layouts
/cc #10711 #9862
2013-12-07 20:52:51 -08:00
Mark Otto
82bbccde9b Merge branch 'master' into pr/11648
Conflicts:
	dist/css/bootstrap.min.css
	less/grid.less
2013-11-30 13:09:55 -08:00
Mark Otto
5b137e5857 Merge pull request #11511 from ZDroid/fix-xs-comments
Fix comments for extra small grid
2013-11-29 23:46:35 -08:00
Zlatan Vasović
702ad4c302 Remove redundant comments 2013-11-29 11:37:06 +01:00
Mark Otto
9d939080e6 Fixes #10483 and #10357: Make .container mixin-friendly by moving the width declarations within one class 2013-11-28 14:22:31 -08:00
Zlatan Vasović
283c86db38 There are xs-offsets, -pushes and -pulls! 2013-11-17 21:15:25 +01:00
Mark Otto
c814ad1833 Combine separate efforts for grid mixins into one, cleanup and reorganize 2013-10-11 22:00:37 -07:00
Zlatan Vasović
e2e1c80d1a Another fixup 2013-09-11 10:32:08 +02:00
Mark Otto
0a78e7907d fixes #10406: Update grid to use width on .container instead of max-width as IE8 improperly computes width 2013-09-03 15:49:03 -07:00
Mark Otto
26727bfefd Merge branch 'master' of github.com:twbs/bootstrap 2013-09-01 21:55:59 +02:00
Chris Rebert
604c3b2efc tweak #10336 to double up on the hyphen-minuses to better approximate a long dash 2013-09-01 01:46:18 -07:00
Kevin Granger
f849e65d56 Replace invalid US-ASCII character "\xE2")
Replace invalid US-ASCII character "\xE2") '—' => '-'
2013-08-31 17:50:14 +02:00
Mark Otto
5491d53b99 Deprecate container-{device} vars for container-{size} classes; updates customizer and grid to do the same 2013-08-24 14:00:52 -07:00
Chris Rebert
22ce649910 deprecate @screen-{phone,tablet,desktop} vars 2013-08-21 12:26:20 -07:00
Mark Otto
c729f16282 it's levi-OH-sa, not levi-oh-SAR 2013-08-17 22:51:00 -07:00
Mark Otto
61caed21e2 More consistent naming with screen size variables using xs, sm, md, and lg 2013-08-17 15:21:38 -07:00
Mark Otto
111bdc4e93 fixes #9663: second part, reset pushes and pulls in md and lg grid tiers 2013-08-15 20:31:11 -07:00
Mark Otto
b0a66e60c1 Fixes #9663: Add offset overrides for medium and large grid tiers 2013-08-15 20:25:20 -07:00
Mark Otto
c558c035d7 fixes #9258: no more float bug with full-width grid columns by removing float on all .col-*-12 classes 2013-08-12 16:02:27 -07:00
Mark Otto
394f698056 undo the grid max-width boundary because it makes offsets kinda borked (you'd have to set twice, for medium and large, in most cases--and that sucks) 2013-08-12 15:02:09 -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
db45a60cc8 Scope tablet classes to tablets range only
Fixes #9128
2013-08-05 20:55:30 -07:00
Chris Rebert
23ef8c0c20 Greater standardization of sizing terminology
In class names:
* large => lg
* small => sm
* mini => xs ("Extra small")

In screen size categories:
* Tiny => Extra small
2013-08-03 21:39:57 -07:00
Jeff Tickle
1583dd55e9 Added classes for lg-pull, lg-push, lg-offset, sm-pull, sm-push, sm-offset 2013-08-01 12:16:20 -04:00
Mark Otto
573a197417 Move grid offsets to desktop only (fixes #8229) 2013-06-23 15:15:42 -07:00
Mark Otto
b76d98eee3 Fixes #8211: restore proper table grid class behavior
Needs work though—we shouldn't be setting this stuff with the attribute
selectors, but it's the easiest solution for now.
2013-06-23 15:05:50 -07:00
Mark Otto
441bbe1998 Another grid update
* Update docs to include table of grid levels and behaviors
* Change from .col-md to .col-sm to match existing size variables we use elsewhere
* Keep .col-lg as-is though for simplicity as we won't likely add a fourth level of the grid
* Combine responsive .container breakpoints with grid breakpoints in grid.less
* Other misc docs updates
2013-06-08 18:34:16 -02:30
Mark Otto
45c5b4e45c restore .col-*-12 classes for now 2013-06-03 21:51:35 -07:00
Mark Otto
286955167a prep for less 1.4 with double parens in functions 2013-06-03 21:48:52 -07:00
Mark Otto
a05f6d4cea fixes #8066: add missing % functions to grid less code 2013-06-03 11:58:38 -07:00
Mark Otto
21441f1292 Move the grid offset, push, and pull classes to be tablets-up instead of desktop-up 2013-06-02 15:33:42 -07:00
Mark Otto
19d0726609 Grid updates
- Removed mixins for generating grid classes
- Thus, we manually declare every grid class, from 1-11 (12th unit is
excluded as that's the same as no grid columns)
- No more need for `.col` base class (yay!)
- Negative indent the rows at tablets and above once again (ugh, still
working through this part)
- Add support for `.col-md` for tablet-specific grid columns
- Still need to figure out offsets, pushes, and pulls on other
devices—right now only available on desktop
2013-06-02 13:38:45 -07:00
Aristeides Stathopoulos
6fda25b4c1 Adding variables for container sizes 2013-05-27 23:00:39 +03:00
Aristeides Stathopoulos
2b088ef44e using screen-size variables for grids 2013-05-27 19:33:14 +03:00
Mark Otto
5fbb9e9f5d More row change ups:
* No more negative side margins
* However, keep the negative margin for nested rows
2013-05-16 21:03:56 -07:00
Chris Rebert
e0b9b86d32 use @screen-small var in grid.less
Per comment by @nextgenthemes on/in cd06c5baac
2013-05-03 17:38:58 -07:00
Mark Otto
47155e8aa3 outdent the rows for tablets and above 2013-04-30 19:35:52 -07:00
Mark Otto
cd06c5baac Merge pull request #7704 from twitter/bs3_moar_grid_changes
BS3: Overhaul grid system once more
2013-04-28 18:44:54 -07:00
Kevin
9ce7f22e99 Adding media queries breakpoints variables 2013-04-27 18:47:47 +02:00
Mark Otto
efd3b0c171 Back to two grid classes, .col and .col-lg-* 2013-04-26 23:59:51 -07:00
Mark Otto
eadfa59d92 Add small grid for phones and tablets 2013-04-02 19:40:43 -07:00
Mark Otto
ca31f060a8 New grid classes 2013-03-26 17:12:17 -07:00
Mark Otto
bb38fa5286 Overhaul the grid system and its docs
* Add new grid mixins adapted from Preboot (http://github.com/mdo/preboot)
* Drop the @grid-row-width and @grid-column-width variables
* Add the @grid-float-breakpoint variable, as used in Preboot
* Add support for .push* and .pull* classes for column ordering manipulation
* Document all the things
2013-03-15 23:21:10 -07:00
Mark Otto
00169b48bd Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Conflicts:
	less/grid.less
2013-03-14 13:25:59 -07:00
Mark Otto
d219b8b964 Set border-box globally instead 2013-03-10 13:24:07 -05:00
Luke Page
5054c17ab8 make less files compile with strict maths in 1.4.0 2013-03-06 16:38:20 +00:00
Mark Otto
b83fc82aed fix row change at breakpoint 2013-03-03 18:19:31 -08:00
Mark Otto
01b32f472d Simplify and bring back the grid mixin for generating spans and offsets 2013-01-17 10:49:10 -08:00