Skip to content
GitLab
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
36d56fb1
Commit
36d56fb1
authored
13 years ago
by
Jacob Thornton
Browse files
Options
Download
Email Patches
Plain Diff
don't use negative margin - use first child to set to 0
parent
b8c0388f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
bootstrap.css
+4
-2
bootstrap.css
bootstrap.min.css
+2
-1
bootstrap.min.css
lib/scaffolding.less
+6
-2
lib/scaffolding.less
with
12 additions
and
5 deletions
+12
-5
bootstrap.css
+
4
-
2
View file @
36d56fb1
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
* http://www.apache.org/licenses/LICENSE-2.0
* http://www.apache.org/licenses/LICENSE-2.0
*
*
* Designed and built with all the love in the world @twitter by @mdo and @fat.
* Designed and built with all the love in the world @twitter by @mdo and @fat.
* Date: Sun Jan 22 20:
06:46
PST 2012
* Date: Sun Jan 22 20:
11:39
PST 2012
*/
*/
html
,
body
{
html
,
body
{
margin
:
0
;
margin
:
0
;
...
@@ -238,7 +238,6 @@ a:hover {
...
@@ -238,7 +238,6 @@ a:hover {
text-decoration
:
underline
;
text-decoration
:
underline
;
}
}
.row
{
.row
{
margin-left
:
-20px
;
*
zoom
:
1
;
*
zoom
:
1
;
}
}
.row
:before
,
.row
:after
{
.row
:before
,
.row
:after
{
...
@@ -248,6 +247,9 @@ a:hover {
...
@@ -248,6 +247,9 @@ a:hover {
.row
:after
{
.row
:after
{
clear
:
both
;
clear
:
both
;
}
}
[
class
*=
"span"
]
:first-child
{
margin-left
:
0
;
}
[
class
*=
"span"
]
{
[
class
*=
"span"
]
{
float
:
left
;
float
:
left
;
margin-left
:
20px
;
margin-left
:
20px
;
...
...
This diff is collapsed.
Click to expand it.
bootstrap.min.css
+
2
-
1
View file @
36d56fb1
...
@@ -32,8 +32,9 @@ body{margin:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:
...
@@ -32,8 +32,9 @@ body{margin:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:
.sidebar-right
.fluid-sidebar
{
float
:
right
;
margin-right
:
-240px
;}
.sidebar-right
.fluid-sidebar
{
float
:
right
;
margin-right
:
-240px
;}
.fluid-content
{
float
:
left
;
width
:
100%
;}
.fluid-content
{
float
:
left
;
width
:
100%
;}
a
{
font-weight
:
inherit
;
line-height
:
inherit
;
color
:
#0088cc
;
text-decoration
:
none
;}
a
:hover
{
color
:
#005580
;
text-decoration
:
underline
;}
a
{
font-weight
:
inherit
;
line-height
:
inherit
;
color
:
#0088cc
;
text-decoration
:
none
;}
a
:hover
{
color
:
#005580
;
text-decoration
:
underline
;}
.row
{
margin-left
:
-20px
;
*
zoom
:
1
;}
.row
:before
,
.row
:after
{
display
:
table
;
content
:
""
;}
.row
{
*
zoom
:
1
;}
.row
:before
,
.row
:after
{
display
:
table
;
content
:
""
;}
.row
:after
{
clear
:
both
;}
.row
:after
{
clear
:
both
;}
[
class
*=
"span"
]
:first-child
{
margin-left
:
0
;}
[
class
*=
"span"
]
{
float
:
left
;
margin-left
:
20px
;}
[
class
*=
"span"
]
{
float
:
left
;
margin-left
:
20px
;}
.span1
{
width
:
60px
;}
.span1
{
width
:
60px
;}
.span2
{
width
:
140px
;}
.span2
{
width
:
140px
;}
...
...
This diff is collapsed.
Click to expand it.
lib/scaffolding.less
+
6
-
2
View file @
36d56fb1
...
@@ -75,11 +75,15 @@ a {
...
@@ -75,11 +75,15 @@ a {
// -----------
// -----------
// To customize the grid system, bring up the variables.less file and change the column count, size, and gutter there
// To customize the grid system, bring up the variables.less file and change the column count, size, and gutter there
.row {
.row {
margin-left: -@gridGutterWidth;
.clearfix();
.clearfix();
}
}
// Find all .span# classes within .row and give them the necessary properties for grid columns (supported by all browsers back to IE7)
[class*="span"]:first-child{
margin-left: 0;
}
// Find all .span# classes within .row and give them the necessary properties for grid columns
// (supported by all browsers back to IE7)
// Credit to @dhg for the idea
// Credit to @dhg for the idea
[class*="span"] {
[class*="span"] {
.gridColumn();
.gridColumn();
...
...
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