Permalink
Browse files

Merge branch 'master', remote-tracking branch 'origin' into vagrant

  • Loading branch information...
2 parents 31741de + 4db80a8 commit 46eafced24d4aa9e8af72ef0b8f191a00a3c0bcf @johnbender committed Aug 1, 2012
Showing with 9,561 additions and 3,966 deletions.
  1. +1 −1 LICENSE-INFO.txt
  2. +2 −1 MIT-LICENSE.txt
  3. +2 −2 Makefile
  4. +30 −11 README.md
  5. +2 −2 build/bin/config.sh
  6. +13 −0 build/bin/contrib.sh
  7. +6 −1 build/bin/deploy_latest.sh
  8. +6 −3 build/bin/docs.sh
  9. +2 −2 build/bin/zip.sh
  10. +71 −0 build/tasks/testswarm.js
  11. +10 −7 css/structure/jquery.mobile.button.css
  12. +15 −8 css/structure/jquery.mobile.collapsible.css
  13. +3 −2 css/structure/jquery.mobile.controlgroup.css
  14. +6 −6 css/structure/jquery.mobile.core.css
  15. +18 −16 css/structure/jquery.mobile.dialog.css
  16. +3 −5 css/structure/jquery.mobile.fixedToolbar.css
  17. +9 −6 css/structure/jquery.mobile.forms.select.css
  18. +6 −4 css/structure/jquery.mobile.forms.slider.css
  19. +11 −10 css/structure/jquery.mobile.grid.css
  20. +20 −13 css/structure/jquery.mobile.listview.css
  21. +32 −7 css/structure/jquery.mobile.navbar.css
  22. +108 −14 css/structure/jquery.mobile.popup.css
  23. +10 −1 css/structure/jquery.mobile.transition.css
  24. BIN css/themes/default/images/ajax-loader.png
  25. +124 −117 css/themes/default/jquery.mobile.theme.css
  26. +44 −21 docs/_assets/css/jqm-docs.css
  27. BIN docs/_assets/images/colorful-city.jpg
  28. BIN docs/_assets/images/firefox-logo.png
  29. BIN docs/_assets/images/photo-landscape.jpg
  30. BIN docs/_assets/images/photo-portrait.jpg
  31. BIN docs/_assets/images/version.png
  32. +8 −2 docs/_assets/js/jqm-docs.js
  33. +1 −4 docs/about/accessibility.html
  34. +1 −1 docs/about/features.html
  35. +7 −7 docs/about/getting-started.html
  36. +1 −1 docs/about/intro.html
  37. +11 −9 docs/about/platforms.html
  38. +82 −45 docs/api/data-attributes.html
  39. +8 −8 docs/api/events-nav.html
  40. +8 −8 docs/api/events.html
  41. +7 −4 docs/api/globalconfig.html
  42. +1 −1 docs/api/mediahelpers.html
  43. +3 −3 docs/api/methods.html
  44. +36 −31 docs/api/themes.html
  45. +2 −2 docs/buttons/buttons-events.html
  46. +15 −7 docs/buttons/buttons-grouped.html
  47. +4 −4 docs/buttons/buttons-icons.html
  48. +1 −1 docs/buttons/buttons-inline.html
  49. +4 −4 docs/buttons/buttons-methods.html
  50. +8 −8 docs/buttons/buttons-options.html
  51. +42 −42 docs/buttons/buttons-themes.html
  52. +28 −10 docs/buttons/buttons-types.html
  53. +32 −15 docs/buttons/index.html
  54. +1 −1 docs/content/content-collapsible-events.html
  55. +17 −2 docs/content/content-collapsible-methods.html
  56. +13 −1 docs/content/content-collapsible-options.html
  57. +1 −1 docs/content/content-collapsible-set-events.html
  58. +8 −3 docs/content/content-collapsible-set-methods.html
  59. +13 −2 docs/content/content-collapsible-set-options.html
  60. +28 −8 docs/content/content-collapsible-set.html
  61. +28 −13 docs/content/content-collapsible.html
  62. +32 −29 docs/content/content-grids.html
  63. +1 −1 docs/content/content-html.html
  64. +21 −8 docs/content/content-themes.html
  65. +30 −16 docs/content/index.html
  66. +1 −2 docs/forms/checkboxes/events.html
  67. +14 −14 docs/forms/checkboxes/index.html
  68. +1 −2 docs/forms/checkboxes/methods.html
  69. +2 −3 docs/forms/checkboxes/options.html
  70. +7 −7 docs/forms/docs-forms.html
  71. +1 −1 docs/forms/forms-all-compare.html
  72. +1 −1 docs/forms/forms-all-mini.html
  73. +1 −1 docs/forms/forms-all-native.html
  74. +1 −1 docs/forms/forms-all.html
  75. +1 −1 docs/forms/forms-sample-response.php
  76. +1 −1 docs/forms/forms-sample-selfsubmit.php
  77. +1 −1 docs/forms/forms-sample.html
  78. +8 −7 docs/forms/forms-themes.html
  79. +42 −25 docs/forms/index.html
  80. +1 −1 docs/forms/plugin-eventsmethods.html
  81. +1 −2 docs/forms/radiobuttons/events.html
  82. +28 −31 docs/forms/radiobuttons/index.html
  83. +1 −2 docs/forms/radiobuttons/methods.html
  84. +2 −3 docs/forms/radiobuttons/options.html
  85. +1 −2 docs/forms/search/events.html
  86. +11 −12 docs/forms/search/index.html
  87. +1 −2 docs/forms/search/methods.html
  88. +16 −10 docs/forms/search/options.html
  89. +3 −4 docs/forms/selects/custom.html
  90. +1 −2 docs/forms/selects/events.html
  91. +1 −2 docs/forms/selects/index.html
  92. +1 −2 docs/forms/selects/methods.html
  93. +9 −10 docs/forms/selects/options.html
  94. +36 −21 docs/forms/slider/events.html
  95. +23 −24 docs/forms/slider/index.html
  96. +1 −2 docs/forms/slider/methods.html
  97. +5 −6 docs/forms/slider/options.html
  98. +1 −2 docs/forms/switch/events.html
  99. +46 −25 docs/forms/switch/index.html
  100. +1 −2 docs/forms/switch/methods.html
  101. +4 −5 docs/forms/switch/options.html
  102. +1 −2 docs/forms/textinputs/events.html
  103. +1 −2 docs/forms/textinputs/index.html
  104. +1 −2 docs/forms/textinputs/methods.html
  105. +9 −3 docs/forms/textinputs/options.html
  106. +1 −1 docs/index.html
  107. +21 −13 docs/lists/docs-lists.html
  108. +59 −50 docs/lists/index.html
  109. +6 −3 docs/lists/lists-all-full.html
  110. +6 −3 docs/lists/lists-autodividers.html
  111. +276 −0 docs/lists/lists-collapsible.html
  112. +6 −3 docs/lists/lists-count.html
  113. +6 −3 docs/lists/lists-divider.html
  114. +8 −4 docs/lists/lists-events.html
  115. +6 −3 docs/lists/lists-formatting.html
  116. +6 −3 docs/lists/lists-forms-inset.html
  117. +6 −3 docs/lists/lists-forms.html
  118. +6 −3 docs/lists/lists-icons.html
  119. +6 −3 docs/lists/lists-inset.html
  120. +8 −4 docs/lists/lists-methods.html
  121. +6 −3 docs/lists/lists-nested.html
  122. +6 −3 docs/lists/lists-ol.html
  123. +9 −5 docs/lists/lists-options.html
  124. +6 −3 docs/lists/lists-performance.html
  125. +6 −3 docs/lists/lists-readonly-inset.html
  126. +7 −4 docs/lists/lists-readonly.html
  127. +6 −3 docs/lists/lists-search-filtertext.html
  128. +6 −3 docs/lists/lists-search-inset.html
  129. +6 −3 docs/lists/lists-search-with-dividers.html
  130. +6 −3 docs/lists/lists-search.html
  131. +38 −28 docs/lists/lists-split.html
  132. +16 −13 docs/lists/lists-themes.html
  133. +6 −3 docs/lists/lists-thumbnails.html
  134. +6 −3 docs/lists/lists-ul.html
  135. +14 −2 docs/nav.html
  136. +0 −1 docs/pages/docs-links-urltest/index.html
  137. +1 −1 docs/pages/dynamic-samples/sample-reuse-page-external.html
  138. +25 −8 docs/pages/index.html
  139. +1 −1 docs/pages/loader.html
  140. +3 −3 docs/pages/multipage-template.html
  141. +59 −59 docs/pages/page-anatomy.html
  142. +2 −2 docs/pages/page-cache.html
  143. +8 −0 docs/pages/page-customtransitions.html
  144. +32 −27 docs/pages/page-dialogs.html
  145. +1 −1 docs/pages/page-dynamic.html
  146. +2 −2 docs/pages/page-links.html
  147. +18 −17 docs/pages/page-navmodel.html
  148. +6 −6 docs/pages/page-scripting.html
  149. +3 −3 docs/pages/page-template.html
  150. +1 −1 docs/pages/page-titles.html
  151. +1 −1 docs/pages/page-transitions-dialog.html
  152. +137 −0 docs/pages/page-transitions-flash-workaround.html
  153. +1 −1 docs/pages/page-transitions-page.html
  154. +25 −7 docs/pages/page-transitions.html
  155. +11 −11 docs/pages/pages-themes.html
  156. +1 −2 docs/pages/pages-themes/theme-a.html
  157. +1 −2 docs/pages/pages-themes/theme-b.html
  158. +1 −2 docs/pages/pages-themes/theme-c.html
  159. +1 −2 docs/pages/pages-themes/theme-d.html
  160. +1 −2 docs/pages/pages-themes/theme-e.html
  161. +14 −2 docs/pages/phonegap.html
  162. +19 −7 docs/pages/popup/events.html
  163. +259 −136 docs/pages/popup/index.html
  164. +37 −0 docs/pages/popup/map.html
  165. +22 −4 docs/pages/popup/methods.html
  166. +60 −19 docs/pages/popup/options.html
  167. +14 −0 docs/pages/popup/popup-examples.css
  168. +98 −0 docs/pages/popup/popup-examples.js
  169. +277 −0 docs/pages/popup/popup-iframes.html
  170. +106 −0 docs/pages/popup/popup-images.html
  171. +128 −0 docs/pages/popup/popup-panels.html
  172. +1 −1 docs/pages/touchoverflow.html
  173. +1 −1 docs/pages/transition-success.html
  174. +3 −3 docs/toolbars/bars-fixed-options.html
  175. +1 −1 docs/toolbars/bars-fixed.html
  176. +20 −9 docs/toolbars/bars-themes.html
  177. +1 −1 docs/toolbars/docs-bars.html
  178. +1 −1 docs/toolbars/docs-footers.html
  179. +2 −2 docs/toolbars/docs-headers.html
  180. +4 −4 docs/toolbars/docs-navbar.html
  181. +35 −18 docs/toolbars/index.html
  182. +1 −2 experiments/scrollview/index.html
  183. +2,745 −50 external/r.js/dist/r.js
  184. +0 −180 external/requirejs/order.js
  185. +19 −9 external/requirejs/require.js
  186. +21 −12 grunt.js
  187. +3 −3 index.html
  188. 0 {external/requirejs → js}/depend.js
  189. +2 −2 js/events/orientationchange.js
  190. +2 −2 js/events/throttledresize.js
  191. +9 −9 js/events/touch.js
  192. +18 −18 js/index.php
  193. +7 −7 js/jquery.hashchange.js
  194. +654 −516 js/jquery.js
  195. +25 −22 js/jquery.mobile.buttonMarkup.js
  196. +5 −5 js/jquery.mobile.controlGroup.js
  197. +27 −14 js/jquery.mobile.core.js
  198. +1 −1 js/jquery.mobile.define.js
  199. +4 −4 js/jquery.mobile.degradeInputs.js
  200. +3 −4 js/jquery.mobile.docs.js
  201. +1 −1 js/jquery.mobile.fieldContain.js
  202. +3 −2 js/jquery.mobile.grid.js
  203. +34 −16 js/jquery.mobile.init.js
  204. +17 −17 js/jquery.mobile.js
  205. +1 −1 js/jquery.mobile.links.js
  206. +3 −3 js/jquery.mobile.media.js
  207. +125 −111 js/jquery.mobile.navigation.js
  208. +13 −11 js/jquery.mobile.navigation.pushstate.js
  209. +1 −1 js/jquery.mobile.nojs.js
  210. +0 −679 js/jquery.mobile.popup.js
  211. +37 −16 js/jquery.mobile.support.js
  212. +28 −17 js/jquery.mobile.transition.js
  213. +21 −19 js/jquery.mobile.vmouse.js
  214. +2 −2 js/jquery.mobile.widget.js
  215. +15 −16 js/jquery.mobile.zoom.iosorientationfix.js
  216. +14 −14 js/jquery.mobile.zoom.js
  217. +1 −1 js/jquery.tag.inserter.js
  218. 0 {external/requirejs → js}/text.js
  219. +1 −1 js/transitions/flip.js
  220. +1 −1 js/transitions/flow.js
  221. +1 −1 js/transitions/pop.js
  222. +1 −1 js/transitions/slide.js
  223. +1 −1 js/transitions/slidedown.js
  224. +1 −1 js/transitions/slidefade.js
  225. +1 −1 js/transitions/slideup.js
  226. +1 −1 js/transitions/turn.js
  227. +36 −17 js/{jquery.mobile.collapsible.js → widgets/collapsible.js}
  228. +32 −28 js/{jquery.mobile.collapsibleSet.js → widgets/collapsibleSet.js}
  229. +23 −17 js/{jquery.mobile.dialog.js → widgets/dialog.js}
  230. +59 −63 js/{jquery.mobile.fixedToolbar.js → widgets/fixedToolbar.js}
  231. +20 −20 js/{jquery.mobile.forms.button.js → widgets/forms/button.js}
  232. +13 −13 js/{jquery.mobile.forms.checkboxradio.js → widgets/forms/checkboxradio.js}
  233. +83 −61 js/{jquery.mobile.forms.select.custom.js → widgets/forms/select.custom.js}
  234. +16 −16 js/{jquery.mobile.forms.select.js → widgets/forms/select.js}
  235. +106 −67 js/{jquery.mobile.forms.slider.js → widgets/forms/slider.js}
  236. +56 −32 js/{jquery.mobile.forms.textinput.js → widgets/forms/textinput.js}
  237. +2 −2 js/{jquery.mobile.listview.autodividers.js → widgets/listview.autodividers.js}
  238. +4 −4 js/{jquery.mobile.listview.filter.js → widgets/listview.filter.js}
  239. +73 −46 js/{jquery.mobile.listview.js → widgets/listview.js}
  240. +41 −30 js/{jquery.mobile.loader.js → widgets/loader.js}
  241. +6 −10 js/{jquery.mobile.navbar.js → widgets/navbar.js}
  242. +10 −10 js/{jquery.mobile.page.js → widgets/page.js}
  243. +5 −5 js/{jquery.mobile.page.sections.js → widgets/page.sections.js}
  244. +780 −0 js/widgets/popup.js
  245. +3 −2 package.json
  246. +24 −0 tests/jquery.testHelper.js
  247. 0 tests/unit/{buttonMarkup → button-markup}/buttonMarkup_core.js
  248. +2 −2 tests/unit/{buttonMarkup → button-markup}/index.html
  249. +1 −1 tests/unit/button/index.html
  250. +7 −3 tests/unit/checkboxradio/checkboxradio_core.js
  251. +2 −2 tests/unit/checkboxradio/index.html
  252. +19 −4 tests/unit/collapsible/collapsible_core.js
  253. +55 −23 tests/unit/collapsible/index.html
  254. +1 −1 tests/unit/controlgroup/index.html
  255. 0 tests/unit/{degradeInputs → degrade-inputs}/degradeInputs.js
  256. +1 −0 tests/unit/{degradeInputs → degrade-inputs}/index.html
  257. +3 −3 tests/unit/dialog/{index-count.html → data-attr-init-tests.html}
  258. +0 −3 tests/unit/dialog/dialog_count.js
  259. +33 −23 tests/unit/dialog/dialog_events.js
  260. +3 −3 tests/unit/dialog/index.html
  261. +3 −3 tests/unit/dialog/no-hash-tests.html
  262. +24 −13 tests/unit/event/event_core.js
  263. 0 tests/unit/{fieldContain → field-contain}/fieldContain_events.js
  264. 0 tests/unit/{fieldContain → field-contain}/index.html
  265. 0 tests/unit/{fixedToolbar → fixed-toolbar}/fixedToolbar.js
  266. +2 −2 tests/unit/{fixedToolbar → fixed-toolbar}/index.html
  267. +0 −40 tests/unit/index.html
  268. +1 −1 tests/unit/init/index.html
  269. +0 −83 tests/unit/init/init_core.js
  270. +39 −6 tests/unit/listview/index.html
  271. +39 −100 tests/unit/listview/listview_core.js
  272. +103 −0 tests/unit/listview/listview_nested.js
  273. +420 −0 tests/unit/listview/nested-tests.html
  274. +30 −0 tests/unit/loader/index.html
  275. +139 −0 tests/unit/loader/loader_core.js
  276. +0 −20 tests/unit/ls.php
  277. +2 −1 tests/unit/navbar/index.html
  278. +2 −22 tests/unit/navigation/navigation_core.js
  279. +2 −2 tests/unit/page-sections/index.html
  280. +1 −1 tests/unit/page/index.html
  281. +4 −4 tests/unit/popup/index.html
