mirror of
https://github.com/tenrok/bootstrap.git
synced 2026-06-08 17:22:31 +03:00
few tweaks to responsive stuff, updated docs for grid system (still needs copy editing)
This commit is contained in:
+5
-4
@@ -78,12 +78,13 @@
|
||||
margin-right: auto;
|
||||
.clearfix();
|
||||
}
|
||||
.columns(@columnSpan: 1) {
|
||||
width: (@gridColumnWidth * @columnSpan) + (@gridGutterWidth * (@columnSpan - 1));
|
||||
.columns(@columns: 1) {
|
||||
width: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1));
|
||||
}
|
||||
.offset(@columnOffset: 1) {
|
||||
margin-left: (@gridColumnWidth * @columnOffset) + (@gridGutterWidth * (@columnOffset - 1)) + @gridGutterWidth;
|
||||
.offset(@columns: 1) {
|
||||
margin-left: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1)) + (@gridGutterWidth * 2);
|
||||
}
|
||||
|
||||
// Necessary grid styles for every column to make them appear next to each other horizontally
|
||||
.gridColumn() {
|
||||
display: inline;
|
||||
|
||||
+3
-3
@@ -520,11 +520,11 @@ footer {
|
||||
// ------------
|
||||
|
||||
.page-header {
|
||||
margin-bottom: @baseLineHeight - 1;
|
||||
border-bottom: 1px solid #ddd;
|
||||
margin-bottom: @baseLineHeight * 1.5;
|
||||
border-bottom: 1px solid #eee;
|
||||
.box-shadow(0 1px 0 rgba(255,255,255,.5));
|
||||
h1 {
|
||||
margin-bottom: (@baseLineHeight / 2) - 1px;
|
||||
margin-bottom: @baseLineHeight * .75;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -121,6 +121,7 @@
|
||||
|
||||
}
|
||||
|
||||
/*
|
||||
// LARGE DESKTOP & UP
|
||||
// ------------------
|
||||
|
||||
@@ -176,3 +177,4 @@
|
||||
.offset12 { .offset(12); }
|
||||
|
||||
}
|
||||
*/
|
||||
@@ -85,6 +85,7 @@ a {
|
||||
// -----------
|
||||
// To customize the grid system, bring up the variables.less file and change the column count, size, and gutter there
|
||||
.row {
|
||||
margin-left: -@gridGutterWidth;
|
||||
.clearfix();
|
||||
}
|
||||
|
||||
@@ -93,10 +94,6 @@ a {
|
||||
[class*="span"] {
|
||||
.gridColumn();
|
||||
}
|
||||
// Kill the margin on the first column
|
||||
.row > [class*="span"]:first-child {
|
||||
margin-left: 0;
|
||||
}
|
||||
|
||||
// Default columns
|
||||
.span1 { .columns(1); }
|
||||
|
||||
Reference in New Issue
Block a user