diff options
| author | Jacob Thornton <[email protected]> | 2011-09-08 19:13:26 -0700 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2011-09-08 19:13:26 -0700 |
| commit | 346122a0c7a883f1fcc1887899cf8bb37274c7f9 (patch) | |
| tree | c889cf926885305343e3e93b0768c45489a1f251 /lib/preboot.less | |
| parent | 8d2f14d8d0bfef3b472be7b7770177fad26d5068 (diff) | |
| parent | c474f996a902434572c238bb6e170473171cadad (diff) | |
| download | bootstrap-346122a0c7a883f1fcc1887899cf8bb37274c7f9.tar.xz bootstrap-346122a0c7a883f1fcc1887899cf8bb37274c7f9.zip | |
Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip
Diffstat (limited to 'lib/preboot.less')
| -rw-r--r-- | lib/preboot.less | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/lib/preboot.less b/lib/preboot.less index 3f44e376b..dffeb64bf 100644 --- a/lib/preboot.less +++ b/lib/preboot.less @@ -121,7 +121,7 @@ } // Grid System -.fixed-container { +.fixed-container() { width: @siteWidth; margin-left: auto; margin-right: auto; @@ -133,6 +133,17 @@ .offset(@columnOffset: 1) { margin-left: (@gridColumnWidth * @columnOffset) + (@gridGutterWidth * (@columnOffset - 1)) + @extraSpace; } +// Necessary grid styles for every column to make them appear next to each other horizontally +.gridColumn() { + display: inline; + float: left; + margin-left: @gridGutterWidth; +} +// makeColumn can be used to mark any element (e.g., .content-primary) as a column without changing markup to .span something +.makeColumn(@columnSpan: 1) { + .gridColumn(); + .columns(@columnSpan); +} // Border Radius .border-radius(@radius: 5px) { |