Sorry, we could not display the entire diff because it was too big.
View
2 LICENSE-INFO.txt
@@ -2,7 +2,7 @@
* jQuery Mobile Framework v@VERSION
* http://jquerymobile.com
*
-* Copyright 2011 (c) jQuery Project
+* Copyright 2012 jQuery Foundation and other contributors
* Dual licensed under the MIT or GPL Version 2 licenses.
* http://jquery.org/license
*
View
3 MIT-LICENSE.txt
@@ -1,4 +1,5 @@
-Copyright (c) 2011 John Resig, http://jquery.com/
+Copyright 2012 jQuery Foundation and other contributors,
+http://jquery.com/
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
View
4 Makefile
@@ -22,11 +22,11 @@ init:
# Build and minify the CSS files
css: init
- @@node node_modules/.bin/grunt css
+ @@${ARGS} node node_modules/.bin/grunt css
# Build and minify the JS files
js: init
- @@node node_modules/.bin/grunt js
+ @@${ARGS} node node_modules/.bin/grunt js
# -------------------------------------------------
#
View
41 README.md
@@ -11,27 +11,46 @@ You can find more information about how the library works, and what it is capabl
When [submitting issues on github](https://github.com/jquery/jquery-mobile/issues/new) please include the following:
1. Issue description
-2. Sample page using our [jsbin template](http://jsbin.com/awoluv/edit#html)
+2. Sample page using our [jsbin template](http://jsbin.com/orucec/edit#html) which uses latest code
3. Steps to reproduce
4. Expected outcome
5. Actual outcome
-6. Browsers/platforms tested
-7. Library version/Location (eg, CDN or `jquerymobile.com/test/`)
+6. jQuery Mobile version
+7. Browsers/platforms tested
-Also, in the interest of creating more readable issues please include code snippets inside a triple backtick box appropriate for the JavaScript/HTML/CSS snippet you wish to discuss. More information is available at the [introduction page](http://github.github.com/github-flavored-markdown/) for github flavored markdown (see, Syntax Highlighting).
+Also, in the interest of creating more readable issues please include code snippets inside a triple backtick box appropriate for the JavaScript/HTML/CSS snippet you wish to discuss. More information is available at the [introduction page](http://github.github.com/github-flavored-markdown/) for github flavored markdown (see Syntax Highlighting).
+
+Before opening a new ticket check if the same or a similar issue already has been reported. Tip: Besides the search tool of the issue tracker you can filter issues by label.
+
+The jQuery Mobile [ThemeRoller](https://github.com/jquery/web-jquery-mobile-theme-roller) and [Download Builder](https://github.com/jquery/jquery-mobile-builder) have their own repo where you can report issues.
## Pull Requests
-When submitting a pull request for review there are few important steps you can take to ensure that it gets reviewed quickly and increase the chances that it will be merged (in order of descending importance):
+When submitting a pull request for review there are a few important steps you can take to ensure that it gets reviewed quickly and increase the chances that it will be merged (in order of descending importance):
1. Include tests (see [Testing](#testing))
2. Follow the [jQuery Core style guide](http://docs.jquery.com/JQuery_Core_Style_Guidelines)
3. Limit the scope to one Issue/Feature
4. Small focused commits, ideally less than 10 to 20 lines
5. Avoid merge commits (see Pro Git's [chapter on rebasing](http://git-scm.com/book/ch3-6.html), section [Rebasing](#rebasing) below)
+6. Add the appropriate commit message (see below)
Taken together, the above reduces the effort that's required of the contributor reviewing your pull request.
+### Commit messages
+
+Commit messages should include four components:
+* The WHERE - a single word that categorizes and provides context for the commit and its message, followed by a colon (:). This is typically the name of the plugin being worked on, but sometimes might be something like Build: or Docs:
+* The WHAT - a sufficient summary of the fix or change made (example: modified the foo to no longer bar), followed by a period (.)
+* The WHY #Num - the ticket number with a #sign so Trac creates a hyperlink (example: #1234), followed by a hyphen/dash (-)
+* The WHY Name - the name of the ticket. Notice this is different than summary of the fix. This is a short description of the issue (example: dialog: IE6 crashed when foo is set to bar)
+
+Combined into one, here's a full example:
+
+ "Dialog: modified the foo to no longer bar. Fixed #1234 - dialog: IE6 crashed when foo is set to bar"
+ \WHERE/:\------------- WHAT -------------/.\ WHY #Num /-\---------------- WHY Name ----------------/
+
+
## Build/Customization
Currently the library is shipped on the jQuery CDN/download as a single monolithic JavaScript file that depends on jQuery Core (not included) and a similarly bundled CSS file. For users we support the following build targets:
@@ -50,13 +69,13 @@ The `js` and `css` build targets require [node.js](http://nodejs.org/) and its p
With node installed you can run the `js` and `css` targets by simply issuing the following from the project root:
npm install
- node node_modules/.gin/grunt js # or css
+ node node_modules/.bin/grunt js # or css
-Note that if you have the appropriate version of [grunt](https://github.com/cowboy/grunt), our build tool, installed globally you can substitute `grunt` wherever you see `node node_modules/.gin/grunt`. For the remainder of the build documentation we will prefer the more concise `grunt`.
+Note that if you have the appropriate version of [grunt](https://github.com/cowboy/grunt), our build tool, installed globally you can substitute `grunt` wherever you see `node node_modules/.bin/grunt`. For the remainder of the build documentation we will prefer the more concise `grunt`.
If you want to use the `docs` and `zip` targets you will need bash and they can be run with the following
- grunt docs # or `grunt zip`
+ `grunt docs #` or `grunt zip`
### JavaScript
@@ -126,7 +145,7 @@ Once you have your web server setup you can point it at the project directory.
Automated testing forms the backbone of the jQuery Mobile project's QA activities. As a contributor or patch submitter you will be expected to run the test suite for the code your patches affect. Our continuous integration server will address the remainder of the test suite.
-There are two primary ways to run the test suite. First, you can run the tests individually by directing your browser to the different test pages associated with the area in which you are working. For example, to run the tests for `js/jquery.mobile.forms.slider.js` visit `$WEB_SERVER/tests/unit/slider/`. To find out which test pages are available you can list them with:
+There are two primary ways to run the test suite. Both of them require a server configured in the previously prescribed manner. The location of which will hereafter be referred to as `$WEB_SERVER` and should include the protocol. First, you can run the tests individually by directing your browser to the different test pages associated with the area in which you are working. For example, to run the tests for `js/jquery.mobile.forms.slider.js` visit `$WEB_SERVER/tests/unit/slider/`. To find out which test pages are available you can list them with:
grunt config:test:pages
@@ -140,13 +159,13 @@ You can confine the headless run to a single test page or set of test pages usin
TEST_PATH=slider JUNIT_OUTPUT=build/test-results/ ROOT_DOMAIN=$WEB_SERVER grunt test
-will only run the tests where the path contains the string `slider`, eg `tests/unit/slider/`. *NOTE* That the phantom tests currently require that the web server be running to access and run the tests properly because of the PHP dependency that many of them share. Additionally the test suite is run against many versions of jQuery using the `JQUERY` environment variable. For example if you wanted to run the test suite against both of the currently supported versions 1.6.4, and 1.7.1 the command would take the following form:
+will only run the tests where the path contains the string `slider`, eg `tests/unit/slider/`. *NOTE* that the phantom tests currently require that the web server be running to access and run the tests properly because of the PHP dependency that many of them share. Additionally the test suite is run against many versions of jQuery using the `JQUERY` environment variable. For example if you wanted to run the test suite against both of the currently supported versions 1.6.4, and 1.7.1 the command would take the following form:
JQUERY=1.6.4,1.7.1 JUNIT_OUTPUT=build/test-results/ ROOT_DOMAIN=$WEB_SERVER grunt test
### Rebasing
-Often times when working on a feature or bug fix branch it's useful to pull in the latest from the parent branch. If you're doing this _before_ submitting a pull requests it's best to use git's rebase to apply your commits onto the latest from the parent branch. For example, working on `new-feature` branch where `upstream` is the remote at `git://github.com/jquery/jquery-mobile.git`:
+Often times when working on a feature or bug fix branch it's useful to pull in the latest from the parent branch. If you're doing this _before_ submitting a pull request it's best to use git's rebase to apply your commits onto the latest from the parent branch. For example, working on `new-feature` branch where `upstream` is the remote at `git://github.com/jquery/jquery-mobile.git`:
git checkout new-feature
git fetch upstream
View
4 build/bin/config.sh
@@ -41,10 +41,10 @@ NODE=/usr/local/bin/node
RUN_JS='java -XX:ReservedCodeCacheSize=64m -classpath build/js.jar:build/google-compiler-20111003.jar org.mozilla.javascript.tools.shell.Main'
if [ -x $NODE ]; then
- RUN_JS=${NODE}
+ RUN_JS=$NODE
fi
-if [ $IS_DEPLOY_TARGET = "true" ]; then
+if [ $IS_DEPLOY_TARGET == "true" ]; then
function ver {
sed "s/v@VERSION/${VER_OFFICIAL} ${HEAD_SHA}/"
}
View
13 build/bin/contrib.sh
@@ -0,0 +1,13 @@
+set -e
+
+if [ $# -ne 2 ]; then
+ echo "please supply two versions, eg contribs.sh 1.1.0 1.1.0"
+ exit 1;
+fi
+
+format_contributors='%aN%n%cN';
+LC_ALL='C' git whatchanged $1..$2 --pretty=format:"$format_contributors" \
+| sed '/^:/ d' \
+| sed '/^$/ d' \
+| sort \
+| uniq
View
7 build/bin/deploy_latest.sh
@@ -1,4 +1,9 @@
source build/bin/config.sh
# Push the latest git version to the CDN. This is done on a post commit hook
-scp -qr $OUTPUT/* jqadmin@code.origin.jquery.com:/var/www/html/code.jquery.com/mobile/latest/
+cp -r $OUTPUT/* /var/www/html/code.jquery.com/mobile/latest/
+
+for file in `ls $OUTPUT/jquery.mobile*`; do
+ filename=`echo $file | sed "s/$OUTPUT\///"`
+ curl "http://code.origin.jquery.com/mobile/latest/$filename?reload"
+done
View
9 build/bin/docs.sh
@@ -22,8 +22,11 @@ find tmp/demos -name "*$SED_INPLACE_EXT" -exec rm {} \;
# clear out old zip files
clear_zip_files $OUTPUT
-# ... Move and zip up the the whole folder
-cd tmp/demos && mkdir -p $OUTPUT && zip -qr $OUTPUT/$BASE_NAME.docs.zip ./* && cd -
+# create the docs zip in the output directory using the demo files
+cd tmp/demos && zip -rq ../../$OUTPUT/$NAME.docs.zip * && cd -
+
+# clean out the compiled directory demos and cp the new output
rm -rf $OUTPUT/demos && mv -f tmp/demos $OUTPUT
+
# Finish by removing the temporary files
-rm -rf tmp
+rm -rf tmp
View
4 build/bin/zip.sh
@@ -8,5 +8,5 @@ cp -R $OUTPUT tmp/$NAME
# clear out old zip files
clear_zip_files tmp/$NAME
-cd tmp; zip -rq ../$OUTPUT/$NAME.zip $NAME
-rm -rf tmp
+cd tmp && zip -rq ../$OUTPUT/$NAME.zip $NAME && cd -
+rm -r tmp
View
71 build/tasks/testswarm.js
@@ -0,0 +1,71 @@
+/*jshint node: true */
+module.exports = function( grunt ) {
+
+/*
+To test these tasks locally, create a testswarm-local.json file like this, replacing the token and urls:
+
+{
+ "jquerymobile": {
+ "authUsername": "jquerymobile",
+ "authToken": "1489f0baccc7af70b15d4bee6b0498f66b1ef611",
+ "swarmUrl": "http://swarm.local/",
+ "testUrl": "http://localhost/",
+ "runMax": 1
+ }
+}
+
+Then call:
+
+ grunt config:test:pages testswarm:jquery-mobile:testswarm-local.json
+
+Adapt the second flag, the 'commit', to match files along with the testUrl property.
+ */
+
+function submit( commit, tests, configFile, done ) {
+ var test,
+ testswarm = require( "testswarm" ),
+ config = grunt.file.readJSON( configFile ).jquerymobile,
+ testBase = config.testUrl + commit + "/",
+ testUrls = [];
+ for ( test in tests ) {
+ testUrls.push( testBase + tests[ test ] );
+ }
+ testswarm({
+ url: config.swarmUrl,
+ pollInterval: 10000,
+ timeout: 1000 * 60 * 30,
+ done: done
+ }, {
+ authUsername: config.authUsername,
+ authToken: config.authToken,
+ jobName: 'jQuery Mobile commit #<a href="https://github.com/jquery/jquery-mobile/commit/' + commit + '">' + commit.substr( 0, 10 ) + '</a>',
+ runMax: config.runMax,
+ "runNames[]": Object.keys(tests),
+ "runUrls[]": testUrls,
+ "browserSets[]": ["mobile"]
+ });
+}
+
+grunt.registerTask( "testswarm", function( commit, configFile ) {
+ // TODO currently using only the first five somewhat stable testsuites
+ // need to expand this
+ var tests = grunt.config.get('global').test_paths, finalSet = [];
+
+ // exclude the base tests for now, they don't appear to play nicely with testswarm
+ tests.forEach(function( testPath ) {
+ if( ! /base\-tests/.test( testPath ) ){
+ finalSet.push( testPath );
+ }
+ });
+
+ tests = finalSet;
+
+ var test,
+ latestTests = {};
+ for ( var i = 0; i < tests.length; i++ ) {
+ latestTests[ tests[ i ].replace(/^tests\/unit\//, "") ] = tests[ i ];
+ }
+ submit( commit, latestTests, configFile, this.async() );
+});
+
+};
View
17 css/structure/jquery.mobile.button.css
@@ -1,7 +1,7 @@
.ui-btn { display: block; text-align: center; cursor:pointer; position: relative; margin: .5em 0; padding: 0; }
-.ui-btn.ui-mini { margin-top: .25em; margin-bottom: .25em; }
+.ui-mini { margin-top: .25em; margin-bottom: .25em; }
.ui-btn-left, .ui-btn-right, .ui-input-clear, .ui-btn-inline,
-.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; }
+.ui-block-a > .ui-btn, .ui-block-b > .ui-btn, .ui-block-c > .ui-btn, .ui-block-d > .ui-btn, .ui-block-e > .ui-btn { margin-right: 5px; margin-left: 5px; }
.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; }
.ui-btn input, .ui-btn button { z-index: 2; }
.ui-btn-left, .ui-btn-right, .ui-btn-inline { display: inline-block; vertical-align: middle; }
@@ -16,12 +16,12 @@
.ui-footer .ui-btn-inner,
.ui-mini .ui-btn-inner { font-size: 12.5px; padding: .55em 11px .5em; }
-.ui-header .ui-fullsize .ui-btn-inner,
-.ui-footer .ui-fullsize .ui-btn-inner { font-size: 16px; padding: .6em 25px; }
+.ui-fullsize .ui-btn-inner,
+.ui-fullsize .ui-btn-inner { font-size: 16px; padding: .6em 20px; }
.ui-btn-icon-notext { width: 24px; height: 24px; }
.ui-btn-icon-notext .ui-btn-inner { padding: 0; height: 100%; }
-.ui-btn-icon-notext .ui-btn-inner .ui-icon { margin: 2px 1px 2px 3px; }
+.ui-btn-icon-notext .ui-btn-inner .ui-icon { margin: 2px 1px 2px 3px; float: left; }
.ui-btn-text { position: relative; z-index: 1; width: 100%; -moz-user-select: none; -webkit-user-select: none; -ms-user-select: none; }
.ui-btn-icon-notext .ui-btn-text { position: absolute; left: -9999px; }
@@ -75,12 +75,15 @@
.ui-mini .ui-btn-icon-bottom .ui-icon { bottom: 5px; }
/*hiding native button,inputs */
-.ui-btn-hidden { position: absolute; top: 0; left: 0; width: 100%; height: 100%; -webkit-appearance: none; opacity: .1; cursor: pointer; background: #fff; background: rgba(255,255,255,0); filter: Alpha(Opacity=.0001); font-size: 1px; border: none; text-indent: -9999px; }
+.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; }
+/* Fixes IE/WP filter alpha opacity bugs */
+.ui-disabled .ui-btn-hidden { display: none; }
+.ui-disabled { z-index: 1; }
.ui-field-contain .ui-btn.ui-submit { margin: 0; }
label.ui-submit { font-size: 16px; line-height: 1.4; font-weight: normal; margin: 0 0 .3em; display: block; }
@media all and (min-width: 450px){
.ui-field-contain label.ui-submit { vertical-align: top; display: inline-block; width: 20%; margin: 0 2% 0 0; }
.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; }
- .ui-hide-label .ui-btn.ui-submit { width: auto; }
+ .ui-hide-label .ui-btn.ui-submit { width: auto; display: block; }
}
View
23 css/structure/jquery.mobile.collapsible.css
@@ -1,6 +1,10 @@
-.ui-collapsible { margin: .5em 0; }
-.ui-collapsible-heading { font-size: 16px; display: block; margin: 0 -8px; padding: 0; border-width: 0 0 1px 0; position: relative; }
-.ui-collapsible-heading .ui-btn { text-align: left; margin: 0; }
+.ui-collapsible-inset { margin: .5em 0; }
+.ui-collapsible-heading { font-size: 16px; display: block; margin: 0 -15px; padding: 0; position: relative; }
+.ui-collapsible-inset .ui-collapsible-heading { margin: 0; }
+.ui-collapsible-heading .ui-btn { text-align: left; margin: 0; border-left-width: 0; border-right-width: 0; }
+.ui-collapsible-inset .ui-collapsible-heading .ui-btn { border-right-width: 1px; border-left-width: 1px; }
+.ui-collapsible-collapsed + .ui-collapsible:not(.ui-collapsible-inset) .ui-collapsible-heading .ui-btn { border-top-width: 0; }
+.ui-collapsible-set .ui-collapsible:not(.ui-collapsible-inset) .ui-collapsible-heading .ui-btn { border-top-width: 1px; }
.ui-collapsible-heading .ui-btn-inner,
.ui-collapsible-heading .ui-btn-icon-left .ui-btn-inner { padding-left: 40px; }
.ui-collapsible-heading .ui-btn-icon-right .ui-btn-inner { padding-left: 12px; padding-right: 40px; }
@@ -13,13 +17,16 @@
.ui-collapsible-heading-status { position: absolute; top: -9999px; left:0px; }
.ui-collapsible-content {
display: block;
- margin: 0 -8px;
- padding: 10px 16px;
- border-top: none; /* Overrides ui-btn-up-* */
- background-image: none; /* Overrides ui-btn-up-* */
- font-weight: normal; /* Overrides ui-btn-up-* */
+ margin: 0 -15px;
+ padding: 10px 15px;
+ border-left-width: 0;
+ border-right-width: 0;
+ border-top: none; /* Overrides ui-body-* */
+ background-image: none; /* Overrides ui-body-* */
}
+.ui-collapsible-inset .ui-collapsible-content { margin: 0; border-right-width: 1px; border-left-width: 1px; }
.ui-collapsible-content-collapsed { display: none; }
.ui-collapsible-set { margin: .5em 0; }
.ui-collapsible-set .ui-collapsible { margin: -1px 0 0; }
+.ui-collapsible-set .ui-collapsible:first-child { margin-top: 0; }
View
5 css/structure/jquery.mobile.controlgroup.css
@@ -12,15 +12,16 @@
.ui-controlgroup-controls label.ui-select { position: absolute; left: -9999px; }
.ui-controlgroup .ui-btn-icon-notext { width: auto; height: auto; top: auto; }
-.ui-controlgroup .ui-btn-icon-notext .ui-btn-inner { width: 18px; height: 20px; padding: .6em 20px .6em 20px }
+.ui-controlgroup .ui-btn-icon-notext .ui-btn-inner { height: 20px; padding: .6em 20px .6em 20px }
+.ui-controlgroup-horizontal .ui-btn-icon-notext .ui-btn-inner { width: 18px; }
.ui-controlgroup.ui-mini .ui-btn-icon-notext .ui-btn-inner { height: 16px; padding: .55em 11px .5em 11px; }
.ui-controlgroup .ui-btn-icon-notext .ui-btn-inner .ui-icon { position: absolute; top: 50%; right: 50%; margin: -9px -9px 0 0; }
.ui-controlgroup-horizontal .ui-controlgroup-controls:before,
.ui-controlgroup-horizontal .ui-controlgroup-controls:after { content: ""; display: table; }
.ui-controlgroup-horizontal .ui-controlgroup-controls:after { clear: both; }
.ui-controlgroup-horizontal .ui-controlgroup-controls { zoom: 1; }
-.ui-controlgroup-horizontal .ui-btn-inner { text-align: center; line-height: 1.25; }
+.ui-controlgroup-horizontal .ui-btn-inner { text-align: center; }
.ui-controlgroup-horizontal.ui-mini .ui-btn-inner { height: 16px; line-height: 16px; }
.ui-controlgroup-horizontal .ui-btn, .ui-controlgroup-horizontal .ui-select,
.ui-controlgroup-horizontal .ui-checkbox, .ui-controlgroup-horizontal .ui-radio { float: left; clear: none; margin: 0 -1px 0 0; }
View
12 css/structure/jquery.mobile.core.css
@@ -4,7 +4,7 @@
.ui-mobile a img, .ui-mobile fieldset { border-width: 0; }
/* responsive page widths */
-.ui-mobile-viewport { margin: 0; overflow-x: visible; -webkit-text-size-adjust: none; -ms-text-size-adjust:none; -webkit-tap-highlight-color: rgba(0, 0, 0, 0); }
+.ui-mobile-viewport { margin: 0; overflow-x: visible; -webkit-text-size-adjust: none; -ms-text-size-adjust:none; -webkit-tap-highlight-color: rgba(0, 0, 0, 0); }
/* Issue #2066 */
body.ui-mobile-viewport,
div.ui-mobile-viewport { overflow-x: hidden; }
@@ -26,13 +26,13 @@ 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: -23px; margin-top: -23px; }
-.ui-loader-verbose { width: 200px; opacity: .88; height: auto; margin-left: -110px; margin-top: -43px; padding: 10px; }
+.ui-loader { display: none; z-index: 9999999; position: fixed; top: 50%; left: 50%; border:0; }
+.ui-loader-default { background: none; filter: Alpha(Opacity=18); opacity: .18; width: 46px; height: 46px; margin-left: -23px; margin-top: -23px; }
+.ui-loader-verbose { width: 200px; filter: Alpha(Opacity=88); opacity: .88; box-shadow: 0 1px 1px -1px #fff; height: auto; margin-left: -110px; margin-top: -43px; 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 { background-color: #000; display: block; margin: 0; width: 44px; height: 44px; padding: 1px; -webkit-border-radius: 36px; -moz-border-radius: 36px; border-radius: 36px; }
-.ui-loader-verbose .ui-icon { margin: 0 auto 10px; opacity: .75; }
+.ui-loader-verbose .ui-icon { margin: 0 auto 10px; filter: Alpha(Opacity=75); opacity: .75; }
.ui-loader-textonly { padding: 15px; margin-left: -115px; }
.ui-loader-textonly .ui-icon { display: none; }
.ui-loader-fakefix { position: absolute; }
@@ -44,7 +44,7 @@ div.ui-mobile-viewport { overflow-x: hidden; }
.ui-bar { font-size: 16px; margin: 0; }
.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; border-left-width: 0; border-right-width: 0; }
+.ui-header, .ui-footer { position: relative; border-left-width: 0; border-right-width: 0; zoom: 1; }
.ui-header .ui-btn-left,
.ui-header .ui-btn-right,
.ui-footer .ui-btn-left,
View
34 css/structure/jquery.mobile.dialog.css
@@ -1,30 +1,32 @@
.ui-dialog {
background: none !important; /* this is to ensure that dialog theming does not apply (by default at least) on the page div */
}
-.ui-dialog-contain { width: 92.5%; max-width: 500px; margin: 10% auto 15px auto; padding: 0; }
-.ui-dialog .ui-header {
- margin-top: 15%;
- border: none;
- overflow: hidden;
+.ui-dialog-contain {
+ width: 92.5%;
+ max-width: 500px;
+ margin: 10% auto 15px auto;
+ padding: 0;
+ position: relative;
+ top: -15px;
}
-.ui-dialog .ui-header,
-.ui-dialog .ui-content,
-.ui-dialog .ui-footer {
+.ui-dialog-contain > .ui-header,
+.ui-dialog-contain > .ui-content,
+.ui-dialog-contain > .ui-footer {
display: block;
position: relative;
width: auto;
+ margin: 0;
}
-.ui-dialog .ui-header,
-.ui-dialog .ui-footer {
+.ui-dialog-contain > .ui-header {
+ border: none;
+ overflow: hidden;
z-index: 10;
padding: 0;
}
-.ui-dialog .ui-footer {
- padding: 0 15px;
-}
-.ui-dialog .ui-content {
+.ui-dialog-contain > .ui-content {
padding: 15px;
}
-.ui-dialog {
- margin-top: -15px;
+.ui-dialog-contain > .ui-footer {
+ z-index: 10;
+ padding: 0 15px;
}
View
8 css/structure/jquery.mobile.fixedToolbar.css
@@ -7,9 +7,6 @@
position: fixed;
z-index: 1000;
}
-.ui-page-pre-in {
- opacity: 0;
-}
.ui-header-fixed {
top: 0;
}
@@ -18,13 +15,14 @@
}
.ui-header-fullscreen,
.ui-footer-fullscreen {
+ filter: Alpha(Opacity=90);
opacity: .9;
}
.ui-page-header-fixed {
- padding-top: 2.5em;
+ padding-top: 2.6875em;
}
.ui-page-footer-fixed {
- padding-bottom: 3em;
+ padding-bottom: 2.6875em;
}
.ui-page-header-fullscreen .ui-content,
.ui-page-footer-fullscreen .ui-content {
View
15 css/structure/jquery.mobile.forms.select.css
@@ -2,14 +2,17 @@
.ui-select select { position: absolute; left: -9999px; top: -9999px; }
.ui-select .ui-btn { overflow: hidden; opacity: 1; }
.ui-field-contain .ui-select .ui-btn { margin: 0; }
-/* Fixes #2588When Windows Phone 7.5 (Mango) tries to calculate a numeric opacity for a selectincluding inherit”—without explicitly specifying an opacity on the parent to give it context, a bug appears where clicking elsewhere on the page after opening the select will open the select again. */
-.ui-select .ui-btn select { cursor: pointer; -webkit-appearance: none; left: 0; top:0; width: 100%; min-height: 1.5em; min-height: 100%; height: 3em; max-height: 100%; opacity: 0; -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; filter: alpha(opacity=0); z-index: 2; }
+/* Fixes #2588: When Windows Phone 7.5 (Mango) tries to calculate a numeric opacity for a select (including "inherit") without explicitly specifying an opacity on the parent to give it context, a bug appears where clicking elsewhere on the page after opening the select will open the select again. */
+.ui-select .ui-btn select { cursor: pointer; -webkit-appearance: none; left: 0; top:0; width: 100%; min-height: 1.5em; min-height: 100%; height: 3em; max-height: 100%; filter: Alpha(Opacity=0); opacity: 0; z-index: 2; }
.ui-select .ui-disabled { opacity: .3; }
+/* Display none because of issues with IE/WP's filter alpha opacity */
+.ui-select .ui-disabled select { display: none; }
-@-moz-document url-prefix() {.ui-select .ui-btn select { opacity: 0.0001; }}
-.ui-select .ui-btn.ui-select-nativeonly { border-radius: 0; }
-.ui-select .ui-btn.ui-select-nativeonly select { opacity: 1; text-indent: 0; }
+@-moz-document url-prefix() { .ui-select .ui-btn select { opacity: 0.0001; }}
+.ui-select .ui-btn.ui-select-nativeonly { border-radius: 0; border: 0; }
+.ui-select .ui-btn.ui-select-nativeonly select { opacity: 1; text-indent: 0; display: block; }
+.ui-select .ui-disabled.ui-select-nativeonly .ui-btn-inner { opacity: 0; }
.ui-select .ui-btn-icon-right .ui-btn-inner, .ui-select .ui-li-has-count .ui-btn-inner { padding-right: 45px; }
.ui-select .ui-mini.ui-btn-icon-right .ui-btn-inner { padding-right: 32px; }
@@ -32,10 +35,10 @@ label.ui-select { font-size: 16px; line-height: 1.4; font-weight: normal; margin
.ui-selectmenu .ui-listview { margin: 0; }
.ui-selectmenu .ui-btn.ui-li-divider { cursor: default; }
.ui-selectmenu-hidden { top: -99999px; left: -9999px; }
-.ui-selectmenu-screen { position: absolute; top: 0; left: 0; width: 100%; height: 100%; z-index: 99; }
.ui-screen-hidden, .ui-selectmenu-list .ui-li .ui-icon { display: none; }
.ui-selectmenu-list .ui-li .ui-icon { display: block; }
.ui-li.ui-selectmenu-placeholder { display: none; }
+.ui-selectmenu .ui-header { margin: 0; padding: 0; }
.ui-selectmenu .ui-header .ui-title { margin: 0.6em 46px 0.8em; }
@media all and (min-width: 450px){
View
10 css/structure/jquery.mobile.forms.slider.css
@@ -1,17 +1,19 @@
label.ui-slider { font-size: 16px; line-height: 1.4; font-weight: normal; margin: 0 0 .3em; display: block; }
input.ui-slider-input,
.ui-field-contain input.ui-slider-input { display: inline-block; width: 50px; background-image: none; padding: .4em; margin: .5em 0; line-height: 1.4; font-size: 16px; outline: 0; }
+input.ui-slider-input.ui-mini,
+.ui-field-contain input.ui-slider-input.ui-mini { width: 45px; margin: .25em 0; font-size: 14px; }
.ui-field-contain input.ui-slider-input { margin: 0; }
/* To do: Exclude ui-slider-input from textinput widget initSelector. The class ui-input-text is added to the slider input and label. When this is fixed, the rule below can be deleted. */
input.ui-slider-input, .ui-field-contain input.ui-slider-input { -webkit-box-sizing: content-box; -moz-box-sizing: content-box; -ms-box-sizing: content-box; box-sizing: content-box; }
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-mini { height: 12px; margin-left: 10px; }
+div.ui-slider-mini { height: 12px; margin-left: 10px; top: 2px; }
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; }
+.ui-controlgroup a.ui-slider-handle, a.ui-slider-handle { position: absolute; z-index: 1; top: 50%; width: 28px; height: 28px; margin: -15px 0 0 -15px; outline: 0; }
a.ui-slider-handle .ui-btn-inner { padding: 0; height: 100%; }
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; }
+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; }
@media all and (min-width: 450px){
.ui-field-contain label.ui-slider { vertical-align: top; display: inline-block; width: 20%; margin: 0 2% 0 0; }
@@ -21,7 +23,7 @@ div.ui-slider-mini a.ui-slider-handle .ui-btn-inner { height: 30px; width: 30px;
div.ui-slider-switch { height: 32px; margin-left: 0; width: 5.8em; }
a.ui-slider-handle-snapping { -webkit-transition: left 70ms linear; -moz-transition: left 70ms linear; }
-div.ui-slider-switch .ui-slider-handle { margin-top: 1px; }
+div.ui-slider-switch .ui-slider-handle { margin: 1px 0 0 -15px; }
.ui-slider-inneroffset { margin: 0 16px; position: relative; z-index: 1; }
div.ui-slider-switch.ui-slider-mini { width: 5em; height: 29px; }
View
21 css/structure/jquery.mobile.grid.css
@@ -1,22 +1,23 @@
/* content configurations. */
.ui-grid-a, .ui-grid-b, .ui-grid-c, .ui-grid-d { overflow: hidden; }
-.ui-block-a, .ui-block-b, .ui-block-c, .ui-block-d, .ui-block-e { margin: 0; padding: 0; border: 0; float: left; min-height:1px;}
+.ui-block-a, .ui-block-b, .ui-block-c, .ui-block-d, .ui-block-e { margin: 0; padding: 0; border: 0; float: left; min-height: 1px; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; -ms-box-sizing: border-box; box-sizing: border-box; }
/* grid solo: 100 - single item fallback */
-.ui-grid-solo .ui-block-a { width: 100%; float: none; }
-
+.ui-grid-solo .ui-block-a { display: block; float: none; }
+/* Lower percentages for older browsers (i.e. IE7) to prevent wrapping. -.5px to fix BB5 wrap issue. */
/* grid a: 50/50 */
-.ui-grid-a .ui-block-a, .ui-grid-a .ui-block-b { width: 50%; }
+.ui-grid-a .ui-block-a, .ui-grid-a .ui-block-b { width: 49.95%; }
+.ui-grid-a > :nth-child(n) { width: 50%; margin-right: -.5px; }
.ui-grid-a .ui-block-a { clear: left; }
-
/* grid b: 33/33/33 */
-.ui-grid-b .ui-block-a, .ui-grid-b .ui-block-b, .ui-grid-b .ui-block-c { width: 33.333%; }
+.ui-grid-b .ui-block-a, .ui-grid-b .ui-block-b, .ui-grid-b .ui-block-c { width: 33.25%; }
+.ui-grid-b > :nth-child(n) { width: 33.333%; margin-right: -.5px; }
.ui-grid-b .ui-block-a { clear: left; }
-
/* grid c: 25/25/25/25 */
-.ui-grid-c .ui-block-a, .ui-grid-c .ui-block-b, .ui-grid-c .ui-block-c, .ui-grid-c .ui-block-d { width: 25%; }
+.ui-grid-c .ui-block-a, .ui-grid-c .ui-block-b, .ui-grid-c .ui-block-c, .ui-grid-c .ui-block-d { width: 24.925%; }
+.ui-grid-c > :nth-child(n) { width: 25%; margin-right: -.5px; }
.ui-grid-c .ui-block-a { clear: left; }
-
/* grid d: 20/20/20/20/20 */
-.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: 20%; }
+.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%; }
+.ui-grid-d > :nth-child(n) { width: 20%; }
.ui-grid-d .ui-block-a { clear: left; }
View
33 css/structure/jquery.mobile.listview.css
@@ -1,27 +1,32 @@
-.ui-listview { margin: 0; counter-reset: listnumbering; }
+.ui-listview { margin: 0; }
+ol.ui-listview, ol.ui-listview .ui-li-divider { counter-reset: listnumbering; }
.ui-content .ui-listview { margin: -15px; }
+.ui-collapsible-content > .ui-listview { margin: -10px -15px; }
.ui-content .ui-listview-inset { margin: 1em 0; }
+.ui-collapsible-content .ui-listview-inset { margin: .5em 0; }
.ui-listview, .ui-li { list-style:none; padding:0; }
.ui-li, .ui-li.ui-field-contain { display: block; margin:0; position: relative; overflow: visible; text-align: left; border-width: 0; border-top-width: 1px; }
.ui-li .ui-btn-text a.ui-link-inherit { text-overflow: ellipsis; overflow: hidden; white-space: nowrap; }
-.ui-li-divider, .ui-li-static { padding: .5em 15px; font-size: 14px; font-weight: bold; }
-/* Fixes #4254 to prevent inherit font-size from .ui-li-divider, .ui-li-static */
-.ui-li-divider .ui-btn-text, .ui-li-static .ui-btn-text { font-size: 16px; }
-.ui-li-divider .ui-mini .ui-btn-text, .ui-li-static .ui-mini .ui-btn-text { font-size: inherit; }
-.ui-li-divider { counter-reset: listnumbering; }
-ol.ui-listview .ui-link-inherit:before, ol.ui-listview .ui-li-static:before, .ui-li-dec { font-size: .8em; display: inline-block; padding-right: .3em; font-weight: normal;counter-increment: listnumbering; content: counter(listnumbering) ". "; }
+.ui-li-static { background-image: none; }
+.ui-li-divider { padding: .5em 15px; font-size: 14px; font-weight: bold; }
+ol.ui-listview .ui-link-inherit:before, ol.ui-listview .ui-li-static:before, .ui-li-dec { font-size: .8em; display: inline-block; padding-right: .3em; font-weight: normal; counter-increment: listnumbering; content: counter(listnumbering) ". "; }
ol.ui-listview .ui-li-jsnumbering:before { content: "" !important; } /* to avoid chance of duplication */
.ui-listview-inset .ui-li { border-right-width: 1px; border-left-width: 1px; }
-.ui-li:last-child, .ui-li.ui-field-contain:last-child { border-bottom-width: 1px; }
+.ui-li-last, .ui-li.ui-field-contain.ui-li-last { border-bottom-width: 1px; }
+.ui-collapsible [class*="ui-body"] > .ui-listview:not(.ui-listview-inset) .ui-li-last { border-bottom-width: 0; }
+.ui-collapsible-content > .ui-listview:not(.ui-listview-inset) .ui-li:first-child { border-top-width: 0; }
+.ui-collapsible-content > .ui-listview:not(.ui-listview-inset),
+.ui-collapsible-content > .ui-listview:not(.ui-listview-inset) .ui-li-last { border-bottom-left-radius: inherit; border-bottom-right-radius: inherit; }
+.ui-collapsible-content > .ui-listview:not(.ui-listview-inset) .ui-li-last .ui-li-link-alt { border-bottom-right-radius: inherit; }
.ui-li>.ui-btn-inner { display: block; position: relative; padding: 0; }
.ui-li .ui-btn-inner a.ui-link-inherit, .ui-li-static.ui-li { padding: .7em 15px; display: block; }
.ui-li-has-thumb .ui-btn-inner a.ui-link-inherit, .ui-li-static.ui-li-has-thumb { min-height: 60px; padding-left: 100px; }
-.ui-li-has-icon .ui-btn-inner a.ui-link-inherit, .ui-li-static.ui-li-has-icon { min-height: 20px; padding-left: 40px; }
+.ui-li-has-icon .ui-btn-inner a.ui-link-inherit, .ui-li-static.ui-li-has-icon { min-height: 20px; padding-left: 40px; }
.ui-li-has-count .ui-btn-inner a.ui-link-inherit, .ui-li-static.ui-li-has-count, .ui-li-divider.ui-li-has-count { padding-right: 45px; }
.ui-li-has-arrow .ui-btn-inner a.ui-link-inherit, .ui-li-static.ui-li-has-arrow { padding-right: 40px; }
.ui-li-has-arrow.ui-li-has-count .ui-btn-inner a.ui-link-inherit, .ui-li-static.ui-li-has-arrow.ui-li-has-count { padding-right: 75px; }
.ui-li-heading { font-size: 16px; font-weight: bold; display: block; margin: .6em 0; text-overflow: ellipsis; overflow: hidden; white-space: nowrap; }
-.ui-li-desc { font-size: 12px; font-weight: normal; display: block; margin: -.5em 0 .6em; text-overflow: ellipsis; overflow: hidden; white-space: nowrap; }
+.ui-li-desc { font-size: 12px; font-weight: normal; display: block; margin: -.5em 0 .6em; text-overflow: ellipsis; overflow: hidden; white-space: nowrap; }
.ui-li-thumb, .ui-listview .ui-li-icon { position: absolute; left: 1px; top: 0; max-height: 80px; max-width: 80px; }
.ui-listview .ui-li-icon { max-height: 16px; max-width: 16px; left: 10px; top: .9em; }
.ui-li-thumb, .ui-listview .ui-li-icon, .ui-li-content { float: left; margin-right: 10px; }
@@ -44,11 +49,13 @@ ol.ui-listview .ui-li-jsnumbering:before { content: "" !important; } /* to avoid
.ui-listview * .ui-btn-inner > .ui-btn > .ui-btn-inner { border-top: 0px; }
-.ui-listview-filter { border-width: 0; overflow: hidden; margin: -15px -15px 15px -15px }
+.ui-listview-filter { border-width: 0; overflow: hidden; margin: -15px -15px 15px -15px; }
+.ui-collapsible-content .ui-listview-filter { margin: -10px -15px 10px -15px; border-bottom: inherit; }
+.ui-listview-filter-inset { margin: -15px -5px; background: transparent; }
+.ui-collapsible-content .ui-listview-filter-inset { margin: -5px; border-bottom-width: 0; }
.ui-listview-filter .ui-input-search { margin: 5px; width: auto; display: block; }
-.ui-listview-filter-inset { margin: -15px -5px -15px -5px; background: transparent; }
-.ui-li.ui-screen-hidden{display:none;}
+.ui-li.ui-screen-hidden{ display:none; }
/* Odd iPad positioning issue. */
@media only screen and (min-device-width: 768px) and (max-device-width: 1024px) {
.ui-li .ui-btn-text { overflow: visible; }
View
39 css/structure/jquery.mobile.navbar.css
@@ -1,9 +1,34 @@
-.ui-navbar { overflow: hidden; }
-.ui-navbar ul { list-style:none; padding: 0; margin: 0; position: relative; display: block; border: 0;}
-.ui-navbar li .ui-btn { display: block; font-size: 12px; text-align: center; margin: 0; border-right-width: 0; max-width: 100%; }
-.ui-navbar li .ui-btn { margin-right: -1px; }
-.ui-navbar li:last-child .ui-btn { margin-right: 0; }
+.ui-navbar { max-width: 100%; }
+.ui-navbar.ui-mini { margin: 0; }
+.ui-navbar ul { list-style:none; margin: 0; padding: 0; position: relative; display: block; border: 0; max-width: 100%; overflow:hidden; }
+.ui-navbar li .ui-btn { display: block; text-align: center; margin: 0 -1px 0 0; border-right-width: 0; }
+.ui-navbar li .ui-btn-icon-right .ui-icon { right: 6px; }
+
+/* add border if not in header/footer (full width) */
+.ui-navbar li:last-child .ui-btn,
+.ui-navbar .ui-grid-duo .ui-block-b .ui-btn { margin-right: 0; border-right-width: 1px; }
+.ui-header .ui-navbar li:last-child .ui-btn,
+.ui-footer .ui-navbar li:last-child .ui-btn,
+.ui-header .ui-navbar .ui-grid-duo .ui-block-b .ui-btn,
+.ui-footer .ui-navbar .ui-grid-duo .ui-block-b .ui-btn { margin-right: -1px; border-right-width: 0; }
+.ui-navbar .ui-grid-duo li.ui-block-a:last-child .ui-btn { margin-right: -1px; border-right-width: 1px; }
.ui-header .ui-navbar li .ui-btn,
.ui-footer .ui-navbar li .ui-btn { border-top-width: 0; border-bottom-width: 0; }
-.ui-navbar .ui-btn-inner { padding-left: 2px; padding-right: 2px; }
-.ui-navbar-noicons li .ui-btn .ui-btn-inner { padding-top: .8em; padding-bottom: .9em; }
+
+/* fixing gaps caused by subpixel problem */
+.ui-header .ui-navbar .ui-grid-b li.ui-block-c .ui-btn,
+.ui-footer .ui-navbar .ui-grid-b li.ui-block-c .ui-btn { margin-right: -5px; }
+.ui-header .ui-navbar .ui-grid-c li.ui-block-d .ui-btn,
+.ui-footer .ui-navbar .ui-grid-c li.ui-block-d .ui-btn,
+.ui-header .ui-navbar .ui-grid-d li.ui-block-e .ui-btn,
+.ui-footer .ui-navbar .ui-grid-d li.ui-block-e .ui-btn { margin-right: -4px; }
+.ui-header .ui-navbar .ui-grid-b li.ui-block-c .ui-btn-icon-right .ui-icon,
+.ui-footer .ui-navbar .ui-grid-b li.ui-block-c .ui-btn-icon-right .ui-icon,
+.ui-header .ui-navbar .ui-grid-c li.ui-block-d .ui-btn-icon-right .ui-icon,
+.ui-footer .ui-navbar .ui-grid-c li.ui-block-d .ui-btn-icon-right .ui-icon,
+.ui-header .ui-navbar .ui-grid-d li.ui-block-e .ui-btn-icon-right .ui-icon,
+.ui-footer .ui-navbar .ui-grid-d li.ui-block-e .ui-btn-icon-right .ui-icon { right: 8px; }
+
+.ui-navbar li .ui-btn .ui-btn-inner { padding-top: .7em; padding-bottom: .8em }
+.ui-navbar li .ui-btn-icon-top .ui-btn-inner { padding-top: 30px; }
+.ui-navbar li .ui-btn-icon-bottom .ui-btn-inner { padding-bottom: 30px; }
View
122 css/structure/jquery.mobile.popup.css
@@ -1,21 +1,20 @@
-.ui-popup-container {
- z-index: 1100;
- display: inline-block;
- position: absolute;
- padding: 0px;
-}
-
.ui-popup-screen {
- left: 0px;
- top: 0px;
+ top: 0;
+ left: 0;
width: 100%;
height: 100%;
+ border: 0;
position: absolute;
+ filter: Alpha(Opacity=50);
opacity: 0;
- border: 0px;
z-index: 1099;
}
+.ui-popup-screen-background-hack {
+ background-color: black;
+ filter: Alpha(Opacity=0);
+}
+
@-webkit-keyframes popup-fadein {
from { opacity: 0; }
to { opacity: 0.5; }
@@ -48,8 +47,103 @@
-moz-animation-name: popup-fadeout;
}
-.ui-popup-btn-close {
- position:absolute;
- top:-15px;
- right:-15px;
+.ui-popup-container {
+ z-index: 1100;
+ display: inline-block;
+ position: absolute;
+ padding: 0;
+ outline: 0;
+}
+
+.ui-popup.ui-content,
+.ui-popup .ui-content {
+ overflow: visible;
+}
+
+.ui-popup > p,
+.ui-popup > h1,
+.ui-popup > h2,
+.ui-popup > h3,
+.ui-popup > h4,
+.ui-popup > h5,
+.ui-popup > h6 {
+ margin: .5em 7px;
+}
+.ui-popup > span {
+ display: block;
+ margin: .5em 7px;
+}
+.ui-popup .ui-title {
+ font-size: 16px;
+ font-weight: bold;
+ margin-top: .5em;
+ margin-bottom: .5em;
+}
+.ui-popup-container .ui-content > p,
+.ui-popup-container .ui-content > h1,
+.ui-popup-container .ui-content > h2,
+.ui-popup-container .ui-content > h3,
+.ui-popup-container .ui-content > h4,
+.ui-popup-container .ui-content > h5,
+.ui-popup-container .ui-content > h6 {
+ margin: .5em 0;
+}
+.ui-popup-container .ui-content > span {
+ margin: 0;
+}
+.ui-popup-container .ui-content > p:first-child,
+.ui-popup-container .ui-content > h1:first-child,
+.ui-popup-container .ui-content > h2:first-child,
+.ui-popup-container .ui-content > h3:first-child,
+.ui-popup-container .ui-content > h4:first-child,
+.ui-popup-container .ui-content > h5:first-child,
+.ui-popup-container .ui-content > h6:first-child {
+ margin-top: 0;
+}
+.ui-popup-container .ui-content > p:last-child,
+.ui-popup-container .ui-content > h1:last-child,
+.ui-popup-container .ui-content > h2:last-child,
+.ui-popup-container .ui-content > h3:last-child,
+.ui-popup-container .ui-content > h4:last-child,
+.ui-popup-container .ui-content > h5:last-child,
+.ui-popup-container .ui-content > h6:last-child {
+ margin-bottom: 0;
+}
+
+.ui-popup > img {
+ width: auto;
+ height: auto;
+ max-width: 100%;
+ max-height: 100%;
+ vertical-align: middle;
+}
+.ui-popup iframe {
+ vertical-align: middle;
+}
+
+@media all and (min-width: 450px){
+ .ui-popup .ui-field-contain label.ui-submit,
+ .ui-popup .ui-field-contain .ui-controlgroup-label,
+ .ui-popup .ui-field-contain label.ui-select,
+ .ui-popup .ui-field-contain label.ui-input-text {
+ font-size: 16px; line-height: 1.4; display: block; font-weight: normal; margin: 0 0 .3em;
+ }
+ .ui-popup .ui-field-contain .ui-btn.ui-submit,
+ .ui-popup .ui-field-contain .ui-controlgroup-controls,
+ .ui-popup .ui-field-contain .ui-select,
+ .ui-popup .ui-field-contain input.ui-input-text,
+ .ui-popup .ui-field-contain textarea.ui-input-text,
+ .ui-popup .ui-field-contain .ui-input-search {
+ width: 100%; display: block;
+ }
+}
+
+.ui-popup > .ui-btn-left,
+.ui-popup > .ui-btn-right {
+ position: absolute;
+ top: -9px;
+ margin: 0;
+ z-index: 1101;
}
+.ui-popup > .ui-btn-left { left: -9px; }
+.ui-popup > .ui-btn-right { right: -9px; }
View
11 css/structure/jquery.mobile.transition.css
@@ -4,18 +4,27 @@
width: 100%;
height: 100%;
overflow: hidden;
+ -webkit-box-sizing: border-box;
+ -moz-box-sizing: border-box;
+ box-sizing: border-box;
}
+.ui-page-pre-in {
+ opacity: 0;
+}
.in {
+ -webkit-animation-fill-mode: both;
-webkit-animation-timing-function: ease-out;
-webkit-animation-duration: 350ms;
+ -moz-animation-fill-mode: both;
-moz-animation-timing-function: ease-out;
-moz-animation-duration: 350ms;
}
-
.out {
+ -webkit-animation-fill-mode: both;
-webkit-animation-timing-function: ease-in;
-webkit-animation-duration: 225ms;
+ -moz-animation-fill-mode: both;
-moz-animation-timing-function: ease-in;
-moz-animation-duration: 225ms;
}
View
BIN css/themes/default/images/ajax-loader.png
Deleted file not rendered
View
241 css/themes/default/jquery.mobile.theme.css
@@ -5,21 +5,21 @@
.ui-bar-a {
border: 1px solid #333 /*{a-bar-border}*/;
- background: #111111 /*{a-bar-background-color}*/;
- color: #ffffff /*{a-bar-color}*/;
+ background: #111 /*{a-bar-background-color}*/;
+ color: #fff /*{a-bar-color}*/;
font-weight: bold;
- text-shadow: 0 /*{a-bar-shadow-x}*/ -1px /*{a-bar-shadow-y}*/ 1px /*{a-bar-shadow-radius}*/ #000000 /*{a-bar-shadow-color}*/;
+ text-shadow: 0 /*{a-bar-shadow-x}*/ -1px /*{a-bar-shadow-y}*/ 1px /*{a-bar-shadow-radius}*/ #000 /*{a-bar-shadow-color}*/;
background-image: -webkit-gradient(linear, left top, left bottom, from( #3c3c3c /*{a-bar-background-start}*/), to( #111 /*{a-bar-background-end}*/)); /* Saf4+, Chrome */
background-image: -webkit-linear-gradient( #3c3c3c /*{a-bar-background-start}*/, #111 /*{a-bar-background-end}*/); /* Chrome 10+, Saf5.1+ */
background-image: -moz-linear-gradient( #3c3c3c /*{a-bar-background-start}*/, #111 /*{a-bar-background-end}*/); /* FF3.6 */
background-image: -ms-linear-gradient( #3c3c3c /*{a-bar-background-start}*/, #111 /*{a-bar-background-end}*/); /* IE10 */
background-image: -o-linear-gradient( #3c3c3c /*{a-bar-background-start}*/, #111 /*{a-bar-background-end}*/); /* Opera 11.10+ */
background-image: linear-gradient( #3c3c3c /*{a-bar-background-start}*/, #111 /*{a-bar-background-end}*/);
}
-.ui-bar-a,
-.ui-bar-a input,
-.ui-bar-a select,
-.ui-bar-a textarea,
+.ui-bar-a,
+.ui-bar-a input,
+.ui-bar-a select,
+.ui-bar-a textarea,
.ui-bar-a button {
font-family: Helvetica, Arial, sans-serif /*{global-font-family}*/;
}
@@ -33,15 +33,15 @@
}
.ui-bar-a a.ui-link:visited {
- color: #2489CE /*{a-bar-link-visited}*/;
+ color: #2489ce /*{a-bar-link-visited}*/;
}
.ui-bar-a a.ui-link:hover {
- color: #2489CE /*{a-bar-link-hover}*/;
+ color: #2489ce /*{a-bar-link-hover}*/;
}
.ui-bar-a a.ui-link:active {
- color: #2489CE /*{a-bar-link-active}*/;
+ color: #2489ce /*{a-bar-link-active}*/;
}
.ui-body-a,
@@ -74,20 +74,20 @@
}
.ui-body-a .ui-link {
- color: #2489CE /*{a-body-link-color}*/;
+ color: #2489ce /*{a-body-link-color}*/;
font-weight: bold;
}
.ui-body-a .ui-link:visited {
- color: #2489CE /*{a-body-link-visited}*/;
+ color: #2489ce /*{a-body-link-visited}*/;
}
.ui-body-a .ui-link:hover {
- color: #2489CE /*{a-body-link-hover}*/;
+ color: #2489ce /*{a-body-link-hover}*/;
}
.ui-body-a .ui-link:active {
- color: #2489CE /*{a-body-link-active}*/;
+ color: #2489ce /*{a-body-link-active}*/;
}
.ui-btn-up-a {
@@ -96,29 +96,29 @@
font-weight: bold;
color: #fff /*{a-bup-color}*/;
text-shadow: 0 /*{a-bup-shadow-x}*/ 1px /*{a-bup-shadow-y}*/ 1px /*{a-bup-shadow-radius}*/ #111 /*{a-bup-shadow-color}*/;
- background-image: -webkit-gradient(linear, left top, left bottom, from( #444444 /*{a-bup-background-start}*/), to( #2d2d2d /*{a-bup-background-end}*/)); /* Saf4+, Chrome */
- background-image: -webkit-linear-gradient( #444444 /*{a-bup-background-start}*/, #2d2d2d /*{a-bup-background-end}*/); /* Chrome 10+, Saf5.1+ */
- background-image: -moz-linear-gradient( #444444 /*{a-bup-background-start}*/, #2d2d2d /*{a-bup-background-end}*/); /* FF3.6 */
- background-image: -ms-linear-gradient( #444444 /*{a-bup-background-start}*/, #2d2d2d /*{a-bup-background-end}*/); /* IE10 */
- background-image: -o-linear-gradient( #444444 /*{a-bup-background-start}*/, #2d2d2d /*{a-bup-background-end}*/); /* Opera 11.10+ */
- background-image: linear-gradient( #444444 /*{a-bup-background-start}*/, #2d2d2d /*{a-bup-background-end}*/);
+ background-image: -webkit-gradient(linear, left top, left bottom, from( #444 /*{a-bup-background-start}*/), to( #2d2d2d /*{a-bup-background-end}*/)); /* Saf4+, Chrome */
+ background-image: -webkit-linear-gradient( #444 /*{a-bup-background-start}*/, #2d2d2d /*{a-bup-background-end}*/); /* Chrome 10+, Saf5.1+ */
+ background-image: -moz-linear-gradient( #444 /*{a-bup-background-start}*/, #2d2d2d /*{a-bup-background-end}*/); /* FF3.6 */
+ background-image: -ms-linear-gradient( #444 /*{a-bup-background-start}*/, #2d2d2d /*{a-bup-background-end}*/); /* IE10 */
+ background-image: -o-linear-gradient( #444 /*{a-bup-background-start}*/, #2d2d2d /*{a-bup-background-end}*/); /* Opera 11.10+ */
+ background-image: linear-gradient( #444 /*{a-bup-background-start}*/, #2d2d2d /*{a-bup-background-end}*/);
}
.ui-btn-up-a:visited,
.ui-btn-up-a a.ui-link-inherit {
color: #fff /*{a-bup-color}*/;
}
.ui-btn-hover-a {
border: 1px solid #000 /*{a-bhover-border}*/;
- background: #444444 /*{a-bhover-background-color}*/;
+ background: #444 /*{a-bhover-background-color}*/;
font-weight: bold;
color: #fff /*{a-bhover-color}*/;
text-shadow: 0 /*{a-bhover-shadow-x}*/ 1px /*{a-bhover-shadow-y}*/ 1px /*{a-bhover-shadow-radius}*/ #111 /*{a-bhover-shadow-color}*/;
- background-image: -webkit-gradient(linear, left top, left bottom, from( #555555 /*{a-bhover-background-start}*/), to( #383838 /*{a-bhover-background-end}*/)); /* Saf4+, Chrome */
- background-image: -webkit-linear-gradient( #555555 /*{a-bhover-background-start}*/, #383838 /*{a-bhover-background-end}*/); /* Chrome 10+, Saf5.1+ */
- background-image: -moz-linear-gradient( #555555 /*{a-bhover-background-start}*/, #383838 /*{a-bhover-background-end}*/); /* FF3.6 */
- background-image: -ms-linear-gradient( #555555 /*{a-bhover-background-start}*/, #383838 /*{a-bhover-background-end}*/); /* IE10 */
- background-image: -o-linear-gradient( #555555 /*{a-bhover-background-start}*/, #383838 /*{a-bhover-background-end}*/); /* Opera 11.10+ */
- background-image: linear-gradient( #555555 /*{a-bhover-background-start}*/, #383838 /*{a-bhover-background-end}*/);
+ background-image: -webkit-gradient(linear, left top, left bottom, from( #555 /*{a-bhover-background-start}*/), to( #383838 /*{a-bhover-background-end}*/)); /* Saf4+, Chrome */
+ background-image: -webkit-linear-gradient( #555 /*{a-bhover-background-start}*/, #383838 /*{a-bhover-background-end}*/); /* Chrome 10+, Saf5.1+ */
+ background-image: -moz-linear-gradient( #555 /*{a-bhover-background-start}*/, #383838 /*{a-bhover-background-end}*/); /* FF3.6 */
+ background-image: -ms-linear-gradient( #555 /*{a-bhover-background-start}*/, #383838 /*{a-bhover-background-end}*/); /* IE10 */
+ background-image: -o-linear-gradient( #555 /*{a-bhover-background-start}*/, #383838 /*{a-bhover-background-end}*/); /* Opera 11.10+ */
+ background-image: linear-gradient( #555 /*{a-bhover-background-start}*/, #383838 /*{a-bhover-background-end}*/);
}
.ui-btn-hover-a:visited,
.ui-btn-hover-a:hover,
@@ -198,7 +198,7 @@
.ui-overlay-b {
border: 1px solid #999 /*{b-body-border}*/;
background: #f3f3f3 /*{b-body-background-color}*/;
- color: #222222 /*{b-body-color}*/;
+ color: #222 /*{b-body-color}*/;
text-shadow: 0 /*{b-body-shadow-x}*/ 1px /*{b-body-shadow-y}*/ 0 /*{b-body-shadow-radius}*/ #fff /*{b-body-shadow-color}*/;
font-weight: normal;
background-image: -webkit-gradient(linear, left top, left bottom, from( #ddd /*{b-body-background-start}*/), to( #ccc /*{b-body-background-end}*/)); /* Saf4+, Chrome */
@@ -220,24 +220,24 @@
font-family: Helvetica, Arial, sans-serif /*{global-font-family}*/;
}
.ui-body-b .ui-link-inherit {
- color: #333333 /*{b-body-color}*/;
+ color: #333 /*{b-body-color}*/;
}
.ui-body-b .ui-link {
- color: #2489CE /*{b-body-link-color}*/;
+ color: #2489ce /*{b-body-link-color}*/;
font-weight: bold;
}
.ui-body-b .ui-link:visited {
- color: #2489CE /*{b-body-link-visited}*/;
+ color: #2489ce /*{b-body-link-visited}*/;
}
.ui-body-b .ui-link:hover {
- color: #2489CE /*{b-body-link-hover}*/;
+ color: #2489ce /*{b-body-link-hover}*/;
}
.ui-body-b .ui-link:active {
- color: #2489CE /*{b-body-link-active}*/;
+ color: #2489ce /*{b-body-link-active}*/;
}
.ui-btn-up-b {
@@ -305,9 +305,9 @@
-----------------------------------------------------------------------------------------------------------*/
.ui-bar-c {
- border: 1px solid #B3B3B3 /*{c-bar-border}*/;
- background: #eeeeee /*{c-bar-background-color}*/;
- color: #3E3E3E /*{c-bar-color}*/;
+ border: 1px solid #b3b3b3 /*{c-bar-border}*/;
+ background: #eee /*{c-bar-background-color}*/;
+ color: #3e3e3e /*{c-bar-color}*/;
font-weight: bold;
text-shadow: 0 /*{c-bar-shadow-x}*/ 1px /*{c-bar-shadow-y}*/ 1px /*{c-bar-shadow-radius}*/ #fff /*{c-bar-shadow-color}*/;
background-image: -webkit-gradient(linear, left top, left bottom, from( #f0f0f0 /*{c-bar-background-start}*/), to( #ddd /*{c-bar-background-end}*/)); /* Saf4+, Chrome */
@@ -318,7 +318,7 @@
background-image: linear-gradient( #f0f0f0 /*{c-bar-background-start}*/, #ddd /*{c-bar-background-end}*/);
}
.ui-bar-c .ui-link-inherit {
- color: #3E3E3E /*{c-bar-color}*/;
+ color: #3e3e3e /*{c-bar-color}*/;
}
.ui-bar-c a.ui-link {
@@ -327,15 +327,15 @@
}
.ui-bar-c a.ui-link:visited {
- color: #2489CE /*{c-bar-link-visited}*/;
+ color: #2489ce /*{c-bar-link-visited}*/;
}
.ui-bar-c a.ui-link:hover {
- color: #2489CE /*{c-bar-link-hover}*/;
+ color: #2489ce /*{c-bar-link-hover}*/;
}
.ui-bar-c a.ui-link:active {
- color: #2489CE /*{c-bar-link-active}*/;
+ color: #2489ce /*{c-bar-link-active}*/;
}
.ui-bar-c,
@@ -348,15 +348,15 @@
.ui-body-c,
.ui-overlay-c {
border: 1px solid #aaa /*{c-body-border}*/;
- color: #333333 /*{c-body-color}*/;
+ color: #333 /*{c-body-color}*/;
text-shadow: 0 /*{c-body-shadow-x}*/ 1px /*{c-body-shadow-y}*/ 0 /*{c-body-shadow-radius}*/ #fff /*{c-body-shadow-color}*/;
background: #f9f9f9 /*{c-body-background-color}*/;
- background-image: -webkit-gradient(linear, left top, left bottom, from( #f9f9f9 /*{c-body-background-start}*/), to( #eeeeee /*{c-body-background-end}*/)); /* Saf4+, Chrome */
- background-image: -webkit-linear-gradient( #f9f9f9 /*{c-body-background-start}*/, #eeeeee /*{c-body-background-end}*/); /* Chrome 10+, Saf5.1+ */
- background-image: -moz-linear-gradient( #f9f9f9 /*{c-body-background-start}*/, #eeeeee /*{c-body-background-end}*/); /* FF3.6 */
- background-image: -ms-linear-gradient( #f9f9f9 /*{c-body-background-start}*/, #eeeeee /*{c-body-background-end}*/); /* IE10 */
- background-image: -o-linear-gradient( #f9f9f9 /*{c-body-background-start}*/, #eeeeee /*{c-body-background-end}*/); /* Opera 11.10+ */
- background-image: linear-gradient( #f9f9f9 /*{c-body-background-start}*/, #eeeeee /*{c-body-background-end}*/);
+ background-image: -webkit-gradient(linear, left top, left bottom, from( #f9f9f9 /*{c-body-background-start}*/), to( #eee /*{c-body-background-end}*/)); /* Saf4+, Chrome */
+ background-image: -webkit-linear-gradient( #f9f9f9 /*{c-body-background-start}*/, #eee /*{c-body-background-end}*/); /* Chrome 10+, Saf5.1+ */
+ background-image: -moz-linear-gradient( #f9f9f9 /*{c-body-background-start}*/, #eee /*{c-body-background-end}*/); /* FF3.6 */
+ background-image: -ms-linear-gradient( #f9f9f9 /*{c-body-background-start}*/, #eee /*{c-body-background-end}*/); /* IE10 */
+ background-image: -o-linear-gradient( #f9f9f9 /*{c-body-background-start}*/, #eee /*{c-body-background-end}*/); /* Opera 11.10+ */
+ background-image: linear-gradient( #f9f9f9 /*{c-body-background-start}*/, #eee /*{c-body-background-end}*/);
}
.ui-overlay-c {
background-image: none;
@@ -370,49 +370,49 @@
font-family: Helvetica, Arial, sans-serif /*{global-font-family}*/;
}
.ui-body-c .ui-link-inherit {
- color: #333333 /*{c-body-color}*/;
+ color: #333 /*{c-body-color}*/;
}
.ui-body-c .ui-link {
- color: #2489CE /*{c-body-link-color}*/;
+ color: #2489ce /*{c-body-link-color}*/;
font-weight: bold;
}
.ui-body-c .ui-link:visited {
- color: #2489CE /*{c-body-link-visited}*/;
+ color: #2489ce /*{c-body-link-visited}*/;
}
.ui-body-c .ui-link:hover {
- color: #2489CE /*{c-body-link-hover}*/;
+ color: #2489ce /*{c-body-link-hover}*/;
}
.ui-body-c .ui-link:active {
- color: #2489CE /*{c-body-link-active}*/;
+ color: #2489ce /*{c-body-link-active}*/;
}
.ui-btn-up-c {
border: 1px solid #ccc /*{c-bup-border}*/;
background: #eee /*{c-bup-background-color}*/;
font-weight: bold;
color: #222 /*{c-bup-color}*/;
- text-shadow: 0 /*{c-bup-shadow-x}*/ 1px /*{c-bup-shadow-y}*/ 0 /*{c-bup-shadow-radius}*/ #ffffff /*{c-bup-shadow-color}*/;
- background-image: -webkit-gradient(linear, left top, left bottom, from( #ffffff /*{c-bup-background-start}*/), to( #f1f1f1 /*{c-bup-background-end}*/)); /* Saf4+, Chrome */
- background-image: -webkit-linear-gradient( #ffffff /*{c-bup-background-start}*/, #f1f1f1 /*{c-bup-background-end}*/); /* Chrome 10+, Saf5.1+ */
- background-image: -moz-linear-gradient( #ffffff /*{c-bup-background-start}*/, #f1f1f1 /*{c-bup-background-end}*/); /* FF3.6 */
- background-image: -ms-linear-gradient( #ffffff /*{c-bup-background-start}*/, #f1f1f1 /*{c-bup-background-end}*/); /* IE10 */
- background-image: -o-linear-gradient( #ffffff /*{c-bup-background-start}*/, #f1f1f1 /*{c-bup-background-end}*/); /* Opera 11.10+ */
- background-image: linear-gradient( #ffffff /*{c-bup-background-start}*/, #f1f1f1 /*{c-bup-background-end}*/);
+ text-shadow: 0 /*{c-bup-shadow-x}*/ 1px /*{c-bup-shadow-y}*/ 0 /*{c-bup-shadow-radius}*/ #fff /*{c-bup-shadow-color}*/;
+ background-image: -webkit-gradient(linear, left top, left bottom, from( #fff /*{c-bup-background-start}*/), to( #f1f1f1 /*{c-bup-background-end}*/)); /* Saf4+, Chrome */
+ background-image: -webkit-linear-gradient( #fff /*{c-bup-background-start}*/, #f1f1f1 /*{c-bup-background-end}*/); /* Chrome 10+, Saf5.1+ */
+ background-image: -moz-linear-gradient( #fff /*{c-bup-background-start}*/, #f1f1f1 /*{c-bup-background-end}*/); /* FF3.6 */
+ background-image: -ms-linear-gradient( #fff /*{c-bup-background-start}*/, #f1f1f1 /*{c-bup-background-end}*/); /* IE10 */
+ background-image: -o-linear-gradient( #fff /*{c-bup-background-start}*/, #f1f1f1 /*{c-bup-background-end}*/); /* Opera 11.10+ */
+ background-image: linear-gradient( #fff /*{c-bup-background-start}*/, #f1f1f1 /*{c-bup-background-end}*/);
}
.ui-btn-up-c:visited,
.ui-btn-up-c a.ui-link-inherit {
- color: #2F3E46 /*{c-bup-color}*/;
+ color: #2f3e46 /*{c-bup-color}*/;
}
.ui-btn-hover-c {
border: 1px solid #bbb /*{c-bhover-border}*/;
background: #dfdfdf /*{c-bhover-background-color}*/;
font-weight: bold;
color: #222 /*{c-bhover-color}*/;
- text-shadow: 0 /*{c-bhover-shadow-x}*/ 1px /*{c-bhover-shadow-y}*/ 0 /*{c-bhover-shadow-radius}*/ #ffffff /*{c-bhover-shadow-color}*/;
+ text-shadow: 0 /*{c-bhover-shadow-x}*/ 1px /*{c-bhover-shadow-y}*/ 0 /*{c-bhover-shadow-radius}*/ #fff /*{c-bhover-shadow-color}*/;
background-image: -webkit-gradient(linear, left top, left bottom, from( #f6f6f6 /*{c-bhover-background-start}*/), to( #e0e0e0 /*{c-bhover-background-end}*/)); /* Saf4+, Chrome */
background-image: -webkit-linear-gradient( #f6f6f6 /*{c-bhover-background-start}*/, #e0e0e0 /*{c-bhover-background-end}*/); /* Chrome 10+, Saf5.1+ */
background-image: -moz-linear-gradient( #f6f6f6 /*{c-bhover-background-start}*/, #e0e0e0 /*{c-bhover-background-end}*/); /* FF3.6 */
@@ -423,14 +423,14 @@
.ui-btn-hover-c:visited,
.ui-btn-hover-c:hover,
.ui-btn-hover-c a.ui-link-inherit {
- color: #2F3E46 /*{c-bhover-color}*/;
+ color: #2f3e46 /*{c-bhover-color}*/;
}
.ui-btn-down-c {
border: 1px solid #bbb /*{c-bdown-border}*/;
background: #d6d6d6 /*{c-bdown-background-color}*/;
font-weight: bold;
color: #222 /*{c-bdown-color}*/;
- text-shadow: 0 /*{c-bdown-shadow-x}*/ 1px /*{c-bdown-shadow-y}*/ 0 /*{c-bdown-shadow-radius}*/ #ffffff /*{c-bdown-shadow-color}*/;
+ text-shadow: 0 /*{c-bdown-shadow-x}*/ 1px /*{c-bdown-shadow-y}*/ 0 /*{c-bdown-shadow-radius}*/ #fff /*{c-bdown-shadow-color}*/;
background-image: -webkit-gradient(linear, left top, left bottom, from( #d0d0d0 /*{c-bdown-background-start}*/), to( #dfdfdf /*{c-bdown-background-end}*/)); /* Saf4+, Chrome */
background-image: -webkit-linear-gradient( #d0d0d0 /*{c-bdown-background-start}*/, #dfdfdf /*{c-bdown-background-end}*/); /* Chrome 10+, Saf5.1+ */
background-image: -moz-linear-gradient( #d0d0d0 /*{c-bdown-background-start}*/, #dfdfdf /*{c-bdown-background-end}*/); /* FF3.6 */
@@ -441,7 +441,7 @@
.ui-btn-down-c:visited,
.ui-btn-down-c:hover,
.ui-btn-down-c a.ui-link-inherit {
- color: #2F3E46 /*{c-bdown-color}*/;
+ color: #2f3e46 /*{c-bdown-color}*/;
}
.ui-btn-up-c,
.ui-btn-hover-c,
@@ -475,33 +475,33 @@
font-family: Helvetica, Arial, sans-serif /*{global-font-family}*/;
}
.ui-bar-d .ui-link-inherit {
- color: #333333 /*{d-bar-color}*/;
+ color: #333 /*{d-bar-color}*/;
}
.ui-bar-d a.ui-link {
- color: #2489CE /*{d-bar-link-color}*/;
+ color: #2489ce /*{d-bar-link-color}*/;
font-weight: bold;
}
.ui-bar-d a.ui-link:visited {
- color: #2489CE /*{d-bar-link-visited}*/;
+ color: #2489ce /*{d-bar-link-visited}*/;
}
.ui-bar-d a.ui-link:hover {
- color: #2489CE /*{d-bar-link-hover}*/;
+ color: #2489ce /*{d-bar-link-hover}*/;
}
.ui-bar-d a.ui-link:active {
- color: #2489CE /*{d-bar-link-active}*/;
+ color: #2489ce /*{d-bar-link-active}*/;
}
.ui-body-d,
.ui-overlay-d {
border: 1px solid #bbb /*{d-body-border}*/;
- color: #333333 /*{d-body-color}*/;
+ color: #333 /*{d-body-color}*/;
text-shadow: 0 /*{d-body-shadow-x}*/ 1px /*{d-body-shadow-y}*/ 0 /*{d-body-shadow-radius}*/ #fff /*{d-body-shadow-color}*/;
- background: #ffffff /*{d-body-background-color}*/;
- background-image: -webkit-gradient(linear, left top, left bottom, from( #fff), to( #fff /*{d-body-background-end}*/)); /* Saf4+, Chrome */
+ background: #fff /*{d-body-background-color}*/;
+ background-image: -webkit-gradient(linear, left top, left bottom, from( #fff /*{d-body-background-start}*/), to( #fff /*{d-body-background-end}*/)); /* Saf4+, Chrome */
background-image: -webkit-linear-gradient( #fff /*{d-body-background-start}*/, #fff /*{d-body-background-end}*/); /* Chrome 10+, Saf5.1+ */
background-image: -moz-linear-gradient( #fff /*{d-body-background-start}*/, #fff /*{d-body-background-end}*/); /* FF3.6 */
background-image: -ms-linear-gradient( #fff /*{d-body-background-start}*/, #fff /*{d-body-background-end}*/); /* IE10 */
@@ -520,24 +520,24 @@
font-family: Helvetica, Arial, sans-serif /*{global-font-family}*/;
}
.ui-body-d .ui-link-inherit {
- color: #333333 /*{d-body-color}*/;
+ color: #333 /*{d-body-color}*/;
}
.ui-body-d .ui-link {
- color: #2489CE /*{d-body-link-color}*/;
+ color: #2489ce /*{d-body-link-color}*/;
font-weight: bold;
}
.ui-body-d .ui-link:visited {
- color: #2489CE /*{d-body-link-visited}*/;
+ color: #2489ce /*{d-body-link-visited}*/;
}
.ui-body-d .ui-link:hover {
- color: #2489CE /*{d-body-link-hover}*/;
+ color: #2489ce /*{d-body-link-hover}*/;
}
.ui-body-d .ui-link:active {
- color: #2489CE /*{d-body-link-active}*/;
+ color: #2489ce /*{d-body-link-active}*/;
}
.ui-btn-up-d {
@@ -546,7 +546,7 @@
font-weight: bold;
color: #333 /*{d-bup-color}*/;
text-shadow: 0 /*{d-bup-shadow-x}*/ 1px /*{d-bup-shadow-y}*/ 0 /*{d-bup-shadow-radius}*/ #fff /*{d-bup-shadow-color}*/;
- background-image: -webkit-gradient(linear, left top, left bottom, from( #fafafa), to( #f6f6f6 /*{d-bup-background-end}*/)); /* Saf4+, Chrome */
+ background-image: -webkit-gradient(linear, left top, left bottom, from( #fafafa /*{d-bup-background-start}*/), to( #f6f6f6 /*{d-bup-background-end}*/)); /* Saf4+, Chrome */
background-image: -webkit-linear-gradient( #fafafa /*{d-bup-background-start}*/, #f6f6f6 /*{d-bup-background-end}*/); /* Chrome 10+, Saf5.1+ */
background-image: -moz-linear-gradient( #fafafa /*{d-bup-background-start}*/, #f6f6f6 /*{d-bup-background-end}*/); /* FF3.6 */
background-image: -ms-linear-gradient( #fafafa /*{d-bup-background-start}*/, #f6f6f6 /*{d-bup-background-end}*/); /* IE10 */
@@ -559,12 +559,12 @@
}
.ui-btn-hover-d {
border: 1px solid #aaa /*{d-bhover-border}*/;
- background: #eeeeee /*{d-bhover-background-color}*/;
+ background: #eee /*{d-bhover-background-color}*/;
font-weight: bold;
color: #333 /*{d-bhover-color}*/;
cursor: pointer;
text-shadow: 0 /*{d-bhover-shadow-x}*/ 1px /*{d-bhover-shadow-y}*/ 0 /*{d-bhover-shadow-radius}*/ #fff /*{d-bhover-shadow-color}*/;
- background-image: -webkit-gradient(linear, left top, left bottom, from( #eee), to( #fff /*{d-bhover-background-end}*/)); /* Saf4+, Chrome */
+ background-image: -webkit-gradient(linear, left top, left bottom, from( #eee /*{d-bhover-background-start}*/), to( #fff /*{d-bhover-background-end}*/)); /* Saf4+, Chrome */
background-image: -webkit-linear-gradient( #eee /*{d-bhover-background-start}*/, #fff /*{d-bhover-background-end}*/); /* Chrome 10+, Saf5.1+ */
background-image: -moz-linear-gradient( #eee /*{d-bhover-background-start}*/, #fff /*{d-bhover-background-end}*/); /* FF3.6 */
background-image: -ms-linear-gradient( #eee /*{d-bhover-background-start}*/, #fff /*{d-bhover-background-end}*/); /* IE10 */
@@ -581,7 +581,7 @@
background: #eee /*{d-bdown-background-color}*/;
font-weight: bold;
color: #333 /*{d-bdown-color}*/;
- text-shadow: 0 /*{d-bdown-shadow-x}*/ 1px /*{d-bdown-shadow-y}*/ 0 /*{d-bdown-shadow-radius}*/ #ffffff /*{d-bdown-shadow-color}*/;
+ text-shadow: 0 /*{d-bdown-shadow-x}*/ 1px /*{d-bdown-shadow-y}*/ 0 /*{d-bdown-shadow-radius}*/ #fff /*{d-bdown-shadow-color}*/;
background-image: -webkit-gradient(linear, left top, left bottom, from( #e5e5e5 /*{d-bdown-background-start}*/), to( #f2f2f2 /*{d-bdown-background-end}*/)); /* Saf4+, Chrome */
background-image: -webkit-linear-gradient( #e5e5e5 /*{d-bdown-background-start}*/, #f2f2f2 /*{d-bdown-background-end}*/); /* Chrome 10+, Saf5.1+ */
background-image: -moz-linear-gradient( #e5e5e5 /*{d-bdown-background-start}*/, #f2f2f2 /*{d-bdown-background-end}*/); /* FF3.6 */
@@ -606,7 +606,7 @@
-----------------------------------------------------------------------------------------------------------*/
.ui-bar-e {
- border: 1px solid #F7C942 /*{e-bar-border}*/;
+ border: 1px solid #f7c942 /*{e-bar-border}*/;
background: #fadb4e /*{e-bar-background-color}*/;
color: #333 /*{e-bar-color}*/;