2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-11 18:02:28 +03:00

bump css to 1.3.0, update makefile to reflect that, update form css to prepend form to the .clearfix to prevent some bullshit, small tweaks elsewhere

This commit is contained in:
Mark Otto
2011-09-08 10:36:56 -07:00
parent 1af96b9a58
commit 1c03a07591
13 changed files with 46 additions and 55 deletions
+12 -1
View File
@@ -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) {