Skip to content
This repository was archived by the owner on Jul 6, 2019. It is now read-only.

Commit e27bd62

Browse files
BenWhiteheadBenWhitehead
committed
Fix #1 Update path to bootstrap to be a variable so that it can be overridden in other projects that import bootstrap-big-grid.
Split the grid declarations into their own file in the same pattern as bootstrap. big-grid.less is now the build file similar to bootstrap.less in bootstrap.
1 parent b2dc101 commit e27bd62

File tree

4 files changed

+76
-77
lines changed

4 files changed

+76
-77
lines changed

‎less/big-grid.less‎

Lines changed: 4 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -5,78 +5,9 @@
55
*/
66

77
@import "../bower_components/bootstrap/less/mixins";
8-
@import "big-grid-variables";
8+
@import "../bower_components/bootstrap/less/variables";
9+
@import "variables";
910

10-
@media (min-width: @screen-tv720p-min) {
11-
.container {
12-
width: @container-tv720p;
13-
}
11+
@import "grid";
1412

15-
.make-grid-columns-float(tv720p);
16-
.make-grid(@grid-columns, tv720p, width);
17-
.make-grid(@grid-columns, tv720p, pull);
18-
.make-grid(@grid-columns, tv720p, push);
19-
.make-grid(@grid-columns, tv720p, offset);
20-
}
21-
22-
@media (min-width: @screen-tv1080p-min) {
23-
.container {
24-
width: @container-tv1080p;
25-
}
26-
27-
.make-grid-columns-float(tv1080p);
28-
.make-grid(@grid-columns, tv1080p, width);
29-
.make-grid(@grid-columns, tv1080p, pull);
30-
.make-grid(@grid-columns, tv1080p, push);
31-
.make-grid(@grid-columns, tv1080p, offset);
32-
}
33-
34-
@media (min-width: @screen-tv1440p-min) {
35-
.container {
36-
width: @container-tv1440p;
37-
}
38-
39-
.make-grid-columns-float(tv1440p);
40-
.make-grid(@grid-columns, tv1440p, width);
41-
.make-grid(@grid-columns, tv1440p, pull);
42-
.make-grid(@grid-columns, tv1440p, push);
43-
.make-grid(@grid-columns, tv1440p, offset);
44-
}
45-
46-
@media (min-width: @screen-retina15-min) {
47-
.container {
48-
width: @container-retina15;
49-
}
50-
51-
.make-grid-columns-float(retina15);
52-
.make-grid(@grid-columns, retina15, width);
53-
.make-grid(@grid-columns, retina15, pull);
54-
.make-grid(@grid-columns, retina15, push);
55-
.make-grid(@grid-columns, retina15, offset);
56-
}
57-
58-
@media (min-width: @screen-tv4k-min) {
59-
.container {
60-
width: @container-tv4k;
61-
}
62-
63-
.make-grid-columns-float(tv4k);
64-
.make-grid(@grid-columns, tv4k, width);
65-
.make-grid(@grid-columns, tv4k, pull);
66-
.make-grid(@grid-columns, tv4k, push);
67-
.make-grid(@grid-columns, tv4k, offset);
68-
}
69-
70-
@media (min-width: @screen-tv8k-min) {
71-
.container {
72-
width: @container-tv8k;
73-
}
74-
75-
.make-grid-columns-float(tv8k);
76-
.make-grid(@grid-columns, tv8k, width);
77-
.make-grid(@grid-columns, tv8k, pull);
78-
.make-grid(@grid-columns, tv8k, push);
79-
.make-grid(@grid-columns, tv8k, offset);
80-
}
81-
82-
@import "big-grid-responsive-utilities";
13+
@import "responsive-utilities";

‎less/grid.less‎

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
@media (min-width: @screen-tv720p-min) {
2+
.container {
3+
width: @container-tv720p;
4+
}
5+
6+
.make-grid-columns-float(tv720p);
7+
.make-grid(@grid-columns, tv720p, width);
8+
.make-grid(@grid-columns, tv720p, pull);
9+
.make-grid(@grid-columns, tv720p, push);
10+
.make-grid(@grid-columns, tv720p, offset);
11+
}
12+
13+
@media (min-width: @screen-tv1080p-min) {
14+
.container {
15+
width: @container-tv1080p;
16+
}
17+
18+
.make-grid-columns-float(tv1080p);
19+
.make-grid(@grid-columns, tv1080p, width);
20+
.make-grid(@grid-columns, tv1080p, pull);
21+
.make-grid(@grid-columns, tv1080p, push);
22+
.make-grid(@grid-columns, tv1080p, offset);
23+
}
24+
25+
@media (min-width: @screen-tv1440p-min) {
26+
.container {
27+
width: @container-tv1440p;
28+
}
29+
30+
.make-grid-columns-float(tv1440p);
31+
.make-grid(@grid-columns, tv1440p, width);
32+
.make-grid(@grid-columns, tv1440p, pull);
33+
.make-grid(@grid-columns, tv1440p, push);
34+
.make-grid(@grid-columns, tv1440p, offset);
35+
}
36+
37+
@media (min-width: @screen-retina15-min) {
38+
.container {
39+
width: @container-retina15;
40+
}
41+
42+
.make-grid-columns-float(retina15);
43+
.make-grid(@grid-columns, retina15, width);
44+
.make-grid(@grid-columns, retina15, pull);
45+
.make-grid(@grid-columns, retina15, push);
46+
.make-grid(@grid-columns, retina15, offset);
47+
}
48+
49+
@media (min-width: @screen-tv4k-min) {
50+
.container {
51+
width: @container-tv4k;
52+
}
53+
54+
.make-grid-columns-float(tv4k);
55+
.make-grid(@grid-columns, tv4k, width);
56+
.make-grid(@grid-columns, tv4k, pull);
57+
.make-grid(@grid-columns, tv4k, push);
58+
.make-grid(@grid-columns, tv4k, offset);
59+
}
60+
61+
@media (min-width: @screen-tv8k-min) {
62+
.container {
63+
width: @container-tv8k;
64+
}
65+
66+
.make-grid-columns-float(tv8k);
67+
.make-grid(@grid-columns, tv8k, width);
68+
.make-grid(@grid-columns, tv8k, pull);
69+
.make-grid(@grid-columns, tv8k, push);
70+
.make-grid(@grid-columns, tv8k, offset);
71+
}

less/big-grid-responsive-utilities.less renamed to less/responsive-utilities.less

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
@import "../bower_components/bootstrap/less/mixins";
2-
@import "big-grid-variables";
1+
@import "variables";
32

43
// Visibility utilities
54

less/big-grid-variables.less renamed to less/variables.less

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
@import "../bower_components/bootstrap/less/variables";
2-
31
@screen-tv720p-min: 1366px;
42

53
@screen-tv1080p-min: 1920px;

0 commit comments

Comments
 (0)