Skip to content

Commit d4c9162

Browse files
committed
Merge branch 'master' of github.com:jquery/jquery-mobile into tables
2 parents 9733b14 + b124d3e commit d4c9162

25 files changed

+325
-35
lines changed

css/structure/jquery.mobile.button.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090

9191
.ui-field-contain .ui-btn.ui-submit { margin: 0; }
9292
label.ui-submit { font-size: 16px; line-height: 1.4; font-weight: normal; margin: 0 0 .3em; display: block; }
93-
@media all and (min-width: 450px){
93+
@media all and (min-width: 28em){
9494
.ui-field-contain label.ui-submit { vertical-align: top; display: inline-block; width: 20%; margin: 0 2% 0 0; }
9595
.ui-field-contain .ui-btn.ui-submit { width: 78%; display: inline-block; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; -ms-box-sizing: border-box; box-sizing: border-box; }
9696
.ui-hide-label .ui-btn.ui-submit { width: auto; display: block; }

css/structure/jquery.mobile.controlgroup.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
box-shadow: none;
7676
}
7777

78-
@media all and (min-width: 450px){
78+
@media all and (min-width: 28em){
7979
.ui-field-contain .ui-controlgroup-label { vertical-align: top; display: inline-block; width: 20%; margin: 0 2% 0 0; }
8080
.ui-field-contain .ui-controlgroup-controls { width: 78%; display: inline-block; }
8181
.ui-field-contain .ui-controlgroup .ui-select { width: 100%; display: block; }
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
.ui-field-contain, fieldset.ui-field-contain { padding: .8em 0; margin: 0; border-width: 0 0 1px 0; overflow: visible; }
22
.ui-field-contain:last-child { border-bottom-width: 0; }
33
.ui-field-contain { max-width: 100%; } /* This prevents horizontal scrollbar in IE7 */
4-
@media all and (min-width: 450px){
4+
@media all and (min-width: 28em){
55
.ui-field-contain, .ui-mobile fieldset.ui-field-contain { border-width: 0; padding: 0; margin: 1em 0; }
66
}

css/structure/jquery.mobile.forms.select.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ label.ui-select { font-size: 16px; line-height: 1.4; font-weight: normal; margin
4141
.ui-selectmenu.ui-popup .ui-header { -webkit-border-top-left-radius: 0; border-top-left-radius: 0; -webkit-border-top-right-radius: 0; border-top-right-radius: 0; }
4242
.ui-selectmenu .ui-header .ui-title { margin: 0.6em 46px 0.8em; }
4343

44-
@media all and (min-width: 450px){
44+
@media all and (min-width: 28em){
4545
.ui-field-contain label.ui-select { vertical-align: top; display: inline-block; width: 20%; margin: 0 2% 0 0; }
4646
.ui-field-contain .ui-select { width: 78%; display: inline-block; }
4747
.ui-hide-label .ui-select { width: 100%; }

css/structure/jquery.mobile.forms.slider.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ a.ui-btn.ui-slider-handle .ui-btn-inner { padding: 0; height: 100%; }
1616
div.ui-slider-mini a.ui-slider-handle { height: 14px; width: 14px; margin: -8px 0 0 -7px; }
1717
div.ui-slider-mini a.ui-slider-handle .ui-btn-inner { height: 30px; width: 30px; padding: 0; margin: -9px 0 0 -9px; border-top: none; }
1818

19-
@media all and (min-width: 450px){
19+
@media all and (min-width: 28em){
2020
.ui-field-contain label.ui-slider { vertical-align: top; display: inline-block; width: 20%; margin: 0 2% 0 0; }
2121
.ui-field-contain div.ui-slider { width: 43%; }
2222
.ui-field-contain div.ui-slider-switch { width: 5.5em; }

css/structure/jquery.mobile.forms.textinput.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ input:-moz-placeholder { color: #aaa; }
2323
/* Resolves issue #5131: Width of textinput depends on its type, for Android 4.1 */
2424
input[type=number]::-webkit-outer-spin-button { margin: 0; }
2525

26-
@media all and (min-width: 450px){
26+
@media all and (min-width: 28em){
2727
.ui-field-contain label.ui-input-text { vertical-align: top; display: inline-block; width: 20%; margin: 0 2% 0 0 }
2828
.ui-field-contain input.ui-input-text,
2929
.ui-field-contain textarea.ui-input-text,

css/structure/jquery.mobile.grid.css

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,15 @@
2121
.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: 19.925%; }
2222
.ui-grid-d > :nth-child(n) { width: 20%; }
2323
.ui-grid-d .ui-block-a { clear: left; }
24+
25+
/* preset breakpoint to switch to stacked grid styles below 35em (560px) */
26+
@media all and (max-width: 35em) {
27+
.ui-responsive .ui-block-a,
28+
.ui-responsive .ui-block-b,
29+
.ui-responsive .ui-block-c,
30+
.ui-responsive .ui-block-d,
31+
.ui-responsive .ui-block-e {
32+
width: 100%;
33+
float:none;
34+
}
35+
}

css/structure/jquery.mobile.popup.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@
103103
vertical-align: middle;
104104
}
105105

106-
@media all and (min-width: 450px){
106+
@media all and (min-width: 28em){
107107
.ui-popup .ui-field-contain label.ui-submit,
108108
.ui-popup .ui-field-contain .ui-controlgroup-label,
109109
.ui-popup .ui-field-contain label.ui-select,

docs/content/content-collapsible-events.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ <h3>More in this section</h3>
8989
<li data-role="list-divider">Content Formatting</li>
9090
<li><a href="content-html.html">Basic HTML styles</a></li>
9191
<li><a href="content-grids.html">Layout grids (columns)</a></li>
92+
<li><a href="content-grids-responsive.html">Responsive grids</a></li>
9293
<li data-theme="a"><a href="content-collapsible.html">Collapsible content blocks</a></li>
9394
<li><a href="content-collapsible-set.html">Collapsible sets (accordions)</a></li>
9495
<li><a href="content-themes.html">Theming content</a></li>

docs/content/content-collapsible-methods.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ <h3>More in this section</h3>
6262
<li data-role="list-divider">Content Formatting</li>
6363
<li><a href="content-html.html">Basic HTML styles</a></li>
6464
<li><a href="content-grids.html">Layout grids (columns)</a></li>
65+
<li><a href="content-grids-responsive.html">Responsive grids</a></li>
6566
<li data-theme="a"><a href="content-collapsible.html">Collapsible content blocks</a></li>
6667
<li><a href="content-collapsible-set.html">Collapsible sets (accordions)</a></li>
6768
<li><a href="content-themes.html">Theming content</a></li>

0 commit comments

Comments
 (0)