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
160fe7ca
Commit
160fe7ca
authored
Jun 20, 2012
by
Mark Otto
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
create vars for responsive grid values, fixed and fluid, and document them in the customizer
parent
59153205
Changes
8
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
71 additions
and
13 deletions
+71
-13
docs/assets/css/bootstrap-responsive.css
docs/assets/css/bootstrap-responsive.css
+6
-2
docs/assets/css/bootstrap.css
docs/assets/css/bootstrap.css
+3
-1
docs/download.html
docs/download.html
+16
-0
docs/templates/pages/download.mustache
docs/templates/pages/download.mustache
+16
-0
less/mixins.less
less/mixins.less
+4
-2
less/responsive-1200px-min.less
less/responsive-1200px-min.less
+5
-5
less/responsive-768px-979px.less
less/responsive-768px-979px.less
+3
-3
less/variables.less
less/variables.less
+18
-0
No files found.
docs/assets/css/bootstrap-responsive.css
View file @
160fe7ca
...
...
@@ -215,7 +215,9 @@
float
:
left
;
margin-left
:
20px
;
}
.container
{
.container
,
.navbar-fixed-top
.container
,
.navbar-fixed-bottom
.container
{
width
:
724px
;
}
.span12
{
...
...
@@ -545,7 +547,9 @@
float
:
left
;
margin-left
:
30px
;
}
.container
{
.container
,
.navbar-fixed-top
.container
,
.navbar-fixed-bottom
.container
{
width
:
1170px
;
}
.span12
{
...
...
docs/assets/css/bootstrap.css
View file @
160fe7ca
...
...
@@ -194,7 +194,9 @@ a:hover {
margin-left
:
20px
;
}
.container
{
.container
,
.navbar-fixed-top
.container
,
.navbar-fixed-bottom
.container
{
width
:
940px
;
}
...
...
docs/download.html
View file @
160fe7ca
...
...
@@ -276,11 +276,27 @@
<input
type=
"text"
class=
"span3"
placeholder=
"60px"
>
<label>
@gridGutterWidth
</label>
<input
type=
"text"
class=
"span3"
placeholder=
"20px"
>
<label>
@gridColumnWidth1200
</label>
<input
type=
"text"
class=
"span3"
placeholder=
"70px"
>
<label>
@gridGutterWidth1200
</label>
<input
type=
"text"
class=
"span3"
placeholder=
"30px"
>
<label>
@gridColumnWidth768
</label>
<input
type=
"text"
class=
"span3"
placeholder=
"42px"
>
<label>
@gridGutterWidth768
</label>
<input
type=
"text"
class=
"span3"
placeholder=
"20px"
>
<h3>
Fluid grid system
</h3>
<label>
@fluidGridColumnWidth
</label>
<input
type=
"text"
class=
"span3"
placeholder=
"6.382978723%"
>
<label>
@fluidGridGutterWidth
</label>
<input
type=
"text"
class=
"span3"
placeholder=
"2.127659574%"
>
<label>
@fluidGridColumnWidth1200
</label>
<input
type=
"text"
class=
"span3"
placeholder=
"5.982905983%"
>
<label>
@fluidGridGutterWidth1200
</label>
<input
type=
"text"
class=
"span3"
placeholder=
"2.564102564%"
>
<label>
@fluidGridColumnWidth768
</label>
<input
type=
"text"
class=
"span3"
placeholder=
"5.801104972%"
>
<label>
@fluidGridGutterWidth768
</label>
<input
type=
"text"
class=
"span3"
placeholder=
"2.762430939%"
>
<h3>
Typography
</h3>
<label>
@sansFontFamily
</label>
...
...
docs/templates/pages/download.mustache
View file @
160fe7ca
...
...
@@ -199,11 +199,27 @@
<input
type=
"text"
class=
"span3"
placeholder=
"60px"
>
<label>
@gridGutterWidth
</label>
<input
type=
"text"
class=
"span3"
placeholder=
"20px"
>
<label>
@gridColumnWidth1200
</label>
<input
type=
"text"
class=
"span3"
placeholder=
"70px"
>
<label>
@gridGutterWidth1200
</label>
<input
type=
"text"
class=
"span3"
placeholder=
"30px"
>
<label>
@gridColumnWidth768
</label>
<input
type=
"text"
class=
"span3"
placeholder=
"42px"
>
<label>
@gridGutterWidth768
</label>
<input
type=
"text"
class=
"span3"
placeholder=
"20px"
>
<h3>
{{
_i
}}
Fluid grid system
{{/
i
}}
</h3>
<label>
@fluidGridColumnWidth
</label>
<input
type=
"text"
class=
"span3"
placeholder=
"6.382978723%"
>
<label>
@fluidGridGutterWidth
</label>
<input
type=
"text"
class=
"span3"
placeholder=
"2.127659574%"
>
<label>
@fluidGridColumnWidth1200
</label>
<input
type=
"text"
class=
"span3"
placeholder=
"5.982905983%"
>
<label>
@fluidGridGutterWidth1200
</label>
<input
type=
"text"
class=
"span3"
placeholder=
"2.564102564%"
>
<label>
@fluidGridColumnWidth768
</label>
<input
type=
"text"
class=
"span3"
placeholder=
"5.801104972%"
>
<label>
@fluidGridGutterWidth768
</label>
<input
type=
"text"
class=
"span3"
placeholder=
"2.762430939%"
>
<h3>
{{
_i
}}
Typography
{{/
i
}}
</h3>
<label>
@sansFontFamily
</label>
...
...
less/mixins.less
View file @
160fe7ca
...
...
@@ -618,7 +618,9 @@
}
// Set the container width, and override it for fixed navbars in media queries
.container { .span(@gridColumns); }
.container,
.navbar-fixed-top .container,
.navbar-fixed-bottom .container { .span(@gridColumns); }
// generate .spanX and .offsetX
.spanX (@gridColumns);
...
...
less/responsive-1200px-min.less
View file @
160fe7ca
...
...
@@ -4,20 +4,20 @@
@media (min-width: 1200px) {
// Fixed grid
#grid > .core(
70px, 30px
);
#grid > .core(
@gridColumnWidth1200, @gridGutterWidth1200
);
// Fluid grid
#grid > .fluid(
5.982905983%, 2.564102564%
);
#grid > .fluid(
@fluidGridColumnWidth1200, @fluidGridGutterWidth1200
);
// Input grid
#grid > .input(
70px, 30px
);
#grid > .input(
@gridColumnWidth1200, @gridGutterWidth1200
);
// Thumbnails
.thumbnails {
margin-left: -
30px
;
margin-left: -
@gridGutterWidth1200
;
}
.thumbnails > li {
margin-left:
30px
;
margin-left:
@gridGutterWidth1200
;
}
.row-fluid .thumbnails {
margin-left: 0;
...
...
less/responsive-768px-979px.less
View file @
160fe7ca
...
...
@@ -4,13 +4,13 @@
@media (min-width: 768px) and (max-width: 979px) {
// Fixed grid
#grid > .core(
42px, 20px
);
#grid > .core(
@gridColumnWidth768, @gridGutterWidth768
);
// Fluid grid
#grid > .fluid(
5.801104972%, 2.762430939%
);
#grid > .fluid(
@fluidGridColumnWidth768, @fluidGridGutterWidth768
);
// Input grid
#grid > .input(
42px, 20px
);
#grid > .input(
@gridColumnWidth768, @gridGutterWidth768
);
// No need to reset .thumbnails here since it's the same @gridGutterWidth
...
...
less/variables.less
View file @
160fe7ca
...
...
@@ -198,6 +198,7 @@
// GRID
// --------------------------------------------------
// Default 940px grid
// -------------------------
@gridColumns: 12;
...
...
@@ -205,7 +206,24 @@
@gridGutterWidth: 20px;
@gridRowWidth: (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1));
// 1200px min
@gridColumnWidth1200: 70px;
@gridGutterWidth1200: 30px;
// 768px-979px
@gridColumnWidth768: 42px;
@gridGutterWidth768: 20px;
// Fluid grid
// -------------------------
@fluidGridColumnWidth: 6.382978723%;
@fluidGridGutterWidth: 2.127659574%;
// 1200px min
@fluidGridColumnWidth1200: 5.982905983%;
@fluidGridGutterWidth1200: 2.564102564%;
// 768px-979px
@fluidGridColumnWidth768: 5.801104972%;
@fluidGridGutterWidth768: 2.762430939%;
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