Skip to content

Commit cdf6308

Browse files
committed
took out collapsible grids from core css - better this way for core team to make decision on integrating it or not
1 parent 16aed95 commit cdf6308

File tree

2 files changed

+119
-126
lines changed

2 files changed

+119
-126
lines changed
Lines changed: 118 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,118 @@
1+
/* my addition to supply convertible grids based on www.cssgrid.net by Andy Taylor */
2+
/* ==================================================================================================================== */
3+
/* ! The 1140px Grid V2 by Andy Taylor \ http://cssgrid.net \ http://www.twitter.com/andytlr \ http://www.andytlr.com */
4+
/* ==================================================================================================================== */
5+
.row {
6+
width: 100%;
7+
/*max-width: 1140px;
8+
min-width: 755px;*/
9+
margin: 0 auto;
10+
overflow: hidden;
11+
}
12+
13+
.onecol, .twocol, .threecol, .fourcol, .fivecol, .sixcol, .sevencol, .eightcol, .ninecol, .tencol, .elevencol {
14+
margin-right: 3.8%;
15+
float: left;
16+
min-height: 1px;
17+
}
18+
19+
.row .onecol {
20+
width: 4.85%;
21+
}
22+
23+
.row .twocol {
24+
width: 13.45%;
25+
}
26+
27+
.row .threecol {
28+
width: 22.05%;
29+
}
30+
31+
.row .fourcol {
32+
width: 30.75%;
33+
}
34+
35+
.row .fivecol {
36+
width: 39.45%;
37+
}
38+
39+
.row .sixcol {
40+
width: 48%;
41+
}
42+
43+
.row .sevencol {
44+
width: 56.75%;
45+
}
46+
47+
.row .eightcol {
48+
width: 65.4%;
49+
}
50+
51+
.row .ninecol {
52+
width: 74.05%;
53+
}
54+
55+
.row .tencol {
56+
width: 82.7%;
57+
}
58+
59+
.row .elevencol {
60+
width: 91.35%;
61+
}
62+
63+
.row .twelvecol {
64+
width: 100%;
65+
float: left;
66+
}
67+
68+
.last {
69+
margin-right: 0px;
70+
}
71+
72+
img, object, embed {
73+
max-width: 100%;
74+
}
75+
76+
img {
77+
height: auto;
78+
}
79+
80+
81+
/* touchscreens */
82+
83+
.touch.min-width-768px body {
84+
font-size: 1em;
85+
line-height: normal;
86+
}
87+
88+
89+
/* Smaller screens */
90+
.min-width-768px body {
91+
font-size: 0.9em;
92+
line-height: normal;
93+
}
94+
95+
/* Mobile */
96+
97+
.max-width-480px body {
98+
font-size: 1em;
99+
-webkit-text-size-adjust: none;
100+
}
101+
102+
.max-width-480px .row, .max-width-480px body {
103+
width: 100%;
104+
min-width: 0;
105+
margin-left: 0px;
106+
margin-right: 0px;
107+
padding-left: 0px;
108+
padding-right: 0px;
109+
}
110+
111+
.max-width-480px .row .onecol, .max-width-480px .row .twocol, .max-width-480px .row .threecol, .max-width-480px .row .fourcol, .max-width-480px .row .fivecol, .max-width-480px .row .sixcol, .max-width-480px .row .sevencol, .max-width-480px .row .eightcol, .max-width-480px .row .ninecol, .max-width-480px .row .tencol, .max-width-480px .row .elevencol, .max-width-480px .row .twelvecol {
112+
width: auto;
113+
float: none;
114+
margin-left: 0px;
115+
margin-right: 0px;
116+
padding-left: 20px;
117+
padding-right: 20px;
118+
}

themes/default/jquery.mobile.grids.css

Lines changed: 1 addition & 126 deletions
Original file line numberDiff line numberDiff line change
@@ -25,129 +25,4 @@
2525

