/jquery-mobile

Permalink
Browse files

Toolbar: Implement classes option 

Fixes gh-7687
Closes gh-8114
1 parent 18f65ae commit 24c072bdaef68fcf729716cf4a7e0de3e15047f3 @cgack cgack committed with arschmitz Feb 26, 2015
Unified Split
Showing with 1,394 additions and 1,303 deletions.
  1. +12 −3 build/tasks/options/jscs.js
  2. +22 −81 css/structure/jquery.mobile.core.css
  3. +23 −23 css/structure/jquery.mobile.fixedToolbar.css
  4. +1 −0 css/structure/jquery.mobile.structure.css
  5. +58 −0 css/structure/jquery.mobile.toolbar.css
  6. +2 −2 demos/_search/index.php
  7. +4 −4 demos/backbone-requirejs/backbone-require.html
  8. +2 −2 demos/backbone-requirejs/index.php
  9. +2 −2 demos/body-bar-classes/index.php
  10. +2 −2 demos/button/index.php
  11. +2 −2 demos/checkboxradio-checkbox/index.php
  12. +2 −2 demos/checkboxradio-radio/index.php
  13. +2 −2 demos/collapsible-dynamic/index.php
  14. +2 −2 demos/collapsible/index.php
  15. +2 −2 demos/collapsibleset/index.php
  16. +2 −2 demos/controlgroup-dynamic/index.php
  17. +2 −2 demos/controlgroup/index.php
  18. +2 −2 demos/datepicker/index.php
  19. +2 −2 demos/external-widgets/index.php
  20. +2 −2 demos/external-widgets/info.php
  21. +2 −2 demos/external-widgets/page-b.php
  22. +2 −2 demos/external-widgets/page-c.php
  23. +2 −2 demos/external-widgets/page-d.php
  24. +2 −2 demos/filterable/index.php
  25. +2 −2 demos/flipswitch/index.php
  26. +2 −2 demos/forms-disabled/index.php
  27. +2 −2 demos/forms-field-contain/index.php
  28. +2 −2 demos/forms-gallery/index.php
  29. +2 −2 demos/forms-label-hidden-accessible/index.php
  30. +2 −2 demos/forms/index.php
  31. +2 −2 demos/grids-buttons/index.php
  32. +2 −2 demos/grids-custom-responsive/index.php
  33. +2 −2 demos/grids/index.php
  34. +2 −2 demos/icons-grunticon/index.php
  35. +2 −2 demos/icons/index.php
  36. +2 −2 demos/index.php
  37. +3 −3 demos/intro/index.php
  38. +2 −2 demos/listview-autocomplete-remote/index.php
  39. +2 −2 demos/listview-autocomplete/index.php
  40. +2 −2 demos/listview-autodividers-linkbar/autodividers-linkbar-demo.html
  41. +4 −4 demos/listview-autodividers-linkbar/index.php
  42. +2 −2 demos/listview-autodividers-selector/index.php
  43. +2 −2 demos/listview-collapsible-item-flat/index.php
  44. +2 −2 demos/listview-collapsible-item-indented/index.php
  45. +3 −3 demos/listview-grid/index.php
  46. +1 −1 demos/listview-grid/listview-grid.html
  47. +2 −2 demos/listview-nested-lists/index.php
  48. +2 −2 demos/listview/index.php
  49. +2 −2 demos/loader/index.php
  50. +3 −3 demos/map-geolocation/index.php
  51. +3 −3 demos/map-list-toggle/index.php
  52. +12 −12 demos/navbar/index.php
  53. +4 −4 demos/navigation-hash-processing/index.php
  54. +2 −2 demos/navigation-linking-pages/index.php
  55. +2 −2 demos/navigation-php-redirect/index.php
  56. +1 −1 demos/navigation-php-redirect/redirect-target.php
  57. +2 −2 demos/navigation/index.php
  58. +2 −2 demos/old-faq-pages/controls-in-header-footer.php
  59. +2 −2 demos/old-faq-pages/disabling-a-button-does-not-work.php
  60. +2 −2 demos/old-faq-pages/dom-ready-not-working.php
  61. +2 −2 demos/old-faq-pages/how-can-i-stop-auto-enhancement-of-a-block-of-elements.php
  62. +2 −2 demos/old-faq-pages/how-can-i-stop-auto-enhancement-of-elements.php
  63. +2 −2 demos/old-faq-pages/how-configure-phonegap-cordova.php
  64. +2 −2 demos/old-faq-pages/how-do-i-control-page-titles.php
  65. +2 −2 demos/old-faq-pages/how-do-i-load-a-page.php
  66. +2 −2 demos/old-faq-pages/how-do-i-scroll-to-a-position.php
  67. +2 −2 demos/old-faq-pages/how-do-i-turn-off-url-hiding.php
  68. +2 −2 demos/old-faq-pages/how-do-i-use-touch-mouse-events.php
  69. +2 −2 demos/old-faq-pages/how-does-theming-work.php
  70. +2 −2 demos/old-faq-pages/injected-content-is-not-enhanced.php
  71. +2 −2 demos/old-faq-pages/my-html-5-inputs-look-different-in-browsers.php
  72. +2 −2 demos/old-faq-pages/my-range-search-input-type-is-being-changed.php
  73. +2 −2 demos/old-faq-pages/pass-query-params-to-page.php
  74. +2 −2 demos/old-faq-pages/pass-via-the-hash-to-page.php
  75. +2 −2 demos/old-faq-pages/scripts-and-styles-not-loading.php
  76. +2 −2 demos/old-faq-pages/sometimes-custom-select-shows-as-dialog-popup.php
  77. +2 −2 demos/old-faq-pages/the-application-cache-is-not-working.php
  78. +2 −2 demos/old-faq-pages/triggering-create-on-injected-content-does-not-work.php
  79. +2 −2 demos/old-faq-pages/updating-the-value-of-enhanced-form-elements-does-not-work.php
  80. +2 −2 demos/old-faq-pages/why-is-only-the-first-page-loaded.php
  81. +2 −2 demos/old-faq-pages/why-wont-my-css-styles-apply-correctly-to-a-widget.php
  82. +2 −2 demos/page-events/alertevents-2.php
  83. +2 −2 demos/page-events/alertevents-3.php
  84. +2 −2 demos/page-events/alertevents.php
  85. +2 −2 demos/page-events/index.php
  86. +2 −2 demos/page-events/logevents-2.php
  87. +2 −2 demos/page-events/logevents-3.php
  88. +2 −2 demos/page-events/logevents.php
  89. +1 −1 demos/pages-dialog/dialog-alt.html
  90. +1 −1 demos/pages-dialog/dialog-corners.html
  91. +1 −1 demos/pages-dialog/dialog-noclosebtn.html
  92. +1 −1 demos/pages-dialog/dialog-overlay.html
  93. +1 −1 demos/pages-dialog/dialog-rightclosebtn.html
  94. +2 −2 demos/pages-dialog/dialog-with-select.html
  95. +1 −1 demos/pages-dialog/dialog.html
  96. +2 −2 demos/pages-dialog/index.php
  97. +6 −6 demos/pages-multi-page/index.html
  98. +2 −2 demos/pages-single-page/index.html
  99. +5 −5 demos/pages/index.php
  100. +2 −2 demos/pages/samepagetransition.html
  101. +1 −1 demos/pages/startpage.html
  102. +2 −2 demos/panel-external-internal/index.html
  103. +2 −2 demos/panel-external-internal/page-b.html
  104. +2 −2 demos/panel-external-internal/page-c.html
  105. +1 −1 demos/panel-external/index.php
  106. +1 −1 demos/panel-external/page-b.php
  107. +3 −3 demos/panel-fixed/index.php
  108. +2 −2 demos/panel-responsive/index.php
  109. +3 −3 demos/panel-styling/index.php
  110. +3 −3 demos/panel-swipe-open/index.php
  111. +2 −2 demos/panel/index.php
  112. +2 −2 demos/popup-alignment/index.php
  113. +2 −2 demos/popup-arrow-size/index.php
  114. +4 −4 demos/popup-dynamic/index.php
  115. +2 −2 demos/popup-iframe/index.php
  116. +2 −2 demos/popup-image-scaling/index.php
  117. +4 −4 demos/popup-outside-multipage/index.php
  118. +4 −4 demos/popup/index.php
  119. +2 −2 demos/rangeslider/index.php
  120. +2 −2 demos/rwd/index.php
  121. +2 −2 demos/selectmenu-custom-filter/index.php
  122. +2 −2 demos/selectmenu-custom/index.php
  123. +2 −2 demos/selectmenu/index.php
  124. +2 −2 demos/slider-flipswitch/index.php
  125. +2 −2 demos/slider-tooltip/index.php
  126. +2 −2 demos/slider/index.php
  127. +3 −3 demos/swipe-list/index.php
  128. +1 −1 demos/swipe-page/buenosaires.html
  129. +1 −1 demos/swipe-page/capetown.html
  130. +3 −3 demos/swipe-page/index.php
  131. +1 −1 demos/swipe-page/newyork.html
  132. +1 −1 demos/swipe-page/paris.html
  133. +1 −1 demos/swipe-page/seoul.html
  134. +1 −1 demos/swipe-page/sydney.html
  135. +2 −2 demos/table-column-toggle-example/index.php
  136. +2 −2 demos/table-column-toggle-heading-groups/index.php
  137. +2 −2 demos/table-column-toggle-options/index.php
  138. +2 −2 demos/table-column-toggle/index.php
  139. +2 −2 demos/table-reflow-heading-groups/index.php
  140. +2 −2 demos/table-reflow-stripes-strokes/index.php
  141. +2 −2 demos/table-reflow-styling/index.php
  142. +2 −2 demos/table-reflow/index.php
  143. +2 −2 demos/tabs/index.php
  144. +1 −1 demos/tabs/tabbed-content.php
  145. +2 −2 demos/textinput/index.php
  146. +2 −2 demos/theme-classic/index.php
  147. +2 −2 demos/theme-default/index.php
  148. +2 −2 demos/toolbar-dynamic/index.php
  149. +6 −6 demos/toolbar-external/index.php
  150. +4 −4 demos/toolbar-external/index2.php
  151. +6 −6 demos/toolbar-fixed-external/index.php
  152. +3 −3 demos/toolbar-fixed-forms/index.php
  153. +3 −3 demos/toolbar-fixed-fullscreen/index.php
  154. +2 −2 ...oolbar-fixed-persistent-optimized/index (Alexanders-MacBook-Pro's conflicted copy 2015-07-18).php
  155. +3 −3 demos/toolbar-fixed-persistent-optimized/index.php
  156. +2 −2 ...olbar-fixed-persistent-optimized/page-b (Alexanders-MacBook-Pro's conflicted copy 2015-07-18).php
  157. +3 −3 demos/toolbar-fixed-persistent-optimized/page-b.php
  158. +5 −5 demos/toolbar-fixed-persistent/index.php
  159. +5 −5 demos/toolbar-fixed-persistent/page-b.php
  160. +5 −5 demos/toolbar-fixed-persistent/page-c.php
  161. +4 −4 demos/toolbar-fixed-persistent/page-d.php
  162. +6 −10 demos/toolbar-fixed/index.php
  163. +24 −26 demos/toolbar/index.php
  164. +2 −2 demos/transitions/index.php
  165. +1 −1 demos/transitions/page-transitions-dialog.php
  166. +2 −2 demos/transitions/page-transitions-page.php
  167. +4 −4 js/helpers.js
  168. +1 −1 js/index.php
  169. +0 −1 js/jquery.mobile.js
  170. +107 −3 js/widgets/fixedToolbar.backcompat.js
  171. +82 −122 js/widgets/fixedToolbar.js
  172. +66 −0 js/widgets/fixedToolbar.tapToggle.js
  173. +0 −128 js/widgets/fixedToolbar.workarounds.js
  174. +1 −1 js/widgets/forms/select.custom.js
  175. +6 −5 js/widgets/page.dialog.js
  176. +1 −1 js/widgets/pagecontainer.js
  177. +41 −0 js/widgets/toolbar.backcompat.js
  178. +54 −74 js/widgets/toolbar.js
  179. +1 −1 tests/functional/addrbar.html
  180. +1 −1 tests/functional/autodividers.html
  181. +1 −1 tests/functional/eventlogger.html
  182. +1 −1 tests/functional/gridlayout.html
  183. +1 −1 tests/functional/hashchange/dialog.html
  184. +1 −1 tests/functional/hashchange/dialog1.html
  185. +1 −1 tests/functional/hashchange/dialog2.html
  186. +3 −3 tests/functional/hashchange/hashchange.html
  187. +2 −2 tests/functional/hashchange/hashchange1.html
  188. +1 −1 tests/functional/hashchange/hashchange2.html
  189. +1 −1 tests/functional/orientation.html
  190. +1 −1 tests/functional/swipe.html
  191. +9 −9 tests/integration/dialog-extension/backcompat-tests.html
  192. +1 −1 tests/integration/dialog-extension/dialog-no-hash.html
  193. +14 −14 tests/integration/dialog-extension/dialog_events.js
  194. +14 −14 tests/integration/dialog-extension/index.html
  195. +1 −1 tests/integration/dialog/dialog-no-hash.html
  196. +13 −13 tests/integration/dialog/dialog_events.js
  197. +10 −10 tests/integration/dialog/index.html
  198. +1 −1 tests/integration/filterable/index.html
  199. +89 −65 tests/integration/fixed-toolbar/fixedToolbar.js
  200. +32 −31 tests/integration/fixed-toolbar/index.html
  201. +1 −1 tests/integration/listview/cache-tests/cached-nested.html
  202. +1 −1 tests/integration/listview/cache-tests/uncached-nested.html
  203. +13 −13 tests/integration/listview/index.html
  204. +1 −1 tests/integration/navigation/dialog.html
  205. +4 −4 tests/integration/navigation/index.html
  206. +1 −1 tests/integration/navigation/sequence/basic-dialog.html
  207. +1 −1 tests/integration/navigation/sequence/basic-dialog1.html
  208. +1 −1 tests/integration/navigation/sequence/page-styled-as-dialog.html
  209. +1 −1 tests/integration/navigation/title3.html
  210. +1 −1 tests/integration/page/enhance.html
  211. +1 −1 tests/integration/page/index.html
  212. +1 −1 tests/integration/page/no-enhance.html
  213. +1 −1 tests/integration/pagecontainer/other-page.html
  214. +1 −1 tests/integration/pagecontainer/page-event-sequence-tests.html
  215. +1 −1 tests/integration/pagecontainer/page-load-failure-tests.html
  216. +1 −1 tests/integration/popup/popup-sequence-test-dialog.html
  217. +1 −1 tests/integration/toolbar/external-toolbar-tests.html
  218. +1 −1 tests/integration/toolbar/external_toolbar_core.js
  219. +2 −2 tests/integration/toolbar/fixed-toolbar-tests.html
  220. +2 −2 tests/integration/toolbar/index.html
  221. +2 −1 tests/integration/toolbar/toolbar_core.js
  222. +3 −3 tests/integration/transitions/index.html
  223. +2 −2 tests/unit/enhancer/index.html
  224. +62 −50 tests/unit/fixed-toolbar/fixedToolbar.js
  225. +26 −25 tests/unit/fixed-toolbar/index.html
  226. +4 −4 tests/unit/helpers/index.html
  227. +3 −3 tests/unit/kitchensink/index.html
  228. +4 −4 tests/unit/page-sections/index.html
  229. +2 −2 tests/unit/page-sections/page_core.js
  230. +2 −2 tests/unit/page/dialog-tests.html
  231. +1 −1 tests/unit/pagecontainer/index.html
  232. +2 −2 tests/unit/panel/index.html
  233. +2 −1 tests/unit/rangeslider/rangeslider_backcompat.js
  234. +18 −17 tests/unit/rangeslider/rangeslider_core.js
  235. +2 −2 tests/unit/slider/slider_backcompat.js
  236. +7 −6 tests/unit/slider/slider_core.js
  237. +42 −27 tests/unit/slider/slider_events.js
  238. +3 −3 tests/unit/table/index.html
  239. +2 −2 tests/unit/toolbar/fixed-toolbar-tests.html
  240. +5 −4 tests/unit/toolbar/index.html
  241. +91 −84 tests/unit/toolbar/toolbar_core.js
  242. +1 −1 tools/config-props.html
  243. +1 −1 tools/index.html
View
15 build/tasks/options/jscs.js
@@ -25,16 +25,18 @@ module.exports = {
"js/widgets/forms/checkboxradio.backcompat.js",
"js/widgets/forms/flipswitch.js",
"js/widgets/forms/flipswitch.backcompat.js",
- "tests/unit/flipswitch/*.js",
"js/widgets/forms/rangeslider.js",
"js/widgets/forms/rangeslider.backcompat.js",
- "js/tests/unit/rangeslider/*.js",
"js/widgets/forms/slider.js",
"js/widgets/forms/slider.backcompat.js",
- "js/tests/unit/slider/*.js",
"js/widgets/controlgroup.js",
"js/widgets/controlgroup.backcompat.js",
"js/widgets/tabs.ajax.js",
+ "js/widgets/toolbar.js",
+ "js/widgets/toolbar.backcompat.js",
+ "js/widgets/fixedToolbar.js",
+ "js/widgets/fixedToolbar.backcompat.js",
+ "js/widgets/fixedToolbar.tapToggle.js",
"js/widgets/enhancer.js",
"js/widgets/enhancer.backcompat.js",
"js/degradeInputs.js",
@@ -55,6 +57,13 @@ module.exports = {
"tests/integration/page/page_enhance_within.js",
"tests/integration/page/page_theme.js",
"tests/integration/page/page_title_entity.js",
+ "tests/unit/flipswitch/*.js",
+ "tests/unit/slider/*.js",
+ "tests/unit/rangeslider/*.js",
+ "tests/unit/toolbar/*.js",
+ "tests/unit/fixed-toolbar/*.js",
+ "tests/integration/fixed-toolbar/*.js",
+ "tests/integration/toolbar/*.js",
"tests/unit/dialog/dialog_count.js",
"tests/unit/init/init_dialog.js",
"tests/unit/pagecontainer/pagecontainer_core.js",
View
103 css/structure/jquery.mobile.core.css
@@ -165,50 +165,24 @@ div.ui-mobile-viewport {
font-size: 1em;
display: inline-block;
}
-.ui-header,
-.ui-footer {
- border-width: 1px 0;
- border-style: solid;
- position: relative;
-}
-.ui-header:empty,
-.ui-footer:empty {
- min-height: 2.6875em;
-}
-.ui-header .ui-title,
-.ui-footer .ui-title {
- font-size: 1em;
- min-height: 1.1em;
- text-align: center;
- display: block;
- margin: 0 30%;
- padding: .7em 0;
- text-overflow: ellipsis;
- overflow: hidden;
- white-space: nowrap;
- outline: 0 !important;
-}
-.ui-footer .ui-title {
- margin: 0 1em;
-}
.ui-content {
border-width: 0;
overflow: visible;
overflow-x: hidden;
padding: 1em;
}
/* Corner styling for dialogs and popups */
-.ui-corner-all > .ui-header:first-child,
+.ui-corner-all > .ui-toolbar-header:first-child,
.ui-corner-all > .ui-content:first-child,
-.ui-corner-all > .ui-footer:first-child {
+.ui-corner-all > .ui-toolbar-footer:first-child {
-webkit-border-top-left-radius: inherit;
border-top-left-radius: inherit;
-webkit-border-top-right-radius: inherit;
border-top-right-radius: inherit;
}
-.ui-corner-all > .ui-header:last-child,
+.ui-corner-all > .ui-toolbar-header:last-child,
.ui-corner-all > .ui-content:last-child,
-.ui-corner-all > .ui-footer:last-child {
+.ui-corner-all > .ui-toolbar-footer:last-child {
-webkit-border-bottom-left-radius: inherit;
border-bottom-left-radius: inherit;
-webkit-border-bottom-right-radius: inherit;
@@ -234,8 +208,8 @@ div.ui-mobile-viewport {
user-select: none;
}
.ui-button-icon-only,
-.ui-header button.ui-button.ui-button-icon-only,
-.ui-footer button.ui-button.ui-button-icon-only {
+.ui-toolbar-header button.ui-button.ui-button-icon-only,
+.ui-toolbar-footer button.ui-button.ui-button-icon-only {
padding: 0;
width: 1.75em;
height: 1.75em;
@@ -254,25 +228,25 @@ div.ui-mobile-viewport {
line-height: inherit;
}
/* Make buttons in toolbars default to mini and inline. */
-.ui-header .ui-button,
-.ui-footer .ui-button {
+.ui-toolbar-header .ui-button,
+.ui-toolbar-footer .ui-button {
display: inline-block;
vertical-align: middle;
}
.ui-mini,
-.ui-header .ui-button,
-.ui-footer .ui-button,
-.ui-header .ui-controlgroup .ui-button-icon-only,
-.ui-footer .ui-controlgroup .ui-button-icon-only,
-.ui-header .ui-button-left,
-.ui-header .ui-button-right {
+.ui-toolbar-header .ui-button,
+.ui-toolbar-footer .ui-button,
+.ui-toolbar-header .ui-controlgroup .ui-button-icon-only,
+.ui-toolbar-footer .ui-controlgroup .ui-button-icon-only,
+.ui-toolbar-header .ui-toolbar-header-button-left,
+.ui-toolbar-header .ui-toolbar-header-button-right {
font-size: 13px;
line-height: 1.8462;
}
.ui-mini.ui-button-icon-only,
.ui-mini .ui-button-icon-only,
-.ui-header .ui-button-icon-only,
-.ui-footer .ui-button-icon-only {
+.ui-toolbar-header .ui-button-icon-only,
+.ui-toolbar-footer .ui-button-icon-only {
font-size: 16px;
padding: 0;
}
@@ -303,47 +277,14 @@ div.ui-mobile-viewport {
bottom: auto;
top: 50%;
left: 50%;
+}
+.ui-button-icon-only .ui-icon,
+.ui-button-icon-only.ui-toolbar-header-button-left > .ui-icon,
+.ui-button-icon-only.ui-toolbar-header-button-right > .ui-icon {
margin-top: -11px;
margin-left: -11px;
}
-/* Float icons helper classes */
-.ui-widget-icon-floatbeginning {
- bottom: auto;
- float: left;
-}
-.ui-widget-icon-floatend {
- bottom: auto;
- float: right;
-}
-
-/* Buttons in header position classes */
-.ui-header .ui-button-left,
-.ui-header .ui-button-right,
-.ui-button-left > [class*="ui-"],
-.ui-button-right > [class*="ui-"] {
- margin: 0;
-}
-.ui-button-left,
-.ui-button-right {
- position: absolute;
- top: .24em;
-}
-.ui-button-left {
- left: .4em;
-}
-.ui-button-right {
- right: .4em;
-}
-.ui-button-icon-only.ui-button-left {
- top: .3125em;
- left: .3125em;
-}
-.ui-button-icon-only.ui-button-right {
- top: .3125em;
- right: .3125em;
-}
-
/* Button elements and input buttons */
button.ui-button,
input.ui-button {
@@ -356,8 +297,8 @@ input.ui-button {
}
button.ui-button-inline,
input.ui-button-inline,
-.ui-header button.ui-button,
-.ui-footer button.ui-button {
+.ui-toolbar-header button.ui-button,
+.ui-toolbar-footer button.ui-button {
width: auto;
}
/* Firefox adds a 1px border in a button element. We negate this to make sure they have the same height as other buttons in controlgroups. */
View
46 css/structure/jquery.mobile.fixedToolbar.css
@@ -1,38 +1,38 @@
/* fixed page header & footer configuration */
-.ui-header-fixed,
-.ui-footer-fixed {
+.ui-toolbar-header-fixed,
+.ui-toolbar-footer-fixed {
left: 0;
right: 0;
width: 100%;
position: fixed;
z-index: 1000;
}
-.ui-header-fixed {
+.ui-toolbar-header-fixed {
top: -1px;
padding-top: 1px;
}
-.ui-header-fixed.ui-fixed-hidden {
+.ui-toolbar-header-fixed.ui-toolbar-fixed-hidden {
top: 0;
padding-top: 0;
}
-.ui-header-fixed .ui-button-left,
-.ui-header-fixed .ui-button-right {
+.ui-toolbar-header-fixed .ui-button-left,
+.ui-toolbar-header-fixed .ui-button-right {
margin-top: 1px;
}
-.ui-header-fixed.ui-fixed-hidden .ui-button-left,
-.ui-header-fixed.ui-fixed-hidden .ui-button-right {
+.ui-toolbar-header-fixed.ui-toolbar-fixed-hidden .ui-button-left,
+.ui-toolbar-header-fixed.ui-toolbar-fixed-hidden .ui-button-right {
margin-top: 0;
}
-.ui-footer-fixed {
+.ui-toolbar-footer-fixed {
bottom: -1px;
padding-bottom: 1px;
}
-.ui-footer-fixed.ui-fixed-hidden {
+.ui-toolbar-footer-fixed.ui-toolbar-fixed-hidden {
bottom: 0;
padding-bottom: 0;
}
-.ui-header-fullscreen,
-.ui-footer-fullscreen {
+.ui-toolbar-header-fullscreen,
+.ui-toolbar-footer-fullscreen {
filter: Alpha(Opacity=90);
opacity: .9;
}
@@ -43,34 +43,34 @@
.ui-page-footer-fixed {
padding-bottom: 2.8125em;
}
-.ui-page-header-fullscreen > .ui-content,
-.ui-page-footer-fullscreen > .ui-content {
+.ui-toolbar-page-header-fullscreen > .ui-content,
+.ui-toolbar-page-footer-fullscreen > .ui-content {
padding: 0;
}
-.ui-fixed-hidden {
+.ui-toolbar-fixed-hidden {
position: absolute;
}
/* Tap toggle: hide external fixed footer. See issue #6604 */
-.ui-footer-fixed.ui-fixed-hidden {
+.ui-toolbar-footer-fixed.ui-toolbar-fixed-hidden {
display: none;
}
-.ui-page .ui-footer-fixed.ui-fixed-hidden {
- display: block;
+.ui-page .ui-toolbar-footer-fixed.ui-toolbar-fixed-hidden {
+ display: block
}
-.ui-page-header-fullscreen .ui-fixed-hidden,
-.ui-page-footer-fullscreen .ui-fixed-hidden {
+.ui-toolbar-page-header-fullscreen .ui-toolbar-fixed-hidden,
+.ui-toolbar-page-footer-fullscreen .ui-toolbar-fixed-hidden {
position: absolute !important;
height: 1px;
width: 1px;
overflow: hidden;
clip: rect(1px,1px,1px,1px);
}
-.ui-header-fixed .ui-button,
-.ui-footer-fixed .ui-button {
+.ui-toolbar-header-fixed .ui-button,
+.ui-toolbar-footer-fixed .ui-button {
z-index: 10;
}
/* workarounds for other widgets */
-.ui-android-2x-fixed .ui-li-has-thumb {
+.ui-toolbar-android-2x-fixed .ui-li-has-thumb {
-webkit-transform: translate3d(0,0,0);
}
View
1 css/structure/jquery.mobile.structure.css
@@ -3,6 +3,7 @@
@import url("jquery.mobile.transition.visuals.css");
@import url("jquery.mobile.forms.fieldcontain.css");
@import url("jquery.mobile.grid.css");
+@import url("jquery.mobile.toolbar.css");
@import url("jquery.mobile.fixedToolbar.css");
@import url("jquery.mobile.navbar.css");
@import url("jquery.mobile.collapsible.css");
View
58 css/structure/jquery.mobile.toolbar.css
@@ -0,0 +1,58 @@
+.ui-toolbar,
+.ui-toolbar-header,
+.ui-toolbar-footer {
+ border-width: 1px 0;
+ border-style: solid;
+ position: relative;
+}
+.ui-toolbar:empty,
+.ui-toolbar-header:empty,
+.ui-toolbar-footer:empty {
+ min-height: 2.6875em;
+}
+.ui-toolbar .ui-toolbar-title,
+.ui-toolbar-header .ui-toolbar-title,
+.ui-toolbar-footer .ui-toolbar-title {
+ font-size: 1em;
+ min-height: 1.1em;
+ text-align: center;
+ display: block;
+ margin: 0 30%;
+ padding: .7em 0;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ white-space: nowrap;
+ outline: 0 !important;
+}
+.ui-toolbar-footer .ui-toolbar-title {
+ margin: 0 1em;
+}
+/* Buttons in header position classes */
+.ui-toolbar-header .ui-toolbar-header-button-left,
+.ui-toolbar-header .ui-toolbar-header-button-right,
+.ui-toolbar-header-button-left > [class*="ui-"],
+.ui-toolbar-header-button-right > [class*="ui-"] {
+ margin: 0;
+}
+.ui-toolbar-header-button-left,
+.ui-toolbar-header-button-right {
+ position: absolute;
+ top: .24em;
+}
+.ui-toolbar-header-button-left {
+ left: .4em;
+}
+.ui-toolbar-header-button-right {
+ right: .4em;
+}
+.ui-btn-icon-notext.ui-toolbar-header-button-left {
+ top: .3125em;
+ left: .3125em;
+}
+.ui-btn-icon-notext.ui-toolbar-header-button-right {
+ top: .3125em;
+ right: .3125em;
+}
+.ui-toolbar-header .ui-controlgroup-horizontal:after {
+ clear: none;
+}
View
4 demos/_search/index.php
@@ -16,7 +16,7 @@
<body>
<div data-role="page" class="jqm-demos jqm-demos-index jqm-demos-search-results">
- <div data-role="header" class="jqm-header">
+ <div data-role="toolbar" data-type="header" class="jqm-header">
<h2><a href="../" title="jQuery Mobile Demos home"><img src="../_assets/img/jquery-logo.png" alt="jQuery Mobile"></a></h2>
<p><span class="jqm-version"></span> Demos</p>
<a href="#" class="jqm-navmenu-link ui-button ui-button-icon-only ui-corner-all ui-nodisc-icon ui-alt-icon ui-button-left">Menu<span class="ui-icon ui-icon-bars"></span></a>
@@ -37,7 +37,7 @@
<?php include( '../jqm-navmenu.php' ); ?>
- <div data-role="footer" data-position="fixed" data-tap-toggle="false" class="jqm-footer">
+ <div data-role="toolbar" data-type="footer" data-position="fixed" data-tap-toggle="false" class="jqm-footer">
<p>jQuery Mobile Demos version <span class="jqm-version"></span></p>
<p>Copyright jQuery Foundation</p>
</div><!-- /footer -->
Oops, something went wrong.

0 comments on commit 24c072b

Please sign in to comment.