Skip to content

Commit f33a232

Browse files
committed
more fixes for jqm 1.4 #14
1 parent 3217ba7 commit f33a232

7 files changed

+105
-86
lines changed

demo/css/jquery.mobile.flatui.css

+29-21
Large diffs are not rendered by default.

demo/index.html

+4-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,10 @@ <h3>Section 3</h3>
6060
<div data-role="fieldcontain">
6161
<fieldset data-role="controlgroup">
6262
<input type="radio" name="radio-choice-a" data-theme="c" id="radio-choice-1-a" value="choice-1" checked="checked" />
63-
<label for="radio-choice-1-a">Radio</label>
63+
<label for="radio-choice-1-a">Radio 1</label>
64+
65+
<input type="radio" name="radio-choice-a" data-theme="c" id="radio-choice-1-b" value="choice-2" />
66+
<label for="radio-choice-1-b">Radio 2</label>
6467
<input type="checkbox" name="checkbox-a" data-theme="c" id="checkbox-a" checked="checked" />
6568
<label for="checkbox-a">Checkbox</label>
6669
</fieldset>

generated/jquery.mobile.flatui.css

+29-21
Large diffs are not rendered by default.

generated/jquery.mobile.flatui.min.css

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/css/jquery.mobile.theme.css

+9
Original file line numberDiff line numberDiff line change
@@ -239,3 +239,12 @@ button[disabled],
239239
outline-width: 1px;
240240
outline-style: auto;
241241
}
242+
243+
.ui-slider, .ui-slider-track {
244+
border: 0px;
245+
}
246+
247+
.ui-slider-handle {
248+
-webkit-border-radius: 14px;
249+
border-radius: 14px;
250+
}

src/css/swatches.css

+21-21
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/stylus/functions/build_swatch.styl

+12-21
Original file line numberDiff line numberDiff line change
@@ -97,11 +97,7 @@ build_swatch(swatch)
9797
.ui-body-{swatch} .ui-btn.ui-btn-active,
9898
body .ui-group-theme-{swatch} .ui-btn.ui-btn-active,
9999
body .ui-btn.ui-btn-{swatch}.ui-btn-active,
100-
.ui-page-theme-{swatch} .ui-checkbox-on:after,
101-
.ui-bar-{swatch} .ui-checkbox-on:after,
102-
.ui-body-{swatch} .ui-checkbox-on:after,
103-
body .ui-group-theme-{swatch} .ui-checkbox-on:after,
104-
.ui-btn.ui-checkbox-on.ui-btn-{swatch}:after,
100+
105101
.ui-page-theme-{swatch} .ui-flipswitch-active,
106102
.ui-bar-{swatch} .ui-flipswitch-active,
107103
.ui-body-{swatch} .ui-flipswitch-active,
@@ -116,24 +112,19 @@ build_swatch(swatch)
116112
border-color: highlight_color
117113
color: font_color
118114

115+
.ui-page-theme-{swatch} .ui-checkbox-on:after,
116+
.ui-bar-{swatch} .ui-checkbox-on:after,
117+
.ui-body-{swatch} .ui-checkbox-on:after,
118+
body .ui-group-theme-{swatch} .ui-checkbox-on:after,
119+
.ui-btn.ui-checkbox-on.ui-btn-{swatch}:after,
120+
background-color: primary_color
121+
border-color: primary_color
122+
color: font_color
123+
119124
.ui-page-theme-{swatch} .ui-radio-on:after,
120125
.ui-bar-{swatch} .ui-radio-on:after,
121126
.ui-body-{swatch} .ui-radio-on:after,
122127
body .ui-group-theme-{swatch} .ui-radio-on:after,
123128
.ui-btn.ui-radio-on.ui-btn-{swatch}:after
124-
border-color: highlight_color
125-
126-
.ui-page-theme-{swatch} .ui-btn:focus,
127-
.ui-bar-{swatch} .ui-btn:focus,
128-
.ui-body-{swatch} .ui-btn:focus,
129-
body .ui-group-theme-{swatch} .ui-btn:focus,
130-
body .ui-btn.ui-btn-{swatch}:focus,
131-
.ui-page-theme-{swatch} .ui-focus,
132-
.ui-bar-{swatch} .ui-focus,
133-
.ui-body-{swatch} .ui-focus,
134-
body .ui-group-theme-{swatch} .ui-focus,
135-
body .ui-btn-{swatch}.ui-focus,
136-
body .ui-body-{swatch}.ui-focus
137-
-webkit-box-shadow: 0 0 12px highlight_color
138-
-moz-box-shadow: 0 0 12px highlight_color
139-
box-shadow: 0 0 12px highlight_color
129+
background-color: primary_color
130+
color: font_color

0 commit comments

Comments
 (0)