Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Split css metadata into css.structure and css.theme

Fixes #4434
  • Loading branch information...
commit 9663cf324f477c72038a2048781aec4379064dd8 1 parent 231c8b9
@gseguin gseguin authored
Showing with 45 additions and 27 deletions.
  1. +2 −1  js/jquery.mobile.buttonMarkup.js
  2. +2 −1  js/jquery.mobile.collapsible.js
  3. +2 −1  js/jquery.mobile.collapsibleSet.js
  4. +2 −1  js/jquery.mobile.controlGroup.js
  5. +2 −1  js/jquery.mobile.core.js
  6. +2 −1  js/jquery.mobile.dialog.js
  7. +2 −1  js/jquery.mobile.fieldContain.js
  8. +2 −1  js/jquery.mobile.fixedToolbar.js
  9. +2 −1  js/jquery.mobile.forms.button.js
  10. +2 −1  js/jquery.mobile.forms.checkboxradio.js
  11. +2 −1  js/jquery.mobile.forms.select.custom.js
  12. +2 −1  js/jquery.mobile.forms.select.js
  13. +2 −1  js/jquery.mobile.forms.slider.js
  14. +2 −1  js/jquery.mobile.forms.textinput.js
  15. +2 −1  js/jquery.mobile.grid.js
  16. +2 −1  js/jquery.mobile.listview.js
  17. +2 −1  js/jquery.mobile.navbar.js
  18. +1 −1  js/jquery.mobile.transition.flip.js
  19. +1 −1  js/jquery.mobile.transition.flow.js
  20. +2 −1  js/jquery.mobile.transition.js
  21. +1 −1  js/jquery.mobile.transition.pop.js
  22. +1 −1  js/jquery.mobile.transition.slide.js
  23. +1 −1  js/jquery.mobile.transition.slidedown.js
  24. +1 −1  js/jquery.mobile.transition.slidefade.js
  25. +1 −1  js/jquery.mobile.transition.slideup.js
  26. +1 −1  js/jquery.mobile.transition.turn.js
  27. +1 −1  js/jquery.mobile.widget.js
