Skip to content
GitLab
Explore
Projects
Groups
Snippets
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Bootstrap
bootstrap
Commits
fda77e69
Commit
fda77e69
authored
13 years ago
by
Mark Otto
Browse files
Options
Download
Email Patches
Plain Diff
move vars and mixins for default grid back to appropriate files
parent
b0780507
1 merge request
!1475
2.0 wip
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
docs/assets/bootstrap.zip
+0
-0
docs/assets/bootstrap.zip
less/grid.less
+0
-25
less/grid.less
less/mixins.less
+15
-0
less/mixins.less
less/variables.less
+11
-0
less/variables.less
with
26 additions
and
25 deletions
+26
-25
docs/assets/bootstrap.zip
+
0
-
0
View file @
fda77e69
No preview for this file type
This diff is collapsed.
Click to expand it.
less/grid.less
+
0
-
25
View file @
fda77e69
...
...
@@ -2,31 +2,6 @@
// -----------
// Default grid sizing
// -------------------
@gridColumns: 12;
@gridColumnWidth: 60px;
@gridGutterWidth: 20px;
@gridRowWidth: (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1));
@gridTotalWidth: @gridRowWidth;
// Columns and offseting mixins
// ----------------------------
.columns(@columns: 1) {
//width: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1));
width: @gridTotalWidth * ((((@gridGutterWidth+@gridColumnWidth)*@columns)-@gridGutterWidth)/@gridRowWidth);
}
.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() {
float: left;
margin-left: @gridGutterWidth;
}
// Grid rows and columns
// ---------------------
.row {
...
...
This diff is collapsed.
Click to expand it.
less/mixins.less
+
15
-
0
View file @
fda77e69
...
...
@@ -139,6 +139,21 @@
.clearfix();
}
// Columns and offseting mixins
// ----------------------------
.columns(@columns: 1) {
//width: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1));
width: @gridTotalWidth * ((((@gridGutterWidth+@gridColumnWidth)*@columns)-@gridGutterWidth)/@gridRowWidth);
}
.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() {
float: left;
margin-left: @gridGutterWidth;
}
// CSS3 PROPERTIES
...
...
This diff is collapsed.
Click to expand it.
less/variables.less
+
11
-
0
View file @
fda77e69
...
...
@@ -40,6 +40,17 @@
// GRID SYSTEM VARIABLES
// --------------------------------------------------
@gridColumns: 12;
@gridColumnWidth: 60px;
@gridGutterWidth: 20px;
@gridRowWidth: (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1));
@gridTotalWidth: @gridRowWidth;
// COMPONENT VARIABLES
// --------------------------------------------------
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Snippets