Permalink
Browse files

Merge remote branch 'origin/master' into loading-message-tests

  • Loading branch information...
2 parents b34d37c + 6f42e55 commit 7de2a97ed60a6a8f39d5342c8c30c54d2001f33a @jakeboone02 committed Feb 10, 2012
Showing with 2,682 additions and 1,920 deletions.
  1. +43 −29 Makefile
  2. +18 −2 build/docs.build.js
  3. +12 −17 css/structure/jquery.mobile.button.css
  4. +4 −4 css/structure/jquery.mobile.core.css
  5. +2 −5 css/structure/jquery.mobile.fixedToolbar.css
  6. +5 −2 css/structure/jquery.mobile.forms.checkboxradio.css
  7. +2 −0 css/structure/jquery.mobile.forms.select.css
  8. +26 −18 css/structure/jquery.mobile.forms.slider.css
  9. +4 −0 css/structure/jquery.mobile.forms.textinput.css
  10. +4 −4 css/themes/default/jquery.mobile.theme.css
  11. +9 −1 docs/_assets/css/jqm-docs.css
  12. +40 −0 docs/api/data-attributes.html
  13. +5 −0 docs/buttons/buttons-inline.html
  14. +8 −0 docs/buttons/buttons-options.html
  15. +14 −1 docs/buttons/buttons-types.html
  16. +9 −4 docs/config/iOSFullscreen.html
  17. +9 −4 docs/config/loadingMessage.html
  18. +9 −4 docs/config/minScrollBack.html
  19. +9 −4 docs/config/pageLoadErrorMessage.html
  20. +9 −4 docs/config/pushState.html
  21. +9 −4 docs/config/touchOverflow.html
  22. +20 −4 docs/content/content-collapsible-set.html
  23. +19 −4 docs/content/content-collapsible.html
  24. +1 −0 docs/forms/checkboxes/events.html
  25. +17 −1 docs/forms/checkboxes/index.html
  26. +1 −0 docs/forms/checkboxes/methods.html
  27. +7 −1 docs/forms/checkboxes/options.html
  28. +14 −0 docs/forms/docs-forms.html
  29. +260 −0 docs/forms/forms-all-compare.html
  30. +242 −0 docs/forms/forms-all-mini.html
  31. +1 −0 docs/forms/forms-all-native.html
  32. +4 −3 docs/forms/forms-all.html
  33. +1 −0 docs/forms/forms-sample-selfsubmit.php
  34. +2 −1 docs/forms/forms-sample.html
  35. +2 −1 docs/forms/forms-themes.html
  36. +1 −0 docs/forms/index.html
  37. +2 −1 docs/forms/plugin-eventsmethods.html
  38. +1 −0 docs/forms/radiobuttons/events.html
  39. +32 −0 docs/forms/radiobuttons/index.html
  40. +1 −0 docs/forms/radiobuttons/methods.html
  41. +7 −1 docs/forms/radiobuttons/options.html
  42. +1 −0 docs/forms/search/events.html
  43. +19 −3 docs/forms/search/index.html
  44. +1 −0 docs/forms/search/methods.html
  45. +6 −1 docs/forms/search/options.html
  46. +80 −0 docs/forms/selects/custom.html
  47. +1 −0 docs/forms/selects/events.html
  48. +59 −95 docs/forms/selects/index.html
  49. +1 −0 docs/forms/selects/methods.html
  50. +7 −0 docs/forms/selects/options.html
  51. +1 −0 docs/forms/slider/events.html
  52. +55 −11 docs/forms/slider/index.html
  53. +1 −0 docs/forms/slider/methods.html
  54. +15 −1 docs/forms/slider/options.html
  55. +1 −0 docs/forms/switch/events.html
  56. +29 −8 docs/forms/switch/index.html
  57. +1 −0 docs/forms/switch/methods.html
  58. +7 −0 docs/forms/switch/options.html
  59. +1 −0 docs/forms/textinputs/events.html
  60. +22 −1 docs/forms/textinputs/index.html
  61. +1 −0 docs/forms/textinputs/methods.html
  62. +8 −0 docs/forms/textinputs/options.html
  63. +1 −1 docs/lists/docs-lists.html
  64. +2 −1 docs/lists/lists-formatting.html
  65. +1 −1 docs/lists/lists-search-with-dividers.html
  66. +2 −2 docs/lists/lists-split-purchase.html
  67. +0 −6 docs/pages/dialog-overlay.html
  68. +2 −2 docs/toolbars/bars-fixed-events.html
  69. +292 −0 docs/toolbars/bars-fixed-forms-a.html
  70. +454 −0 docs/toolbars/bars-fixed-forms.html
  71. +1 −1 docs/toolbars/bars-fixed-methods.html
  72. +10 −3 docs/toolbars/bars-fixed-options.html
  73. +27 −44 docs/toolbars/bars-fixed.html
  74. +1 −1 docs/toolbars/bars-fullscreen.html
  75. +1 −1 docs/toolbars/bars-themes.html
  76. +1 −1 docs/toolbars/docs-bars.html
  77. +1 −1 docs/toolbars/docs-footers.html
  78. +2 −2 docs/toolbars/docs-headers.html
  79. +1 −1 docs/toolbars/docs-navbar.html
  80. +28 −29 docs/toolbars/footer-persist-a.html
  81. +15 −14 docs/toolbars/footer-persist-b.html
  82. +14 −17 docs/toolbars/footer-persist-c.html
  83. +89 −0 docs/toolbars/footer-persist-d.html
  84. +1 −1 docs/toolbars/index.html
  85. +27 −0 external/requirejs/depend.js
  86. +2 −2 js/index.php
  87. +6 −4 js/jquery.mobile.buttonMarkup.js
  88. +7 −2 js/jquery.mobile.collapsible.js
  89. +1 −1 js/jquery.mobile.collapsibleSet.js
  90. +28 −13 js/jquery.mobile.controlGroup.js
  91. +23 −11 js/jquery.mobile.core.js
  92. +1 −1 js/jquery.mobile.dialog.js
  93. +1 −1 js/jquery.mobile.event.js
  94. +60 −34 js/jquery.mobile.fixedToolbar.js
  95. +7 −4 js/jquery.mobile.forms.button.js
  96. +6 −3 js/jquery.mobile.forms.checkboxradio.js
  97. +1 −0 js/jquery.mobile.forms.select.custom.js
  98. +8 −5 js/jquery.mobile.forms.select.js
  99. +26 −17 js/jquery.mobile.forms.slider.js
  100. +8 −4 js/jquery.mobile.forms.textinput.js
  101. +1 −1 js/jquery.mobile.init.js
  102. +0 −10 js/jquery.mobile.js
  103. 0 js/jquery.mobile.listview.filter.js
  104. +1 −1 js/jquery.mobile.listview.js
  105. +8 −2 js/jquery.mobile.navbar.js
  106. +11 −13 js/jquery.mobile.navigation.js
  107. +1 −1 js/jquery.mobile.navigation.pushstate.js
  108. +7 −1 js/jquery.mobile.support.js
  109. +2 −5 js/jquery.mobile.transition.js
  110. +25 −7 js/jquery.mobile.widget.js
  111. +2 −2 js/jquery.mobile.zoom.js
  112. +0 −9 js/jquery.ui.widget.js
  113. +13 −11 tests/functional/orientation.html
  114. +0 −67 tests/speed/basic-page.html
  115. +0 −429 tests/speed/lists-ul-record.php
  116. +0 −428 tests/speed/lists-ul.html
  117. +0 −59 tests/speed/stats/index.php
  118. +0 −80 tests/speed/stats/perf.js
  119. +0 −1 tests/speed/stats/rev.php
  120. +0 −67 tests/speed/stats/startup.js
  121. +0 −18 tests/speed/stats/visualize/index.html
  122. +0 −45 tests/speed/stats/visualize/visualize.css
  123. +0 −71 tests/speed/stats/visualize/visualize.js
  124. +11 −12 tests/unit/buttonMarkup/buttonMarkup_core.js
  125. +8 −0 tests/unit/buttonMarkup/index.html
  126. +16 −0 tests/unit/controlgroup/controlgroup_core.js
  127. +20 −9 tests/unit/controlgroup/index.html
  128. +6 −3 tests/unit/event/event_core.js
  129. +115 −73 tests/unit/fixedToolbar/fixedToolbar.js
  130. +14 −4 tests/unit/fixedToolbar/index.html
  131. +6 −5 tests/unit/navigation/navigation_base.js
  132. +3 −3 tests/unit/select/index.html
  133. +20 −1 tests/unit/widget/index.html
  134. +25 −0 tests/unit/widget/widget_init.js
  135. +7 −7 tests/unit/zoom/zoom.js
