Skip to content

Commit 4973827

Browse files
author
Gabriel Schulhof
committed
Merge branch 'next'
It's the dawn of a new era!
2 parents 988d0dd + 0b07263 commit 4973827

File tree

103 files changed

+4324
-3592
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

103 files changed

+4324
-3592
lines changed

‎css/structure/jquery.mobile.button.css

Lines changed: 58 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -1,97 +1,61 @@
1-
.ui-btn { display: block; text-align: center; cursor:pointer; position: relative; margin: .5em 0; padding: 0; }
2-
.ui-mini { margin-top: .25em; margin-bottom: .25em; }
3-
.ui-btn-left, .ui-btn-right, .ui-input-clear, .ui-btn-inline,
4-
.ui-grid-a .ui-btn, .ui-grid-b .ui-btn, .ui-grid-c .ui-btn, .ui-grid-d .ui-btn, .ui-grid-e .ui-btn, .ui-grid-solo .ui-btn { margin-right: 5px; margin-left: 5px; }
5-
.ui-btn-inner { font-size: 16px; padding: .6em 20px; min-width: .75em; display: block; position: relative; text-overflow: ellipsis; overflow: hidden; white-space: nowrap; zoom: 1; }
6-
.ui-btn input, .ui-btn button { z-index: 2; }
7-
.ui-btn-left, .ui-btn-right, .ui-btn-inline { display: inline-block; vertical-align: middle; }
8-
.ui-mobile .ui-btn-left, .ui-mobile .ui-btn-right, .ui-btn-left > .ui-btn, .ui-btn-right > .ui-btn { margin: 0; } /* .ui-mobile to increase specificity level */
9-
.ui-btn-block { display: block; }
10-
11-
.ui-header > .ui-btn,
12-
.ui-footer > .ui-btn { display: inline-block; margin: 0; }
13-
.ui-header .ui-btn-block,
14-
.ui-footer .ui-btn-block { display: block; }
15-
16-
.ui-header .ui-btn-inner,
17-
.ui-footer .ui-btn-inner,
18-
.ui-mini .ui-btn-inner { font-size: 12.5px; padding: .55em 11px .5em; }
19-
20-
.ui-fullsize .ui-btn-inner,
21-
.ui-fullsize .ui-btn-inner { font-size: 16px; padding: .6em 20px; }
22-
23-
.ui-btn-icon-notext { width: 24px; height: 24px; }
24-
.ui-btn-icon-notext .ui-btn-inner { padding: 0; height: 100%; }
25-
.ui-btn-icon-notext .ui-btn-inner .ui-icon { margin: 2px 1px 2px 3px; float: left; }
26-
27-
.ui-btn-text { position: relative; z-index: 1; width: 100%; -moz-user-select: none; -webkit-user-select: none; -ms-user-select: none; }
28-
div.ui-btn-text { width: auto; }
29-
.ui-btn-icon-notext .ui-btn-text { position: absolute; left: -9999px; }
30-
31-
.ui-btn-icon-left .ui-btn-inner { padding-left: 40px; }
32-
.ui-btn-icon-right .ui-btn-inner { padding-right: 40px; }
33-
.ui-btn-icon-top .ui-btn-inner { padding-top: 40px; }
34-
.ui-btn-icon-bottom .ui-btn-inner { padding-bottom: 40px; }
35-
36-
.ui-header .ui-btn-icon-left .ui-btn-inner,
37-
.ui-footer .ui-btn-icon-left .ui-btn-inner,
38-
.ui-mini.ui-btn-icon-left .ui-btn-inner,
39-
.ui-mini .ui-btn-icon-left .ui-btn-inner { padding-left: 30px; }
40-
.ui-header .ui-btn-icon-right .ui-btn-inner,
41-
.ui-footer .ui-btn-icon-right .ui-btn-inner,
42-
.ui-mini.ui-btn-icon-right .ui-btn-inner,
43-
.ui-mini .ui-btn-icon-right .ui-btn-inner { padding-right: 30px; }
44-
.ui-header .ui-btn-icon-top .ui-btn-inner,
45-
.ui-footer .ui-btn-icon-top .ui-btn-inner { padding: 30px 3px .5em 3px; }
46-
.ui-mini.ui-btn-icon-top .ui-btn-inner,
47-
.ui-mini .ui-btn-icon-top .ui-btn-inner { padding-top: 30px; }
48-
.ui-header .ui-btn-icon-bottom .ui-btn-inner,
49-
.ui-footer .ui-btn-icon-bottom .ui-btn-inner { padding: .55em 3px 30px 3px; }
50-
.ui-mini.ui-btn-icon-bottom .ui-btn-inner,
51-
.ui-mini .ui-btn-icon-bottom .ui-btn-inner { padding-bottom: 30px; }
52-
53-
/* Corner styling inheritance */
54-
.ui-btn-inner {
55-
-webkit-border-radius: inherit;
56-
border-radius: inherit;
1+
/* TODO: This file only contains CSS for the button widget and should be renamed to jquery.mobile.forms.button.css */
2+
button.ui-btn {
3+
-webkit-box-sizing: border-box;
4+
-moz-box-sizing: border-box;
5+
box-sizing: border-box;
6+
-webkit-appearance: none;
7+
-moz-appearance: none;
8+
width: 100%;
9+
}
10+
/* Firefox adds a 1px border in a button element. We negate this to make sure they have the same height as other buttons in controlgroups. */
11+
button.ui-btn::-moz-focus-inner {
12+
border: 0;
13+
}
14+
button.ui-btn-inline {
15+
width: auto;
16+
}
17+
button.ui-btn-icon-notext {
18+
-webkit-box-sizing: content-box;
19+
-moz-box-sizing: content-box;
20+
box-sizing: content-box;
21+
width: 1.5em;
22+
}
23+
/* No margin in grids for 100% width button elements until we can use max-width: fill-available; */
24+
[class*="ui-grid-"] button.ui-btn {
25+
margin-right: 0;
26+
margin-left: 0;
27+
}
28+
/* Hide the native input element */
29+
.ui-input-btn input {
30+
position: absolute;
31+
top: 0;
32+
left: 0;
33+
width: 100%;
34+
height: 100%;
35+
padding: 0;
36+
border: 0;
37+
outline: 0;
38+
-webkit-border-radius: inherit;
39+
border-bottom-radius: inherit;
40+
-webkit-appearance: none;
41+
-moz-appearance: none;
42+
cursor: pointer;
43+
background: #fff;
44+
background: rgba(255,255,255,0);
45+
filter: Alpha(Opacity=0);
46+
opacity: .1;
47+
font-size: 1px;
48+
text-indent: -9999px;
49+
z-index: 2;
5750
}
58-
59-
/*btn icon positioning*/
60-
.ui-btn-icon-notext .ui-icon { display: block; z-index: 0;}
61-
.ui-btn-icon-left > .ui-btn-inner > .ui-icon, .ui-btn-icon-right > .ui-btn-inner > .ui-icon { position: absolute; top: 50%; margin-top: -9px; }
62-
.ui-btn-icon-top .ui-btn-inner .ui-icon, .ui-btn-icon-bottom .ui-btn-inner .ui-icon { position: absolute; left: 50%; margin-left: -9px; }
63-
.ui-btn-icon-left .ui-icon { left: 10px; }
64-
.ui-btn-icon-right .ui-icon { right: 10px; }
65-
.ui-btn-icon-top .ui-icon { top: 10px; }
66-
.ui-btn-icon-bottom .ui-icon { top: auto; bottom: 10px; }
67-
68-
.ui-header .ui-btn-icon-left .ui-icon,
69-
.ui-footer .ui-btn-icon-left .ui-icon,
70-
.ui-mini.ui-btn-icon-left .ui-icon,
71-
.ui-mini .ui-btn-icon-left .ui-icon { left: 5px; }
72-
.ui-header .ui-btn-icon-right .ui-icon,
73-
.ui-footer .ui-btn-icon-right .ui-icon,
74-
.ui-mini.ui-btn-icon-right .ui-icon,
75-
.ui-mini .ui-btn-icon-right .ui-icon { right: 5px; }
76-
.ui-header .ui-btn-icon-top .ui-icon,
77-
.ui-footer .ui-btn-icon-top .ui-icon,
78-
.ui-mini.ui-btn-icon-top .ui-icon,
79-
.ui-mini .ui-btn-icon-top .ui-icon { top: 5px; }
80-
.ui-header .ui-btn-icon-bottom .ui-icon,
81-
.ui-footer .ui-btn-icon-bottom .ui-icon,
82-
.ui-mini.ui-btn-icon-bottom .ui-icon,
83-
.ui-mini .ui-btn-icon-bottom .ui-icon { bottom: 5px; }
84-
85-
/*hiding native button,inputs */
86-
.ui-btn-hidden { position: absolute; top: 0; left: 0; width: 100%; height: 100%; -webkit-appearance: none; cursor: pointer; background: #fff; background: rgba(255,255,255,0); filter: Alpha(Opacity=0); opacity: .1; font-size: 1px; border: none; text-indent: -9999px; }
8751
/* Fixes IE/WP filter alpha opacity bugs */
88-
.ui-disabled .ui-btn-hidden { display: none; }
89-
.ui-disabled { z-index: 1; }
90-
91-
.ui-field-contain .ui-btn.ui-submit { margin: 0; }
92-
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: 28em){
94-
.ui-field-contain label.ui-submit { vertical-align: top; display: inline-block; width: 20%; margin: 0 2% 0 0; }
95-
.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; }
96-
.ui-hide-label .ui-btn.ui-submit { width: auto; display: block; }
52+
.ui-input-btn.ui-state-disabled input {
53+
position: absolute !important;
54+
top: -9999px;
55+
left: -9999px;
56+
height: 1px;
57+
width: 1px;
58+
overflow: hidden;
59+
clip: rect(1px 1px 1px 1px);
60+
clip: rect(1px,1px,1px,1px);
9761
}

‎css/structure/jquery.mobile.collapsible.css

Lines changed: 64 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,63 @@
1-
.ui-collapsible-inset { margin: .5em 0; }
2-
.ui-collapsible-heading { font-size: 16px; display: block; margin: 0 -15px; padding: 0; position: relative; }
3-
.ui-collapsible-inset .ui-collapsible-heading { margin: 0; }
4-
.ui-collapsible-heading .ui-btn { text-align: left; margin: 0; border-left-width: 0; border-right-width: 0; }
5-
.ui-collapsible-inset .ui-collapsible-heading .ui-btn { border-right-width: 1px; border-left-width: 1px; }
6-
.ui-collapsible-collapsed + .ui-collapsible:not(.ui-collapsible-inset) .ui-collapsible-heading .ui-btn { border-top-width: 0; }
7-
.ui-collapsible-set .ui-collapsible:not(.ui-collapsible-inset) .ui-collapsible-heading .ui-btn { border-top-width: 1px; }
8-
.ui-collapsible-heading .ui-btn-inner { padding-left: 12px; padding-right: 12px; }
9-
.ui-collapsible-heading .ui-btn-icon-left .ui-btn-inner { padding-left: 40px; }
10-
.ui-collapsible-heading .ui-btn-icon-right .ui-btn-inner { padding-right: 40px; }
11-
.ui-collapsible-heading .ui-btn-icon-top .ui-btn-inner,
12-
.ui-collapsible-heading .ui-btn-icon-bottom .ui-btn-inner { text-align: center; }
13-
.ui-collapsible-heading .ui-btn-icon-left.ui-mini .ui-btn-inner { padding-left: 30px; }
14-
.ui-collapsible-heading .ui-btn-icon-right.ui-mini .ui-btn-inner { padding-right: 30px; }
15-
16-
.ui-collapsible-heading .ui-btn span.ui-btn { position: absolute; left: 6px; top: 50%; margin: -12px 0 0 0; width: 20px; height: 20px; padding: 1px 0 1px 2px; text-indent: -9999px; }
17-
.ui-collapsible-heading .ui-btn span.ui-btn .ui-btn-inner { padding: 10px 0; }
18-
.ui-collapsible-heading .ui-btn span.ui-btn .ui-icon { left: 0; margin-top: -10px; }
19-
.ui-collapsible-heading-status { position: absolute; top: -9999px; left: 0; }
1+
.ui-collapsible {
2+
margin: .5em -1em;
3+
}
4+
.ui-collapsible-inset,
5+
.ui-collapsible-set {
6+
margin: .5em 0;
7+
}
8+
.ui-collapsible-heading {
9+
display: block;
10+
margin: 0;
11+
padding: 0;
12+
position: relative;
13+
}
14+
.ui-collapsible-heading .ui-btn {
15+
text-align: left;
16+
margin: 0;
17+
border-left-width: 0;
18+
border-right-width: 0;
19+
}
20+
.ui-collapsible-heading .ui-btn-icon-top,
21+
.ui-collapsible-heading .ui-btn-icon-bottom {
22+
text-align: center;
23+
}
24+
.ui-collapsible-inset .ui-collapsible-heading .ui-btn {
25+
border-right-width: 1px;
26+
border-left-width: 1px;
27+
}
28+
.ui-collapsible-collapsed + .ui-collapsible:not(.ui-collapsible-inset) .ui-collapsible-heading .ui-btn {
29+
border-top-width: 0;
30+
}
31+
.ui-collapsible-set .ui-collapsible:not(.ui-collapsible-inset) .ui-collapsible-heading .ui-btn {
32+
border-top-width: 1px;
33+
}
34+
.ui-collapsible-heading-status {
35+
position: absolute !important;
36+
top: -9999px;
37+
left: -9999px;
38+
height: 1px;
39+
width: 1px;
40+
overflow: hidden;
41+
clip: rect(1px 1px 1px 1px);
42+
clip: rect(1px,1px,1px,1px);
43+
}
2044
.ui-collapsible-content {
2145
display: block;
22-
margin: 0 -15px;
23-
padding: 10px 15px;
46+
margin: 0;
47+
padding: .625em 1em;
2448
border-left-width: 0;
2549
border-right-width: 0;
26-
border-top: none; /* Overrides ui-body-* */
27-
background-image: none; /* Overrides ui-body-* */
50+
border-top-width: 0;
51+
background-image: none;
52+
}
53+
.ui-collapsible-inset .ui-collapsible-content {
54+
margin: 0;
55+
border-right-width: 1px;
56+
border-left-width: 1px;
57+
}
58+
.ui-collapsible-content-collapsed {
59+
display: none;
2860
}
29-
.ui-collapsible-inset .ui-collapsible-content { margin: 0; border-right-width: 1px; border-left-width: 1px; }
30-
.ui-collapsible-content-collapsed { display: none; }
31-
3261
.ui-collapsible-set > .ui-collapsible.ui-corner-all {
3362
-webkit-border-radius: 0;
3463
border-radius: 0;
@@ -51,14 +80,18 @@
5180
-webkit-border-bottom-left-radius: inherit;
5281
border-bottom-left-radius: inherit;
5382
}
54-
5583
.ui-collapsible-themed-content:not(.ui-collapsible-collapsed) > .ui-collapsible-heading {
5684
-webkit-border-bottom-right-radius: 0;
5785
border-bottom-right-radius: 0;
5886
-webkit-border-bottom-left-radius: 0;
5987
border-bottom-left-radius: 0;
6088
}
61-
62-
.ui-collapsible-set { margin: .5em 0; }
63-
.ui-collapsible-set .ui-collapsible { margin: -1px 0 0; }
64-
.ui-collapsible-set .ui-collapsible.ui-first-child { margin-top: 0; }
89+
.ui-collapsible-set .ui-collapsible {
90+
margin: -1px -1em 0;
91+
}
92+
.ui-collapsible-set .ui-collapsible-inset {
93+
margin: -1px 0 0;
94+
}
95+
.ui-collapsible-set .ui-collapsible.ui-first-child {
96+
margin-top: 0;
97+
}

0 commit comments

Comments
 (0)