2626
/* grid d: 20/20/20/20/20 */
2727
.ui-grid-d .ui-block-a, .ui-grid-d .ui-block-b, .ui-grid-d .ui-block-c, .ui-grid-d .ui-block-d, .ui-grid-d .ui-block-e { width: 20%; }
28-
.ui-grid-d .ui-block-a { clear: left; }
29-
30-
/* my addition to supply convertible grids based on www.cssgrid.net by Andy Taylor */
31-
/* ==================================================================================================================== */
32-
/* ! The 1140px Grid V2 by Andy Taylor \ http://cssgrid.net \ http://www.twitter.com/andytlr \ http://www.andytlr.com */
33-
/* ==================================================================================================================== */
34-
35-
.container {
36-
padding-left: 20px;
37-
padding-right: 20px;
38-
}
39-
40-
.row {
41-
width: 100%;
42-
/*max-width: 1140px;
43-
min-width: 755px;*/
44-
margin: 0 auto;
45-
overflow: hidden;
46-
}
47-
48-
.onecol, .twocol, .threecol, .fourcol, .fivecol, .sixcol, .sevencol, .eightcol, .ninecol, .tencol, .elevencol {
49-
margin-right: 3.8%;
50-
float: left;
51-
min-height: 1px;
52-
}
53-
54-
.row .onecol {
55-
width: 4.85%;
56-
}
57-
58-
.row .twocol {
59-
width: 13.45%;
60-
}
61-
62-
.row .threecol {
63-
width: 22.05%;
64-
}
65-
66-
.row .fourcol {
67-
width: 30.75%;
68-
}
69-
70-
.row .fivecol {
71-
width: 39.45%;
72-
}
73-
74-
.row .sixcol {
75-
width: 48%;
76-
}
77-
78-
.row .sevencol {
79-
width: 56.75%;
80-
}
81-
82-
.row .eightcol {
83-
width: 65.4%;
84-
}
85-
86-
.row .ninecol {
87-
width: 74.05%;
88-
}
89-
90-
.row .tencol {
91-
width: 82.7%;
92-
}
93-
94-
.row .elevencol {
95-
width: 91.35%;
96-
}
97-
98-
.row .twelvecol {
99-
width: 100%;
100-
float: left;
101-
}
102-
103-
.last {
104-
margin-right: 0px;
105-
}
106-
107-
img, object, embed {
108-
max-width: 100%;
109-
}
110-
111-
img {
112-
height: auto;
113-
}
114-
115-
116-
/* touchscreens */
117-
118-
.touch.min-width-768px body {
119-
font-size: 1em;
120-
line-height: normal;
121-
}
122-
123-
124-
/* Smaller screens */
125-
.min-width-768px body {
126-
font-size: 0.9em;
127-
line-height: 1.5em;
128-
}
129-
130-
/* Mobile */
131-
132-
.max-width-480px body {
133-
font-size: 1em;
134-
-webkit-text-size-adjust: none;
135-
}
136-
137-
.max-width-480px .row, .max-width-480px body, .max-width-480px .container {
138-
width: 100%;
139-
min-width: 0;
140-
margin-left: 0px;
141-
margin-right: 0px;
142-
padding-left: 0px;
143-
padding-right: 0px;
144-
}
145-
146-
.max-width-480px .row .onecol, .max-width-480px .row .twocol, .max-width-480px .row .threecol, .max-width-480px .row .fourcol, .max-width-480px .row .fivecol, .max-width-480px .row .sixcol, .max-width-480px .row .sevencol, .max-width-480px .row .eightcol, .max-width-480px .row .ninecol, .max-width-480px .row .tencol, .max-width-480px .row .elevencol, .max-width-480px .row .twelvecol {
147-
width: auto;
148-
float: none;
149-
margin-left: 0px;
150-
margin-right: 0px;
151-
padding-left: 20px;
152-
padding-right: 20px;
153-
}
28+
.ui-grid-d .ui-block-a { clear: left; }

0 commit comments

Comments
 (0)