View
@@ -19,15 +19,31 @@ deploy: STRUCTURE = jquery.mobile.structure-${VER_OFFICIAL}
# The CSS theme being used
THEME = default
-RUN_JS = @@java -XX:ReservedCodeCacheSize=64m -classpath build/js.jar:build/google-compiler-20111003.jar org.mozilla.javascript.tools.shell.Main
-
+# If node is available then use node to run r.js
+# otherwise use good old rhino/java
+NODE = /usr/local/bin/node
+HAS_NODE = $(shell if test -x ${NODE} ;then echo true; fi)
+ifeq ($(HAS_NODE), true)
+ RUN_JS = @@${NODE}
+else
+ RUN_JS = @@java -XX:ReservedCodeCacheSize=64m -classpath build/js.jar:build/google-compiler-20111003.jar org.mozilla.javascript.tools.shell.Main
+endif
# Build Targets
# When no build target is specified, all gets ran
-all: init css js zip notify
+all: css js zip notify
+clean:
+ # -------------------------------------------------
+ # Cleaning build output
+ @@rm -rf ${OUTPUT}
+ @@rm -rf tmp
+
+# Create the output directory.
+init:
+ @@mkdir -p ${OUTPUT}
# Build and minify the CSS files
css: init
@@ -68,39 +84,34 @@ docs: init
${RUN_JS} \
external/r.js/dist/r.js \
-o build/docs.build.js \
- dir=../tmp/${NAME}
- # ... Prepend versioned license
- @@cat LICENSE-INFO.txt | ${VER} > tmp/${NAME}/LICENSE-INFO.txt
- @@cat tmp/${NAME}/LICENSE-INFO.txt | cat - tmp/${NAME}/js/jquery.mobile.docs.js > tmp/${NAME}/js/jquery.mobile.docs.js.tmp
- @@cat tmp/${NAME}/js/jquery.mobile.docs.js.tmp | ${SED_VER_API} > tmp/${NAME}/js/jquery.mobile.docs.js
- @@cat tmp/${NAME}/LICENSE-INFO.txt | cat - tmp/${NAME}/css/themes/default/${NAME}.css > tmp/${NAME}/css/themes/default/${NAME}.css.tmp
- @@mv tmp/${NAME}/css/themes/default/${NAME}.css.tmp tmp/${NAME}/css/themes/default/${NAME}.css
+ dir=../tmp/demos
+ # ... Prepend versioned license to jquery.mobile.js
+ @@cat LICENSE-INFO.txt | ${VER} > tmp/demos/LICENSE-INFO.txt
+ @@cat tmp/demos/LICENSE-INFO.txt | cat - tmp/demos/js/jquery.mobile.js > tmp/demos/js/jquery.mobile.js.tmp
+ @@cat tmp/demos/js/jquery.mobile.js.tmp | ${SED_VER_API} > tmp/demos/js/jquery.mobile.js
+ # ... Prepend versioned license to jquery.mobile.docs.js
+ @@cat tmp/demos/LICENSE-INFO.txt | cat - tmp/demos/js/jquery.mobile.docs.js > tmp/demos/js/jquery.mobile.docs.js.tmp
+ @@cat tmp/demos/js/jquery.mobile.docs.js.tmp | ${SED_VER_API} > tmp/demos/js/jquery.mobile.docs.js
+ # ... Prepend versioned license to jquery.mobile.css
+ @@cat tmp/demos/LICENSE-INFO.txt | cat - tmp/demos/css/themes/default/${NAME}.css > tmp/demos/css/themes/default/${NAME}.css.tmp
+ @@mv tmp/demos/css/themes/default/${NAME}.css.tmp tmp/demos/css/themes/default/${NAME}.css
# ... Move and zip up the the whole folder
- @@cd tmp; zip -rq ../${OUTPUT}/${NAME}.docs.zip ${NAME}
- @@mv tmp/${NAME} ${OUTPUT}/demos
+ @@rm -f ${OUTPUT}/${NAME}.docs.zip
+ @@cd tmp/demos && rm -f *.php && rm -f Makefile
+ @@cd tmp/demos && zip -rq ../../${OUTPUT}/${NAME}.docs.zip *
+ @@rm -rf ${OUTPUT}/demos && mv -f tmp/demos ${OUTPUT}
# Finish by removing the temporary files
@@rm -rf tmp
# -------------------------------------------------
-
-# Create the output directory. This is in a separate step so its not dependant on other targets
-init:
- # -------------------------------------------------
- # Building jQuery Mobile in the "${OUTPUT}" folder
- @@rm -rf ${OUTPUT}
- @@rm -rf tmp
- @@mkdir -p ${OUTPUT}
- # -------------------------------------------------
-
-
# Build and minify the JS files
js: init
# Build the JavaScript file
${RUN_JS} \
external/r.js/dist/r.js \
-o baseUrl="js" \
include=jquery.mobile \
- exclude=jquery,../external/requirejs/order,../external/requirejs/text,../external/requirejs/text!../version.txt \
+ exclude=jquery,../external/requirejs/order,../external/requirejs/depend,../external/requirejs/text,../external/requirejs/text!../version.txt \
out=${OUTPUT}/${NAME}.compiled.js \
pragmasOnSave.jqmBuildExclude=true \
wrap.startFile=build/wrap.start \
@@ -146,21 +157,24 @@ zip: init css js
# For jQuery Team Use Only
#
# -------------------------------------------------
+# NOTE the clean (which removes previous build output) has been removed to prevent a gap in service
+build_latest: css docs js zip
-# Push the latest git version to the CDN. This is done on a post commit hook
-latest: init css docs js zip
+deploy_latest:
# Time to put these on the CDN
@@scp -qr ${OUTPUT}/* jqadmin@code.origin.jquery.com:/var/www/html/code.jquery.com/mobile/latest/
# -------------------------------------------------
+# Push the latest git version to the CDN. This is done on a post commit hook
+# TODO target name preserved to avoid issues during refactor, latest -> deploy_latest
+latest: build_latest deploy_latest
+
# Build the nightly backups. This is done on a server cronjob
-nightlies: init css js docs zip
+nightlies: css js docs zip
# Time to put these on the CDN
@@mkdir -p tmp/nightlies
@@mv ${OUTPUT} tmp/nightlies/$$(date "+%Y%m%d")
@@scp -qr tmp/nightlies/* jqadmin@code.origin.jquery.com:/var/www/html/code.jquery.com/mobile/nightlies/
- # Do some cleanup to wrap it up
- @@rm -rf tmp
# -------------------------------------------------
View
@@ -20,7 +20,23 @@
modules: [
{
name: "jquery.mobile.docs",
- exclude: [ "jquery", "../external/requirejs/order" , "../external/requirejs/text", "../external/requirejs/text!../version.txt" ]
+ exclude: [
+ "jquery",
+ "../external/requirejs/depend",
+ "../external/requirejs/order",
+ "../external/requirejs/text",
+ "../external/requirejs/text!../version.txt"
+ ]
+ },
+ {
+ name: "jquery.mobile",
+ exclude: [
+ "jquery",
+ "../external/requirejs/depend",
+ "../external/requirejs/order",
+ "../external/requirejs/text",
+ "../external/requirejs/text!../version.txt"
+ ]
}
],
@@ -35,5 +51,5 @@
endFile: "wrap.end"
},
- dirExclusionRegExp: /^\.|^build|^compiled/
+ dirExclusionRegExp: /^\.|^build|^compiled|^tmp/
})
@@ -1,9 +1,11 @@
.ui-btn { display: block; text-align: center; cursor:pointer; position: relative; margin: .5em 5px; padding: 0; }
-.ui-header .ui-btn, .ui-footer .ui-btn, .ui-bar .ui-btn { display: inline-block; font-size: 13px; margin: 0; max-width: 30%; }
+.ui-mini { margin: .25em 5px; }
.ui-btn-inline { display: inline-block; }
.ui-btn-inner { padding: .6em 25px; display: block; text-overflow: ellipsis; overflow: hidden; white-space: nowrap; position: relative; zoom: 1; }
.ui-btn input, .ui-btn button { z-index: 2; }
-.ui-header .ui-btn-inner, .ui-footer .ui-btn-inner, .ui-bar .ui-btn-inner { padding: .4em 8px .5em; }
+.ui-btn-left, .ui-btn-right, .ui-btn-inline { display: inline-block; }
+.ui-btn-left .ui-btn-inner, .ui-btn-right .ui-btn-inner { padding: .55em 1.5em .5em; }
+.ui-mini .ui-btn-inner { font-size: 13px; padding: .55em 1.5em .5em; }
.ui-btn-icon-notext { width: 24px; height: 24px; }
.ui-btn-icon-notext .ui-btn-inner { padding: 2px 1px 2px 3px; }
.ui-btn-text { position: relative; z-index: 1; }
@@ -13,9 +15,9 @@
.ui-footer .ui-btn-icon-left .ui-btn-inner,
.ui-bar .ui-btn-icon-left .ui-btn-inner { padding-left: 27px; }
.ui-btn-icon-right .ui-btn-inner { padding-right: 33px; }
-.ui-header .ui-btn-icon-right .ui-btn-inner,
-.ui-footer .ui-btn-icon-right .ui-btn-inner,
-.ui-bar .ui-btn-icon-right .ui-btn-inner { padding-right: 27px; }
+
+.ui-mini .ui-btn-icon-left .ui-btn-inner { padding-left: 27px; }
+.ui-mini .ui-btn-icon-right .ui-btn-inner { padding-right: 27px; }
.ui-btn-icon-top .ui-btn-inner { padding-top: 33px; }
.ui-header .ui-btn-icon-top .ui-btn-inner,
.ui-footer .ui-btn-icon-top .ui-btn-inner,
@@ -33,18 +35,11 @@
.ui-btn-icon-right .ui-icon { right: 10px; }
.ui-btn-icon-top .ui-icon { top: 10px; }
.ui-btn-icon-bottom .ui-icon { bottom: 10px; }
-.ui-header .ui-btn-icon-left .ui-icon,
-.ui-footer .ui-btn-icon-left .ui-icon,
-.ui-bar .ui-btn-icon-left .ui-icon { left: 4px; }
-.ui-header .ui-btn-icon-right .ui-icon,
-.ui-footer .ui-btn-icon-right .ui-icon,
-.ui-bar .ui-btn-icon-right .ui-icon { right: 4px; }
-.ui-header .ui-btn-icon-top .ui-icon,
-.ui-footer .ui-btn-icon-top .ui-icon,
-.ui-bar .ui-btn-icon-top .ui-icon { top: 4px; }
-.ui-header .ui-btn-icon-bottom .ui-icon,
-.ui-footer .ui-btn-icon-bottom .ui-icon,
-.ui-bar .ui-btn-icon-bottom .ui-icon { bottom: 4px; }
+
+.ui-mini.ui-btn-icon-left .ui-icon { left: 8px; }
+.ui-mini.ui-btn-icon-right .ui-icon { right: 8px; }
+.ui-mini.ui-btn-icon-top .ui-icon { top: 8px; }
+.ui-mini.ui-btn-icon-bottom .ui-icon { bottom: 8px; }
/*hiding native button,inputs */
.ui-btn-hidden { position: absolute; top: 0; left: 0; width: 100%; height: 100%; -webkit-appearance: button; opacity: .1; cursor: pointer; background: #fff; background: rgba(255,255,255,0); filter: Alpha(Opacity=.0001); font-size: 1px; border: none; text-indent: -9999px; }
@@ -27,11 +27,11 @@ div.ui-mobile-viewport { overflow-x: hidden; }
/* loading screen */
.ui-loading .ui-loader { display: block; }
.ui-loader { display: none; z-index: 9999999; position: fixed; top: 50%; box-shadow: 0 1px 1px -1px #fff; left: 50%; border:0; }
-.ui-loader-default { background: none; opacity: .18; width: 46px; height: 46px; margin-left: -18px; margin-top: -18px; padding: 1px; -webkit-border-radius: 36px; -moz-border-radius: 36px; border-radius: 36px; }
+.ui-loader-default { background: none; opacity: .18; width: 46px; height: 46px; margin-left: -18px; margin-top: -18px; }
.ui-loader-verbose { width: 200px; opacity: .88; height: auto; margin-left: -110px; padding: 10px; }
.ui-loader-default h1 { font-size: 0; width: 0; height: 0; overflow: hidden; }
.ui-loader-verbose h1 { font-size: 16px; margin: 0; text-align: center; }
-.ui-loader .ui-icon { display: block; margin: 0; width: 46px; height: 46px; background-color: transparent; }
+.ui-loader .ui-icon { background-color: #000; display: block; margin: 0; width: 46px; height: 46px; padding: 1px; -webkit-border-radius: 36px; -moz-border-radius: 36px; border-radius: 36px; }
.ui-loader-verbose .ui-icon { margin: 0 auto 10px; }
.ui-loader-textonly { padding: 15px; margin-left: -115px; }
.ui-loader-textonly .ui-icon { display: none; }
@@ -45,8 +45,8 @@ div.ui-mobile-viewport { overflow-x: hidden; }
.ui-bar h1, .ui-bar h2, .ui-bar h3, .ui-bar h4, .ui-bar h5, .ui-bar h6 { margin: 0; padding: 0; font-size: 16px; display: inline-block; }
.ui-header, .ui-footer { position: relative; overflow: hidden; width: 100%; border-left-width: 0; border-right-width: 0; }
-.ui-header .ui-btn-left { position: absolute; left: 10px; top: .4em; }
-.ui-header .ui-btn-right { position: absolute; right: 10px; top: .4em; }
+.ui-header .ui-btn-left { position: absolute; left: 5px; top: -2px; }
+.ui-header .ui-btn-right { position: absolute; right: 5px; top: -2px; }
.ui-header .ui-title, .ui-footer .ui-title { min-height: 1.1em; text-align: center; font-size: 16px; display: block; margin: .6em 30% .8em; padding: 0; text-overflow: ellipsis; overflow: hidden; white-space: nowrap; outline: 0 !important; }
.ui-footer .ui-title { margin: .6em 15px .8em; }
@@ -5,13 +5,13 @@
right: 0;
position: fixed;
z-index: 1000;
- -webkit-transform: translateZ(0); /* Force header/footer rendering to go through the same rendering pipeline as native page scrolling. */
}
.ui-header-fixed {
top: 0;
}
.ui-footer-fixed {
- bottom: 0;
+ bottom: -1px;
+ padding-bottom: 1px;
}
.ui-header-fullscreen,
.ui-footer-fullscreen {
@@ -34,9 +34,6 @@
.ui-page-footer-fullscreen .ui-fixed-hidden {
left: -99999em;
}
-.ui-footer-duplicate {
- display: none;
-}
.ui-header-fixed .ui-btn,
.ui-footer-fixed .ui-btn {
z-index: 10;
@@ -4,7 +4,10 @@
.ui-checkbox .ui-btn-icon-left .ui-btn-inner,.ui-radio .ui-btn-icon-left .ui-btn-inner { padding-left: 45px; }
.ui-checkbox .ui-btn-icon-right .ui-btn-inner, .ui-radio .ui-btn-icon-right .ui-btn-inner { padding-right: 45px; }
.ui-checkbox .ui-icon, .ui-radio .ui-icon { top: 1.1em; }
-.ui-checkbox .ui-btn-icon-left .ui-icon, .ui-radio .ui-btn-icon-left .ui-icon {left: 15px; }
-.ui-checkbox .ui-btn-icon-right .ui-icon, .ui-radio .ui-btn-icon-right .ui-icon {right: 15px; }
+.ui-checkbox .ui-btn-icon-left .ui-icon, .ui-radio .ui-btn-icon-left .ui-icon { left: 15px; }
+.ui-checkbox .ui-mini.ui-btn-icon-left .ui-icon, .ui-radio .ui-mini.ui-btn-icon-left .ui-icon { left: 12px; }
+.ui-checkbox .ui-btn-icon-right .ui-icon, .ui-radio .ui-btn-icon-right .ui-icon { right: 15px; }
+.ui-checkbox .ui-mini.ui-btn-icon-right .ui-icon, .ui-radio .ui-mini.ui-btn-icon-right .ui-icon { right: 12px; }
+
/* input, label positioning */
.ui-checkbox input,.ui-radio input { position:absolute; left:20px; top:50%; width: 10px; height: 10px; margin:-5px 0 0 0; outline: 0 !important; z-index: 1; }
@@ -15,6 +15,8 @@
.ui-select .ui-btn-icon-right .ui-btn-inner { padding-right: 45px; }
.ui-select .ui-btn-icon-right .ui-icon { right: 15px; }
+.ui-select .ui-mini.ui-btn-icon-right .ui-icon { right: 7px; }
+
/* labels */
label.ui-select { font-size: 16px; line-height: 1.4; font-weight: normal; margin: 0 0 .3em; display: block; }
@@ -3,25 +3,33 @@ input.ui-slider-input,
.ui-field-contain input.ui-slider-input { display: inline-block; width: 50px; }
select.ui-slider-switch { display: none; }
div.ui-slider { position: relative; display: inline-block; overflow: visible; height: 15px; padding: 0; margin: 0 2% 0 20px; top: 4px; width: 65%; }
-div.ui-slider-switch { width: 99.8%; }
-.ui-field-contain div.ui-slider-switch { width: 50%; }
-a.ui-slider-handle { position: absolute; z-index: 1; top: 50%; width: 28px; height: 28px; margin-top: -15px; margin-left: -15px; outline: 0; }
-a.ui-slider-handle .ui-btn-inner { padding-left: 0; padding-right: 0; }
-@media all and (min-width: 480px){
- .ui-field-contain label.ui-slider { vertical-align: top; display: inline-block; width: 20%; margin: 0 2% 0 0; }
+div.ui-slider-mini { height: 12px; margin-left: 10px; }
+div.ui-slider-bg { border: none; height: 100%; padding-right: 8px; }
+.ui-controlgroup a.ui-slider-handle, a.ui-slider-handle { position: absolute; z-index: 1; top: 50%; width: 28px; height: 28px; margin-top: -15px; margin-left: -15px; outline: 0; }
+a.ui-slider-handle .ui-btn-inner { padding-left: 0; }
+div.ui-slider-mini a.ui-slider-handle { height: 14px; width: 14px; margin: -8px 0 0 -7px; }
+div.ui-slider-mini a.ui-slider-handle .ui-btn-inner { height: 30px; width: 30px; padding: 0; margin: -9px 0 0 -9px; }
+
+@media all and (min-width: 320px){
+ .ui-field-contain label.ui-slider { vertical-align: top; display: inline-block; width: 20%; margin: 0 2% 0 0; }
.ui-field-contain div.ui-slider { width: 43%; }
- .ui-field-contain div.ui-slider-switch { width: 35%; }
+ .ui-field-contain div.ui-slider-switch { width: 5.5em; }
}
-div.ui-slider-switch { height: 32px; overflow: hidden; margin-left: 0; }
-div.ui-slider-inneroffset { margin-left: 50%; position: absolute; top: 1px; height: 100%; width: 50%; }
+
+div.ui-slider-switch { height: 32px; margin-left: 0; width: 5em; }
a.ui-slider-handle-snapping { -webkit-transition: left 70ms linear; -moz-transition: left 70ms linear; }
-div.ui-slider-labelbg { position: absolute; top:0; margin: 0; border-width: 0; }
-div.ui-slider-switch div.ui-slider-labelbg-a { width: 60%; height: 100%; left: 0; }
-div.ui-slider-switch div.ui-slider-labelbg-b { width: 60%; height: 100%; right: 0; }
-.ui-slider-switch-a div.ui-slider-labelbg-a, .ui-slider-switch-b div.ui-slider-labelbg-b { z-index: -1; }
-.ui-slider-switch-a div.ui-slider-labelbg-b, .ui-slider-switch-b div.ui-slider-labelbg-a { z-index: 0; }
+div.ui-slider-switch .ui-slider-handle { margin-top: 1px; }
+.ui-slider-inneroffset { margin: 0 16px; position: relative; z-index: 1; }
+
+div.ui-slider-switch.ui-slider-mini { width: 4.5em; height: 29px; }
+div.ui-slider-switch.ui-slider-mini .ui-slider-inneroffset { margin: 0 15px 0 14px; }
+div.ui-slider-switch.ui-slider-mini .ui-slider-handle { width: 25px; height: 25px; margin: 1px 0 0 -13px; }
+div.ui-slider-switch.ui-slider-mini a.ui-slider-handle .ui-btn-inner { height: 30px; width: 30px; padding: 0; margin: 0; }
+
+span.ui-slider-label { position: absolute; text-align: center; width: 100%; overflow: hidden; font-size: 16px; top: 0; line-height: 2; min-height: 100%; border-width: 0; }
+.ui-slider-mini span.ui-slider-label { font-size: 14px; }
+
+span.ui-slider-label-a { z-index: 1; left: 0; text-indent: -1.5em; }
+span.ui-slider-label-b { z-index: 0; right: 0; text-indent: 1.5em;}
-div.ui-slider-switch a.ui-slider-handle { z-index: 1; width: 100%; height: 30px; margin-top: -17px; margin-left: -100%; }
-span.ui-slider-label { width: 100%; position: absolute; height: 32px; font-size: 16px; text-align: center; line-height: 1.8; background: none; border-color: transparent; }
-span.ui-slider-label-a { left: -100%; margin-right: -1px }
-span.ui-slider-label-b { right: -100%; margin-left: -1px }
+.ui-slider-inline { width: 120px; display: inline-block; }
@@ -6,7 +6,11 @@ textarea.ui-input-text { height: 50px; -webkit-transition: height 200ms linear;
.ui-icon-searchfield:after { position: absolute; left: 7px; top: 50%; margin-top: -9px; content: ""; width: 18px; height: 18px; opacity: .5; }
.ui-input-search input.ui-input-text { border: none; width: 98%; padding: .4em 0; margin: 0; display: block; background: transparent none; outline: 0 !important; }
.ui-input-search .ui-input-clear { position: absolute; right: 0; top: 50%; margin-top: -13px; }
+.ui-mini .ui-input-clear { right: -3px; }
+
.ui-input-search .ui-input-clear-hidden { display: none; }
+input.ui-mini, .ui-mini input { font-size: 14px !important; }
+textarea.ui-mini { height: 45px; }
/* orientation adjustments - incomplete!*/
@media all and (min-width: 450px){
@@ -720,7 +720,7 @@
text-decoration: none;
}
-/* Structure */
+/* Global */
/* links within "buttons"
-----------------------------------------------------------------------------------------------------------*/
@@ -1114,9 +1114,9 @@ a.ui-link-inherit {
box-shadow: inset 0px 1px 4px rgba(0,0,0,.2);
}
.ui-icon-shadow {
- -moz-box-shadow: 0px 1px 0 rgba(255,255,255,.4);
- -webkit-box-shadow: 0px 1px 0 rgba(255,255,255,.4);
- box-shadow: 0px 1px 0 rgba(255,255,255,.4);
+ -moz-box-shadow: 0px 1px 0 rgba(255,255,255,.4) /*{global-icon-shadow}*/;
+ -webkit-box-shadow: 0px 1px 0 rgba(255,255,255,.4) /*{global-icon-shadow}*/;
+ box-shadow: 0px 1px 0 rgba(255,255,255,.4) /*{global-icon-shadow}*/;
}
/* Focus state - set here for specificity (note: these classes are added by JavaScript)
@@ -23,7 +23,7 @@ pre { white-space: pre; white-space: pre-wrap; word-wrap: break-word; }
#jqm-homeheader img { width: 235px; }
img { max-width: 100%; }
-.ui-header .jqm-home { top:0.65em; }
+.ui-header .jqm-home { top: 0; }
nav { margin: 0; }
p.intro {
@@ -134,6 +134,14 @@ dd h4 { margin:15px 0 0 0; }
background-image: -o-linear-gradient(#74b042, #56A00E); /* Opera 11.10+ */
background-image: linear-gradient(#74b042, #56A00E);
}
+.ui-bar-f,
+.ui-bar-f input,
+.ui-bar-f select,
+.ui-bar-f textarea,
+.ui-bar-f button {
+ font-family: Helvetica, Arial, sans-serif /*{global-font-family}*/;
+}
+
.ui-bar-f,
.ui-bar-f .ui-link-inherit {
color: #fff;
Oops, something went wrong.

0 comments on commit 7de2a97

Please sign in to comment.