View
3  js/jquery.mobile.buttonMarkup.js
@@ -2,7 +2,8 @@
//>>description: Applies button styling to links
//>>label: Buttons: Link-based
//>>group: Forms
-//>>css: ../css/themes/default/jquery.mobile.theme.css, ../css/structure/jquery.mobile.button.css
+//>>css.structure: ../css/structure/jquery.mobile.button.css
+//>>css.theme: ../css/themes/default/jquery.mobile.theme.css
define( [ "jquery", "./jquery.mobile.core", "./jquery.mobile.vmouse" ], function( $ ) {
//>>excludeEnd("jqmBuildExclude");
View
3  js/jquery.mobile.collapsible.js
@@ -2,7 +2,8 @@
//>>description: Creates collapsible content blocks.
//>>label: Collapsible
//>>group: Widgets
-//>>css: ../css/themes/default/jquery.mobile.theme.css,../css/structure/jquery.mobile.collapsible.css
+//>>css.structure: ../css/structure/jquery.mobile.collapsible.css
+//>>css.theme: ../css/themes/default/jquery.mobile.theme.css
define( [ "jquery", "./jquery.mobile.widget", "./jquery.mobile.buttonMarkup" ], function( $ ) {
//>>excludeEnd("jqmBuildExclude");
View
3  js/jquery.mobile.collapsibleSet.js
@@ -2,7 +2,8 @@
//>>description: For creating grouped collapsible content areas.
//>>label: Collapsible Sets (Accordions)
//>>group: Widgets
-//>>css: ../css/themes/default/jquery.mobile.theme.css,../css/structure/jquery.mobile.collapsible.css
+//>>css.structure: ../css/structure/jquery.mobile.collapsible.css
+//>>css.theme: ../css/themes/default/jquery.mobile.theme.css
define( [ "jquery", "./jquery.mobile.widget", "./jquery.mobile.collapsible" ], function( $ ) {
//>>excludeEnd("jqmBuildExclude");
View
3  js/jquery.mobile.controlGroup.js
@@ -2,7 +2,8 @@
//>>description: Visually groups sets of buttons, checks, radios, etc.
//>>label: Controlgroups
//>>group: Forms
-//>>css: ../css/themes/default/jquery.mobile.theme.css,../css/structure/jquery.mobile.controlgroup.css
+//>>css.structure: ../css/structure/jquery.mobile.controlgroup.css
+//>>css.theme: ../css/themes/default/jquery.mobile.theme.css
define( [ "jquery", "./jquery.mobile.buttonMarkup" ], function( $ ) {
//>>excludeEnd("jqmBuildExclude");
View
3  js/jquery.mobile.core.js
@@ -3,7 +3,8 @@
//>>label: Core
//>>group: Core
//>>required: true
-//>>css: ../css/structure/jquery.mobile.core.css
+//>>css.structure: ../css/structure/jquery.mobile.core.css
+//>>css.theme: ../css/themes/default/jquery.mobile.theme.css
define( [ "jquery", "../external/requirejs/text!../version.txt", "./jquery.mobile.widget" ], function( $, __version__ ) {
//>>excludeEnd("jqmBuildExclude");
View
3  js/jquery.mobile.dialog.js
@@ -2,7 +2,8 @@
//>>description: Displays a page as a modal dialog with inset appearance and overlay background
//>>label: Dialogs
//>>group: Widgets
-//>>css: ../css/themes/default/jquery.mobile.theme.css,../css/structure/jquery.mobile.dialog.css
+//>>css.structure: ../css/structure/jquery.mobile.dialog.css
+//>>css.theme: ../css/themes/default/jquery.mobile.theme.css
define( [ "jquery", "./jquery.mobile.widget" ], function( $ ) {
//>>excludeEnd("jqmBuildExclude");
View
3  js/jquery.mobile.fieldContain.js
@@ -2,7 +2,8 @@
//>>description: Styling to responsively position forms and labels based on screen width and add visual separation
//>>label: Fieldcontainers
//>>group: Forms
-//>>css: ../css/themes/default/jquery.mobile.theme.css,../css/structure/jquery.mobile.forms.fieldcontain.css
+//>>css.structure: ../css/structure/jquery.mobile.forms.fieldcontain.css
+//>>css.theme: ../css/themes/default/jquery.mobile.theme.css
define( [ "jquery" ], function( $ ) {
//>>excludeEnd("jqmBuildExclude");
View
3  js/jquery.mobile.fixedToolbar.js
@@ -2,7 +2,8 @@
//>>description: Behavior for "fixed" headers and footers
//>>label: Toolbars: Fixed
//>>group: Widgets
-//>>css: ../css/themes/default/jquery.mobile.theme.css,../css/structure/jquery.mobile.fixedToolbar.css
+//>>css.structure: ../css/structure/jquery.mobile.fixedToolbar.css
+//>>css.theme: ../css/themes/default/jquery.mobile.theme.css
define( [ "jquery", "./jquery.mobile.widget", "./jquery.mobile.core", "./jquery.mobile.navigation", "./jquery.mobile.page", "./jquery.mobile.page.sections", "./jquery.mobile.zoom" ], function( $ ) {
//>>excludeEnd("jqmBuildExclude");
View
3  js/jquery.mobile.forms.button.js
@@ -2,7 +2,8 @@
//>>description: Custom-styled native input/buttons
//>>label: Buttons: Input or button-based
//>>group: Forms
-//>>css: ../css/themes/default/jquery.mobile.theme.css,../css/structure/jquery.mobile.button.css
+//>>css.structure: ../css/structure/jquery.mobile.button.css
+//>>css.theme: ../css/themes/default/jquery.mobile.theme.css
define( [ "jquery", "./jquery.mobile.widget", "./jquery.mobile.buttonMarkup" ], function( $ ) {
//>>excludeEnd("jqmBuildExclude");
View
3  js/jquery.mobile.forms.checkboxradio.js
@@ -6,7 +6,8 @@
//>>description: Consistent styling for checkboxes/radio buttons.
//>>label: Checkboxes & Radio Buttons
//>>group: Forms
-//>>css: ../css/themes/default/jquery.mobile.theme.css,../css/structure/jquery.mobile.forms.checkboxradio.css
+//>>css.structure: ../css/structure/jquery.mobile.forms.checkboxradio.css
+//>>css.theme: ../css/themes/default/jquery.mobile.theme.css
define( [ "jquery", "./jquery.mobile.core", "./jquery.mobile.widget", "./jquery.mobile.buttonMarkup" ], function( $ ) {
//>>excludeEnd("jqmBuildExclude");
View
3  js/jquery.mobile.forms.select.custom.js
@@ -6,7 +6,8 @@
//>>description: Extension to select menus to support menu styling, placeholder options, and multi-select features.
//>>label: Selects: Custom menus
//>>group: Forms
-//>>css: ../css/themes/default/jquery.mobile.theme.css, ../css/structure/jquery.mobile.forms.select.css
+//>>css.structure: ../css/structure/jquery.mobile.forms.select.css
+//>>css.theme: ../css/themes/default/jquery.mobile.theme.css
define( [
"jquery",
View
3  js/jquery.mobile.forms.select.js
@@ -2,7 +2,8 @@
//>>description: Consistent styling for native select menus. Tapping opens a native select menu.
//>>label: Selects
//>>group: Forms
-//>>css: ../css/themes/default/jquery.mobile.theme.css, ../css/structure/jquery.mobile.forms.select.css
+//>>css.structure: ../css/structure/jquery.mobile.forms.select.css
+//>>css.theme: ../css/themes/default/jquery.mobile.theme.css
define( [ "jquery", "./jquery.mobile.core", "./jquery.mobile.widget", "./jquery.mobile.buttonMarkup", "./jquery.mobile.zoom" ], function( $ ) {
//>>excludeEnd("jqmBuildExclude");
View
3  js/jquery.mobile.forms.slider.js
@@ -2,7 +2,8 @@
//>>description: Slider form widget
//>>label: Slider
//>>group: Forms
-//>>css: ../css/themes/default/jquery.mobile.theme.css, ../css/structure/jquery.mobile.forms.slider.css
+//>>css.structure: ../css/structure/jquery.mobile.forms.slider.css
+//>>css.theme: ../css/themes/default/jquery.mobile.theme.css
define( [ "jquery", "./jquery.mobile.core", "./jquery.mobile.widget", "./jquery.mobile.forms.textinput", "./jquery.mobile.buttonMarkup" ], function( $ ) {
//>>excludeEnd("jqmBuildExclude");
View
3  js/jquery.mobile.forms.textinput.js
@@ -2,7 +2,8 @@
//>>description: Enhances and consistently styles text inputs.
//>>label: Text Inputs & Textareas
//>>group: Forms
-//>>css: ../css/themes/default/jquery.mobile.theme.css, ../css/structure/jquery.mobile.forms.textinput.css
+//>>css.structure: ../css/structure/jquery.mobile.forms.textinput.css
+//>>css.theme: ../css/themes/default/jquery.mobile.theme.css
define( [ "jquery", "./jquery.mobile.core", "./jquery.mobile.widget", "./jquery.mobile.degradeInputs", "./jquery.mobile.buttonMarkup", "./jquery.mobile.zoom" ], function( $ ) {
//>>excludeEnd("jqmBuildExclude");
View
3  js/jquery.mobile.grid.js
@@ -2,7 +2,8 @@
//>>description: Applies classes for creating grid or column styling.
//>>label: Grid Layouts (Columns)
//>>group: Widgets
-//>>css: ../css/themes/default/jquery.mobile.theme.css, ../css/structure/jquery.mobile.grid.css
+//>>css.structure:../css/structure/jquery.mobile.grid.css
+//>>css.theme: ../css/themes/default/jquery.mobile.theme.css
define( [ "jquery" ], function( $ ) {
//>>excludeEnd("jqmBuildExclude");
View
3  js/jquery.mobile.listview.js
@@ -2,7 +2,8 @@
//>>description: Applies listview styling of various types (standard, numbered, split button, etc.)
//>>label: Listview
//>>group: Widgets
-//>>css: ../css/themes/default/jquery.mobile.theme.css, ../css/structure/jquery.mobile.listview.css
+//>>css.structure: ../css/structure/jquery.mobile.listview.css
+//>>css.theme: ../css/themes/default/jquery.mobile.theme.css
define( [ "jquery", "./jquery.mobile.widget", "./jquery.mobile.buttonMarkup", "./jquery.mobile.page", "./jquery.mobile.page.sections" ], function( $ ) {
//>>excludeEnd("jqmBuildExclude");
View
3  js/jquery.mobile.navbar.js
@@ -2,7 +2,8 @@
//>>description: Formats groups of links as horizontal navigation bars.
//>>label: Navbars
//>>group: Widgets
-//>>css: ../css/themes/default/jquery.mobile.theme.css, ../css/structure/jquery.mobile.navbar.css
+//>>css.structure: ../css/structure/jquery.mobile.navbar.css
+//>>css.theme: ../css/themes/default/jquery.mobile.theme.css
define( [ "jquery", "./jquery.mobile.widget", "./jquery.mobile.buttonMarkup", "./jquery.mobile.grid" ], function( $ ) {
View
2  js/jquery.mobile.transition.flip.js
@@ -6,7 +6,7 @@
//>>description: Animation styles and fallback transition definition for non-3D supporting browsers
//>>label: Flip Transition
//>>group: Transitions
-//>>css: ../css/structure/jquery.mobile.transition.flip.css
+//>>css.structure: ../css/structure/jquery.mobile.transition.flip.css
define( [ "jquery", "./jquery.mobile.transition" ], function( $ ) {
//>>excludeEnd("jqmBuildExclude");
View
2  js/jquery.mobile.transition.flow.js
@@ -6,7 +6,7 @@
//>>description: Animation styles and fallback transition definition for non-3D supporting browsers
//>>label: Flow Transition
//>>group: Transitions
-//>>css: ../css/structure/jquery.mobile.transition.flow.css
+//>>css.structure: ../css/structure/jquery.mobile.transition.flow.css
define( [ "jquery", "./jquery.mobile.transition" ], function( $ ) {
//>>excludeEnd("jqmBuildExclude");
View
3  js/jquery.mobile.transition.js
@@ -3,7 +3,8 @@
//>>description: Animated page change core logic and sequence handlers
//>>label: Transition Core
//>>group: Transitions
-//>>css: ../css/themes/default/jquery.mobile.theme.css, ../css/structure/jquery.mobile.transition.css
+//>>css.structure: ../css/structure/jquery.mobile.transition.css
+//>>css.theme: ../css/themes/default/jquery.mobile.theme.css
define( [ "jquery", "./jquery.mobile.core" ], function( $ ) {
//>>excludeEnd("jqmBuildExclude");
View
2  js/jquery.mobile.transition.pop.js
@@ -6,7 +6,7 @@
//>>description: Animation styles and fallback transition definition for non-3D supporting browsers
//>>label: Pop Transition
//>>group: Transitions
-//>>css: ../css/structure/jquery.mobile.transition.pop.css
+//>>css.structure: ../css/structure/jquery.mobile.transition.pop.css
define( [ "jquery", "./jquery.mobile.transition" ], function( $ ) {
//>>excludeEnd("jqmBuildExclude");
View
2  js/jquery.mobile.transition.slide.js
@@ -6,7 +6,7 @@
//>>description: Animation styles and fallback transition definition for non-3D supporting browsers
//>>label: Slide Transition
//>>group: Transitions
-//>>css: ../css/structure/jquery.mobile.transition.slide.css
+//>>css.structure: ../css/structure/jquery.mobile.transition.slide.css
define( [ "jquery", "./jquery.mobile.transition" ], function( $ ) {
//>>excludeEnd("jqmBuildExclude");
View
2  js/jquery.mobile.transition.slidedown.js
@@ -6,7 +6,7 @@
//>>description: Animation styles and fallback transition definition for non-3D supporting browsers
//>>label: Slidedown Transition
//>>group: Transitions
-//>>css: ../css/structure/jquery.mobile.transition.slidedown.css
+//>>css.structure: ../css/structure/jquery.mobile.transition.slidedown.css
define( [ "jquery", "./jquery.mobile.transition" ], function( $ ) {
//>>excludeEnd("jqmBuildExclude");
View
2  js/jquery.mobile.transition.slidefade.js
@@ -6,7 +6,7 @@
//>>description: Animation styles and fallback transition definition for non-3D supporting browsers
//>>label: Slidefade Transition
//>>group: Transitions
-//>>css: ../css/structure/jquery.mobile.transition.slidefade.css
+//>>css.structure: ../css/structure/jquery.mobile.transition.slidefade.css
define( [ "jquery", "./jquery.mobile.transition" ], function( $ ) {
//>>excludeEnd("jqmBuildExclude");
View
2  js/jquery.mobile.transition.slideup.js
@@ -6,7 +6,7 @@
//>>description: Animation styles and fallback transition definition for non-3D supporting browsers
//>>label: Slideup Transition
//>>group: Transitions
-//>>css: ../css/structure/jquery.mobile.transition.slideup.css
+//>>css.structure: ../css/structure/jquery.mobile.transition.slideup.css
define( [ "jquery", "./jquery.mobile.transition" ], function( $ ) {
//>>excludeEnd("jqmBuildExclude");
View
2  js/jquery.mobile.transition.turn.js
@@ -6,7 +6,7 @@
//>>description: Animation styles and fallback transition definition for non-3D supporting browsers
//>>label: Turn Transition
//>>group: Transitions
-//>>css: ../css/structure/jquery.mobile.transition.turn.css
+//>>css.structure: ../css/structure/jquery.mobile.transition.turn.css
define( [ "jquery", "./jquery.mobile.transition" ], function( $ ) {
//>>excludeEnd("jqmBuildExclude");
View
2  js/jquery.mobile.widget.js
@@ -2,7 +2,7 @@
//>>description: Widget factory extentions for mobile.
//>>label: Widget Factory
//>>group: Core
-//>>css: ../css/themes/default/jquery.mobile.theme.css
+//>>css.theme: ../css/themes/default/jquery.mobile.theme.css
define( [ "jquery", "../external/requirejs/depend!./jquery.ui.widget[jquery]" ], function( $ ) {
//>>excludeEnd("jqmBuildExclude");
Please sign in to comment.
Something went wrong with that request. Please try again.