Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
B
bootstrap
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
bootstrap
Commits
eac987c0
Commit
eac987c0
authored
Apr 01, 2013
by
Mark Otto
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
only negative indent nested grid rows; add new grid example
parent
a0726e60
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
67 additions
and
8 deletions
+67
-8
docs/assets/css/bootstrap.css
docs/assets/css/bootstrap.css
+5
-5
docs/examples/grid.html
docs/examples/grid.html
+56
-0
less/mixins.less
less/mixins.less
+6
-3
No files found.
docs/assets/css/bootstrap.css
View file @
eac987c0
...
@@ -757,11 +757,6 @@ pre code {
...
@@ -757,11 +757,6 @@ pre code {
clear
:
both
;
clear
:
both
;
}
}
.row
{
margin-right
:
-15px
;
margin-left
:
-15px
;
}
.row
:before
,
.row
:before
,
.row
:after
{
.row
:after
{
display
:
table
;
display
:
table
;
...
@@ -782,6 +777,11 @@ pre code {
...
@@ -782,6 +777,11 @@ pre code {
clear
:
both
;
clear
:
both
;
}
}
.row
.row
{
margin-right
:
-15px
;
margin-left
:
-15px
;
}
[
class
*=
"col-span-"
]
{
[
class
*=
"col-span-"
]
{
position
:
relative
;
position
:
relative
;
min-height
:
1px
;
min-height
:
1px
;
...
...
docs/examples/grid.html
0 → 100644
View file @
eac987c0
---
layout: example
title: Grid template
---
<!-- Custom styles for this template -->
<style>
.container
{
padding-left
:
15px
;
padding-right
:
15px
;
}
.row
{
margin-bottom
:
20px
;
margin-left
:
-15px
;
margin-right
:
-15px
;
}
[
class
*=
"col-span-"
]
{
padding-top
:
15px
;
padding-bottom
:
15px
;
background-color
:
#f5f5f5
;
border
:
1px
solid
#e5e5e5
;
}
</style>
<div
class=
"container"
>
<h2>
Bootstrap grids
</h2>
<p
class=
"lead"
>
Basic grid layouts to get you familiar with building within the Bootstrap grid system.
</p>
<h4>
Three equal columns
</h4>
<div
class=
"row"
>
<div
class=
"col-span-4"
>
.col-span-4
</div>
<div
class=
"col-span-4"
>
.col-span-4
</div>
<div
class=
"col-span-4"
>
.col-span-4
</div>
</div>
<h4>
Three unequal columns
</h4>
<div
class=
"row"
>
<div
class=
"col-span-3"
>
.col-span-3
</div>
<div
class=
"col-span-6"
>
.col-span-6
</div>
<div
class=
"col-span-3"
>
.col-span-3
</div>
</div>
<h4>
Two columns
</h4>
<div
class=
"row"
>
<div
class=
"col-span-8"
>
.col-span-8
</div>
<div
class=
"col-span-4"
>
.col-span-4
</div>
</div>
<h4>
Full width, single column
</h4>
<p
class=
"text-muted"
>
No grid classes are necessary for full-width elements.
</p>
</div>
<!-- /container -->
less/mixins.less
View file @
eac987c0
...
@@ -407,11 +407,14 @@
...
@@ -407,11 +407,14 @@
// Creates a wrapper for a series of columns
// Creates a wrapper for a series of columns
.make-row() {
.make-row() {
// Negative margin the row out to align the content of columns
margin-left: (@grid-gutter-width / -2);
margin-right: (@grid-gutter-width / -2);
// Then clear the floated columns
// Then clear the floated columns
.clearfix();
.clearfix();
// Negative margin nested rows out to align the content of columns
.row {
margin-left: (@grid-gutter-width / -2);
margin-right: (@grid-gutter-width / -2);
}
}
}
// Generate the columns
// Generate the columns
.make-column(@columns) {
.make-column(@columns) {
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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