Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

Css structure consolidation #3468

Closed
wants to merge 4 commits into from

2 participants

This page is out of date. Refresh to see the latest.
View
40 Makefile
@@ -1,24 +1,3 @@
-# The files to include when compiling the CSS files
-CSSFILES = css/structure/jquery.mobile.core.css \
- css/structure/jquery.mobile.transitions.css \
- css/structure/jquery.mobile.grids.css \
- css/structure/jquery.mobile.fixedToolbar.css \
- css/structure/jquery.mobile.navbar.css \
- css/structure/jquery.mobile.button.css \
- css/structure/jquery.mobile.collapsible.css \
- css/structure/jquery.mobile.controlgroup.css \
- css/structure/jquery.mobile.dialog.css \
- css/structure/jquery.mobile.forms.checkboxradio.css \
- css/structure/jquery.mobile.forms.fieldcontain.css \
- css/structure/jquery.mobile.forms.select.css \
- css/structure/jquery.mobile.forms.textinput.css \
- css/structure/jquery.mobile.listview.css \
- css/structure/jquery.mobile.forms.slider.css
-CSSTHEMEFILES = css/themes/${THEME}/jquery.mobile.theme.css
-
-
-
-
# Helper Variables
# The command to replace the @VERSION in the files with the actual version
VER = sed "s/v@VERSION/$$(git log -1 --format=format:"Git Build: SHA1: %H <> Date: %cd")/"
@@ -39,6 +18,7 @@ deploy: STRUCTURE = jquery.mobile.structure-${VER_OFFICIAL}
# The CSS theme being used
THEME = default
+RUN_JS = @@java -XX:ReservedCodeCacheSize=64m -classpath build/js.jar:build/google-compiler-20111003.jar org.mozilla.javascript.tools.shell.Main
@@ -52,8 +32,7 @@ all: init css js zip notify
# Build and minify the CSS files
css: init
# Build the CSS file with the theme included
- @@java -XX:ReservedCodeCacheSize=64m \
- -classpath build/js.jar:build/google-compiler-20111003.jar org.mozilla.javascript.tools.shell.Main \
+ ${RUN_JS} \
external/r.js/dist/r.js \
-o cssIn=css/themes/default/jquery.mobile.css \
out=${OUTPUT}/${NAME}.compiled.css
@@ -65,13 +44,18 @@ css: init
--type css ${OUTPUT}/${NAME}.compiled.css >> ${OUTPUT}/${NAME}.min.css
@@rm ${OUTPUT}/${NAME}.compiled.css
# Build the CSS Structure-only file
+ ${RUN_JS} \
+ external/r.js/dist/r.js \
+ -o cssIn=css/structure/${STRUCTURE}.css \
+ out=${OUTPUT}/${STRUCTURE}.compiled.css
@@cat LICENSE-INFO.txt | ${VER} > ${OUTPUT}/${STRUCTURE}.css
- @@cat ${CSSFILES} >> ${OUTPUT}/${STRUCTURE}.css
+ @@cat ${OUTPUT}/${STRUCTURE}.compiled.css >> ${OUTPUT}/${STRUCTURE}.css
# ..... and then minify it
@@echo ${VER_MIN} > ${OUTPUT}/${STRUCTURE}.min.css
@@java -XX:ReservedCodeCacheSize=64m \
-jar build/yuicompressor-2.4.6.jar \
- --type css ${OUTPUT}/${STRUCTURE}.css >> ${OUTPUT}/${STRUCTURE}.min.css
+ --type css ${OUTPUT}/${STRUCTURE}.compiled.css >> ${OUTPUT}/${STRUCTURE}.min.css
+ @@rm ${OUTPUT}/${STRUCTURE}.compiled.css
# ..... and then copy in the images
@@cp -R css/themes/${THEME}/images ${OUTPUT}/
# Css portion is complete.
@@ -81,8 +65,7 @@ css: init
docs: init
# Create the Demos/Docs/Tests/Tools
# ... Build the docs bundle
- @@java -XX:ReservedCodeCacheSize=64m \
- -classpath build/js.jar:build/google-compiler-20111003.jar org.mozilla.javascript.tools.shell.Main \
+ ${RUN_JS} \
external/r.js/dist/r.js \
-o build/docs.build.js \
dir=../tmp/${NAME}
@@ -113,8 +96,7 @@ init:
# Build and minify the JS files
js: init
# Build the JavaScript file
- @@java -XX:ReservedCodeCacheSize=64m \
- -classpath build/js.jar:build/google-compiler-20111003.jar org.mozilla.javascript.tools.shell.Main \
+ ${RUN_JS} \
external/r.js/dist/r.js \
-o baseUrl="js" \
include=jquery.mobile exclude=jquery,order \
View
23 css/structure/jquery.mobile.structure.css
@@ -0,0 +1,23 @@
+@import url( "jquery.mobile.core.css" );
+@import url( "jquery.mobile.transitions.css" );
+@import url( "jquery.mobile.transitions.fade.css" );
+@import url( "jquery.mobile.transitions.pop.css" );
+@import url( "jquery.mobile.transitions.slide.css" );
+@import url( "jquery.mobile.transitions.slidedown.css" );
+@import url( "jquery.mobile.transitions.slideup.css" );
+@import url( "jquery.mobile.transitions.flip.css" );
+@import url( "jquery.mobile.transitions.turn.css" );
+@import url( "jquery.mobile.transitions.flow.css" );
+@import url( "jquery.mobile.grids.css" );
+@import url( "jquery.mobile.fixedToolbar.css" );
+@import url( "jquery.mobile.navbar.css" );
+@import url( "jquery.mobile.button.css" );
+@import url( "jquery.mobile.collapsible.css" );
+@import url( "jquery.mobile.controlgroup.css" );
+@import url( "jquery.mobile.dialog.css" );
+@import url( "jquery.mobile.forms.checkboxradio.css" );
+@import url( "jquery.mobile.forms.fieldcontain.css" );
+@import url( "jquery.mobile.forms.select.css" );
+@import url( "jquery.mobile.forms.textinput.css" );
+@import url( "jquery.mobile.listview.css" );
+@import url( "jquery.mobile.forms.slider.css" );
View
24 css/themes/default/jquery.mobile.css
@@ -1,24 +1,2 @@
@import url( "jquery.mobile.theme.css" );
-@import url( "../../structure/jquery.mobile.core.css" );
-@import url( "../../structure/jquery.mobile.transitions.css" );
-@import url( "../../structure/jquery.mobile.transitions.fade.css" );
-@import url( "../../structure/jquery.mobile.transitions.pop.css" );
-@import url( "../../structure/jquery.mobile.transitions.slide.css" );
-@import url( "../../structure/jquery.mobile.transitions.slidedown.css" );
-@import url( "../../structure/jquery.mobile.transitions.slideup.css" );
-@import url( "../../structure/jquery.mobile.transitions.flip.css" );
-@import url( "../../structure/jquery.mobile.transitions.turn.css" );
-@import url( "../../structure/jquery.mobile.transitions.flow.css" );
-@import url( "../../structure/jquery.mobile.grids.css" );
-@import url( "../../structure/jquery.mobile.fixedToolbar.css" );
-@import url( "../../structure/jquery.mobile.navbar.css" );
-@import url( "../../structure/jquery.mobile.button.css" );
-@import url( "../../structure/jquery.mobile.collapsible.css" );
-@import url( "../../structure/jquery.mobile.controlgroup.css" );
-@import url( "../../structure/jquery.mobile.dialog.css" );
-@import url( "../../structure/jquery.mobile.forms.checkboxradio.css" );
-@import url( "../../structure/jquery.mobile.forms.fieldcontain.css" );
-@import url( "../../structure/jquery.mobile.forms.select.css" );
-@import url( "../../structure/jquery.mobile.forms.textinput.css" );
-@import url( "../../structure/jquery.mobile.listview.css" );
-@import url( "../../structure/jquery.mobile.forms.slider.css" );
+@import url( "../../structure/jquery.mobile.structure.css" );
View
24 css/themes/valencia/jquery.mobile.css
@@ -1,24 +1,2 @@
@import url( "jquery.mobile.theme.css" );
-@import url( "../../structure/jquery.mobile.core.css" );
-@import url( "../../structure/jquery.mobile.transitions.css" );
-@import url( "../../structure/jquery.mobile.transitions.fade.css" );
-@import url( "../../structure/jquery.mobile.transitions.pop.css" );
-@import url( "../../structure/jquery.mobile.transitions.slide.css" );
-@import url( "../../structure/jquery.mobile.transitions.slidedown.css" );
-@import url( "../../structure/jquery.mobile.transitions.slideup.css" );
-@import url( "../../structure/jquery.mobile.transitions.flip.css" );
-@import url( "../../structure/jquery.mobile.transitions.turn.css" );
-@import url( "../../structure/jquery.mobile.transitions.flow.css" );
-@import url( "../../structure/jquery.mobile.grids.css" );
-@import url( "../../structure/jquery.mobile.fixedToolbar.css" );
-@import url( "../../structure/jquery.mobile.navbar.css" );
-@import url( "../../structure/jquery.mobile.button.css" );
-@import url( "../../structure/jquery.mobile.collapsible.css" );
-@import url( "../../structure/jquery.mobile.controlgroup.css" );
-@import url( "../../structure/jquery.mobile.dialog.css" );
-@import url( "../../structure/jquery.mobile.forms.checkboxradio.css" );
-@import url( "../../structure/jquery.mobile.forms.fieldcontain.css" );
-@import url( "../../structure/jquery.mobile.forms.select.css" );
-@import url( "../../structure/jquery.mobile.forms.textinput.css" );
-@import url( "../../structure/jquery.mobile.listview.css" );
-@import url( "../../structure/jquery.mobile.forms.slider.css" );
+@import url( "../../structure/jquery.mobile.structure.css" );
Something went wrong with that request. Please try again.