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
bc3a2f66
Commit
bc3a2f66
authored
10 years ago
by
Mark Otto
Browse files
Options
Download
Email Patches
Plain Diff
fix vars order, remove rando grid class from mixin
parent
be147312
Changes
6
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
dist/css/bootstrap.css
+1
-1
dist/css/bootstrap.css
dist/css/bootstrap.min.css
+1
-1
dist/css/bootstrap.min.css
docs/dist/css/bootstrap.css
+1
-1
docs/dist/css/bootstrap.css
docs/dist/css/bootstrap.min.css
+1
-1
docs/dist/css/bootstrap.min.css
scss/_variables.scss
+2
-2
scss/_variables.scss
scss/mixins/_grid-framework.scss
+1
-1
scss/mixins/_grid-framework.scss
with
7 additions
and
7 deletions
+7
-7
dist/css/bootstrap.css
+
1
-
1
View file @
bc3a2f66
...
@@ -797,7 +797,7 @@ pre code {
...
@@ -797,7 +797,7 @@ pre code {
}
}
/* line 11, /Users/mdo/work/bootstrap/scss/mixins/grid-framework */
/* line 11, /Users/mdo/work/bootstrap/scss/mixins/grid-framework */
.col-1
,
.col-xs-1
,
.col-sm-1
,
.col-md-1
,
.col-lg-1
,
.col-xl-1
,
.col-xs-2
,
.col-sm-2
,
.col-md-2
,
.col-lg-2
,
.col-xl-2
,
.col-xs-3
,
.col-sm-3
,
.col-md-3
,
.col-lg-3
,
.col-xl-3
,
.col-xs-4
,
.col-sm-4
,
.col-md-4
,
.col-lg-4
,
.col-xl-4
,
.col-xs-5
,
.col-sm-5
,
.col-md-5
,
.col-lg-5
,
.col-xl-5
,
.col-xs-6
,
.col-sm-6
,
.col-md-6
,
.col-lg-6
,
.col-xl-6
,
.col-xs-7
,
.col-sm-7
,
.col-md-7
,
.col-lg-7
,
.col-xl-7
,
.col-xs-8
,
.col-sm-8
,
.col-md-8
,
.col-lg-8
,
.col-xl-8
,
.col-xs-9
,
.col-sm-9
,
.col-md-9
,
.col-lg-9
,
.col-xl-9
,
.col-xs-10
,
.col-sm-10
,
.col-md-10
,
.col-lg-10
,
.col-xl-10
,
.col-xs-11
,
.col-sm-11
,
.col-md-11
,
.col-lg-11
,
.col-xl-11
,
.col-xs-12
,
.col-sm-12
,
.col-md-12
,
.col-lg-12
,
.col-xl-12
{
.col-xs-1
,
.col-sm-1
,
.col-md-1
,
.col-lg-1
,
.col-xl-1
,
.col-xs-2
,
.col-sm-2
,
.col-md-2
,
.col-lg-2
,
.col-xl-2
,
.col-xs-3
,
.col-sm-3
,
.col-md-3
,
.col-lg-3
,
.col-xl-3
,
.col-xs-4
,
.col-sm-4
,
.col-md-4
,
.col-lg-4
,
.col-xl-4
,
.col-xs-5
,
.col-sm-5
,
.col-md-5
,
.col-lg-5
,
.col-xl-5
,
.col-xs-6
,
.col-sm-6
,
.col-md-6
,
.col-lg-6
,
.col-xl-6
,
.col-xs-7
,
.col-sm-7
,
.col-md-7
,
.col-lg-7
,
.col-xl-7
,
.col-xs-8
,
.col-sm-8
,
.col-md-8
,
.col-lg-8
,
.col-xl-8
,
.col-xs-9
,
.col-sm-9
,
.col-md-9
,
.col-lg-9
,
.col-xl-9
,
.col-xs-10
,
.col-sm-10
,
.col-md-10
,
.col-lg-10
,
.col-xl-10
,
.col-xs-11
,
.col-sm-11
,
.col-md-11
,
.col-lg-11
,
.col-xl-11
,
.col-xs-12
,
.col-sm-12
,
.col-md-12
,
.col-lg-12
,
.col-xl-12
{
position
:
relative
;
position
:
relative
;
min-height
:
1px
;
min-height
:
1px
;
padding-right
:
.75rem
;
padding-right
:
.75rem
;
...
...
This diff is collapsed.
Click to expand it.
dist/css/bootstrap.min.css
+
1
-
1
View file @
bc3a2f66
This diff is collapsed.
Click to expand it.
docs/dist/css/bootstrap.css
+
1
-
1
View file @
bc3a2f66
...
@@ -797,7 +797,7 @@ pre code {
...
@@ -797,7 +797,7 @@ pre code {
}
}
/* line 11, /Users/mdo/work/bootstrap/scss/mixins/grid-framework */
/* line 11, /Users/mdo/work/bootstrap/scss/mixins/grid-framework */
.col-1
,
.col-xs-1
,
.col-sm-1
,
.col-md-1
,
.col-lg-1
,
.col-xl-1
,
.col-xs-2
,
.col-sm-2
,
.col-md-2
,
.col-lg-2
,
.col-xl-2
,
.col-xs-3
,
.col-sm-3
,
.col-md-3
,
.col-lg-3
,
.col-xl-3
,
.col-xs-4
,
.col-sm-4
,
.col-md-4
,
.col-lg-4
,
.col-xl-4
,
.col-xs-5
,
.col-sm-5
,
.col-md-5
,
.col-lg-5
,
.col-xl-5
,
.col-xs-6
,
.col-sm-6
,
.col-md-6
,
.col-lg-6
,
.col-xl-6
,
.col-xs-7
,
.col-sm-7
,
.col-md-7
,
.col-lg-7
,
.col-xl-7
,
.col-xs-8
,
.col-sm-8
,
.col-md-8
,
.col-lg-8
,
.col-xl-8
,
.col-xs-9
,
.col-sm-9
,
.col-md-9
,
.col-lg-9
,
.col-xl-9
,
.col-xs-10
,
.col-sm-10
,
.col-md-10
,
.col-lg-10
,
.col-xl-10
,
.col-xs-11
,
.col-sm-11
,
.col-md-11
,
.col-lg-11
,
.col-xl-11
,
.col-xs-12
,
.col-sm-12
,
.col-md-12
,
.col-lg-12
,
.col-xl-12
{
.col-xs-1
,
.col-sm-1
,
.col-md-1
,
.col-lg-1
,
.col-xl-1
,
.col-xs-2
,
.col-sm-2
,
.col-md-2
,
.col-lg-2
,
.col-xl-2
,
.col-xs-3
,
.col-sm-3
,
.col-md-3
,
.col-lg-3
,
.col-xl-3
,
.col-xs-4
,
.col-sm-4
,
.col-md-4
,
.col-lg-4
,
.col-xl-4
,
.col-xs-5
,
.col-sm-5
,
.col-md-5
,
.col-lg-5
,
.col-xl-5
,
.col-xs-6
,
.col-sm-6
,
.col-md-6
,
.col-lg-6
,
.col-xl-6
,
.col-xs-7
,
.col-sm-7
,
.col-md-7
,
.col-lg-7
,
.col-xl-7
,
.col-xs-8
,
.col-sm-8
,
.col-md-8
,
.col-lg-8
,
.col-xl-8
,
.col-xs-9
,
.col-sm-9
,
.col-md-9
,
.col-lg-9
,
.col-xl-9
,
.col-xs-10
,
.col-sm-10
,
.col-md-10
,
.col-lg-10
,
.col-xl-10
,
.col-xs-11
,
.col-sm-11
,
.col-md-11
,
.col-lg-11
,
.col-xl-11
,
.col-xs-12
,
.col-sm-12
,
.col-md-12
,
.col-lg-12
,
.col-xl-12
{
position
:
relative
;
position
:
relative
;
min-height
:
1px
;
min-height
:
1px
;
padding-right
:
.75rem
;
padding-right
:
.75rem
;
...
...
This diff is collapsed.
Click to expand it.
docs/dist/css/bootstrap.min.css
+
1
-
1
View file @
bc3a2f66
This diff is collapsed.
Click to expand it.
scss/_variables.scss
+
2
-
2
View file @
bc3a2f66
...
@@ -276,12 +276,12 @@ $zindex-modal: 1040;
...
@@ -276,12 +276,12 @@ $zindex-modal: 1040;
$screen-xl-min
:
75em
;
$screen-xl-min
:
75em
;
// Large screen / desktop
// Large screen / desktop
$screen-lg-min
:
62em
;
$screen-lg-max
:
(
$screen-xl-min
-
.1
);
$screen-lg-max
:
(
$screen-xl-min
-
.1
);
$screen-lg-min
:
62em
;
// Medium screen / tablet
// Medium screen / tablet
$screen-md-min
:
48em
;
$screen-md-max
:
(
$screen-lg-min
-
.1
);
$screen-md-max
:
(
$screen-lg-min
-
.1
);
$screen-md-min
:
48em
;
// Small screen / phone
// Small screen / phone
$screen-sm-max
:
(
$screen-md-min
-
.1
);
$screen-sm-max
:
(
$screen-md-min
-
.1
);
...
...
This diff is collapsed.
Click to expand it.
scss/mixins/_grid-framework.scss
+
1
-
1
View file @
bc3a2f66
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
// any value of `$grid-columns`.
// any value of `$grid-columns`.
// [converter] This is defined recursively in LESS, but Sass supports real loops
// [converter] This is defined recursively in LESS, but Sass supports real loops
@mixin
make-grid-columns
(
$i
:
1
,
$list
:
"
.col-
#{
$i
}
,
.col-xs-
#{
$i
}
, .col-sm-
#{
$i
}
, .col-md-
#{
$i
}
, .col-lg-
#{
$i
}
, .col-xl-
#{
$i
}
"
)
{
@mixin
make-grid-columns
(
$i
:
1
,
$list
:
".col-xs-
#{
$i
}
, .col-sm-
#{
$i
}
, .col-md-
#{
$i
}
, .col-lg-
#{
$i
}
, .col-xl-
#{
$i
}
"
)
{
@for
$i
from
(
1
+
1
)
through
$grid-columns
{
@for
$i
from
(
1
+
1
)
through
$grid-columns
{
$list
:
"
#{
$list
}
, .col-xs-
#{
$i
}
, .col-sm-
#{
$i
}
, .col-md-
#{
$i
}
, .col-lg-
#{
$i
}
, .col-xl-
#{
$i
}
"
;
$list
:
"
#{
$list
}
, .col-xs-
#{
$i
}
, .col-sm-
#{
$i
}
, .col-md-
#{
$i
}
, .col-lg-
#{
$i
}
, .col-xl-
#{
$i
}
"
;
}
}
...
...
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