more fixes for jqm 1.4 #14

ququplay · Nov 22, 2013 · f33a232 · f33a232
1 parent 3217ba7
commit f33a232
Show file tree

Hide file tree

Showing 7 changed files with 105 additions and 86 deletions.
diff --git a/demo/css/jquery.mobile.flatui.css b/demo/css/jquery.mobile.flatui.css
diff --git a/demo/index.html b/demo/index.html
@@ -60,7 +60,10 @@ <h3>Section 3</h3>
       <div data-role="fieldcontain">
         <fieldset data-role="controlgroup">
           <input type="radio" name="radio-choice-a" data-theme="c" id="radio-choice-1-a" value="choice-1" checked="checked" />
-          <label for="radio-choice-1-a">Radio</label>
+          <label for="radio-choice-1-a">Radio 1</label>
+
+          <input type="radio" name="radio-choice-a" data-theme="c" id="radio-choice-1-b" value="choice-2"  />
+          <label for="radio-choice-1-b">Radio 2</label>
           <input type="checkbox" name="checkbox-a" data-theme="c" id="checkbox-a" checked="checked" />
           <label for="checkbox-a">Checkbox</label>
         </fieldset>

diff --git a/generated/jquery.mobile.flatui.css b/generated/jquery.mobile.flatui.css
diff --git a/generated/jquery.mobile.flatui.min.css b/generated/jquery.mobile.flatui.min.css
diff --git a/src/css/jquery.mobile.theme.css b/src/css/jquery.mobile.theme.css
@@ -239,3 +239,12 @@ button[disabled],
 	outline-width: 1px;
 	outline-style: auto;
 }
+
+.ui-slider, .ui-slider-track {
+	border: 0px;
+}
+
+.ui-slider-handle {
+	-webkit-border-radius: 14px;
+	border-radius: 14px;
+}
diff --git a/src/css/swatches.css b/src/css/swatches.css
diff --git a/src/stylus/functions/build_swatch.styl b/src/stylus/functions/build_swatch.styl
@@ -97,11 +97,7 @@ build_swatch(swatch)
     .ui-body-{swatch} .ui-btn.ui-btn-active,
     body .ui-group-theme-{swatch} .ui-btn.ui-btn-active,
     body .ui-btn.ui-btn-{swatch}.ui-btn-active,
-    .ui-page-theme-{swatch} .ui-checkbox-on:after,
-    .ui-bar-{swatch} .ui-checkbox-on:after,
-    .ui-body-{swatch} .ui-checkbox-on:after,
-    body .ui-group-theme-{swatch} .ui-checkbox-on:after,
-    .ui-btn.ui-checkbox-on.ui-btn-{swatch}:after,
+
     .ui-page-theme-{swatch} .ui-flipswitch-active,
     .ui-bar-{swatch} .ui-flipswitch-active,
     .ui-body-{swatch} .ui-flipswitch-active,
@@ -116,24 +112,19 @@ build_swatch(swatch)
       border-color: highlight_color
       color: font_color
 
+    .ui-page-theme-{swatch} .ui-checkbox-on:after,
+    .ui-bar-{swatch} .ui-checkbox-on:after,
+    .ui-body-{swatch} .ui-checkbox-on:after,
+    body .ui-group-theme-{swatch} .ui-checkbox-on:after,
+    .ui-btn.ui-checkbox-on.ui-btn-{swatch}:after,
+      background-color: primary_color
+      border-color: primary_color
+      color: font_color
+
     .ui-page-theme-{swatch} .ui-radio-on:after,
     .ui-bar-{swatch} .ui-radio-on:after,
     .ui-body-{swatch} .ui-radio-on:after,
     body .ui-group-theme-{swatch} .ui-radio-on:after,
     .ui-btn.ui-radio-on.ui-btn-{swatch}:after
-      border-color: highlight_color
-
-    .ui-page-theme-{swatch} .ui-btn:focus,
-    .ui-bar-{swatch} .ui-btn:focus,
-    .ui-body-{swatch} .ui-btn:focus,
-    body .ui-group-theme-{swatch} .ui-btn:focus,
-    body .ui-btn.ui-btn-{swatch}:focus, 
-    .ui-page-theme-{swatch} .ui-focus,
-    .ui-bar-{swatch} .ui-focus,
-    .ui-body-{swatch} .ui-focus,
-    body .ui-group-theme-{swatch} .ui-focus,
-    body .ui-btn-{swatch}.ui-focus,
-    body .ui-body-{swatch}.ui-focus 
-      -webkit-box-shadow: 0 0 12px highlight_color
-      -moz-box-shadow: 0 0 12px highlight_color
-      box-shadow: 0 0 12px highlight_color
+      background-color: primary_color
+      color: font_color