Permalink
Browse files

2700: Step 7 Silly me kept putting instead of . Fixed that typo

  • Loading branch information...
1 parent 7a65be6 commit bcbaa38854cb24133094b5f7205b8e146d427668 @eddiemonge eddiemonge committed Oct 17, 2011
View
@@ -33,8 +33,8 @@ JS = ${DIR}.js
MIN = ${DIR}.min.js
CSS = ${DIR}.css
CSSMIN = ${DIR}.min.css
-CSSCORE = ${DIR}.core.css
-CSSCOREMIN = ${DIR}.core.min.css
+CSSSTRUCTURE = ${DIR}.structure.css
+CSSSTRUCTUREMIN = ${DIR}.structure.min.css
CSSTHEME = default
# The files to include when compiling the JS files
@@ -74,25 +74,25 @@ JSFILES = js/jquery.ui.widget.js \
js/jquery.mobile.init.js
CSSTHEMEFILES = css/themes/${CSSTHEME}/jquery.mobile.theme.css
-CSSCOREFILES = css/core/jquery.mobile.core.css \
- css/core/jquery.mobile.transitions.css \
- css/core/jquery.mobile.grids.css \
- css/core/jquery.mobile.headerfooter.css \
- css/core/jquery.mobile.navbar.css \
- css/core/jquery.mobile.button.css \
- css/core/jquery.mobile.collapsible.css \
- css/core/jquery.mobile.controlgroup.css \
- css/core/jquery.mobile.dialog.css \
- css/core/jquery.mobile.forms.checkboxradio.css \
- css/core/jquery.mobile.forms.fieldcontain.css \
- css/core/jquery.mobile.forms.select.css \
- css/core/jquery.mobile.forms.textinput.css \
- css/core/jquery.mobile.listview.css \
- css/core/jquery.mobile.forms.slider.css
+CSSSTRUCTUREFILES = css/structure/jquery.mobile.core.css \
+ css/structure/jquery.mobile.transitions.css \
+ css/structure/jquery.mobile.grids.css \
+ css/structure/jquery.mobile.headerfooter.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
# The files to include when compiling the CSS files
-CSSFILES = ${CSSTHEMEFILES} ${CSSCOREFILES}
+CSSFILES = ${CSSTHEMEFILES} ${CSSSTRUCTUREFILES}
# By default, this is what get runs when make is called without any arguments.
# Min and un-min CSS and JS files are the only things built
@@ -103,14 +103,14 @@ css: init
# Build the CSS file
@@head -8 js/jquery.mobile.core.js | ${SED_VER} > ${OUTPUT}/${CSS}
@@cat ${CSSFILES} >> ${OUTPUT}/${CSS}
- @@head -8 js/jquery.mobile.core.js | ${SED_VER} > ${OUTPUT}/${CSSCORE}
- @@cat ${CSSCOREFILES} >> ${OUTPUT}/${CSSCORE}
+ @@head -8 js/jquery.mobile.core.js | ${SED_VER} > ${OUTPUT}/${CSSSTRUCTURE}
+ @@cat ${CSSSTRUCTUREFILES} >> ${OUTPUT}/${CSSSTRUCTURE}
# Build the minified CSS file
cssmin: init css
# Build the minified CSS file
@@java -jar build/yuicompressor-2.4.6.jar --type css ${OUTPUT}/${CSS} >> ${OUTPUT}/${CSSMIN}
- @@java -jar build/yuicompressor-2.4.6.jar --type css ${OUTPUT}/${CSSCORE} >> ${OUTPUT}/${CSSCOREMIN}
+ @@java -jar build/yuicompressor-2.4.6.jar --type css ${OUTPUT}/${CSSSTRUCTURE} >> ${OUTPUT}/${CSSSTRUCTUREMIN}
# Build the normal JS file
js: init
View
@@ -1,11 +1,11 @@
<?xml version="1.0"?>
<project name="jquery-mobile" basedir="." default="merge">
- <property name="jsdir" location="js"/>
- <property name="csstheme-dir" location="css/themes/default"/>
- <property name="csstheme-sources" value="jquery.mobile.theme.css"/>
- <property name="csscore-dir" location="css/core"/>
- <property name="csscore-sources" value="jquery.mobile.core.css,
+ <property name="js-dir" location="js"/>
+ <property name="css-theme-dir" location="css/themes/default"/>
+ <property name="css-theme-sources" value="jquery.mobile.theme.css"/>
+ <property name="css-structure-dir" location="css/structure"/>
+ <property name="css-structure-sources" value="jquery.mobile.core.css,
jquery.mobile.transitions.css,
jquery.mobile.grids.css,
jquery.mobile.headerfooter.css,
@@ -62,14 +62,14 @@
<target name="merge_css">
<concat destfile="combine/jquery.mobile.css">
- <filelist dir="${csstheme-dir}" files="${csstheme-sources}"/>
- <filelist dir="${csscore-dir}" files="${csscore-sources}"/>
+ <filelist dir="${css-theme-dir}" files="${css-theme-sources}"/>
+ <filelist dir="${css-structure-dir}" files="${css-structure-sources}"/>
</concat>
</target>
<target name="merge_js">
<concat destfile="combine/jquery.mobile.js">
- <filelist dir="${jsdir}" files="${js-sources}"/>
+ <filelist dir="${js-dir}" files="${js-sources}"/>
</concat>
</target>
</project>
View
@@ -1,21 +0,0 @@
-<?php
-$files = array_merge($files, array(
- '../../core/jquery.mobile.core.css',
- '../../core/jquery.mobile.transitions.css',
- '../../core/jquery.mobile.grids.css',
- '../../core/jquery.mobile.headerfooter.css',
- '../../core/jquery.mobile.navbar.css',
- '../../core/jquery.mobile.button.css',
- '../../core/jquery.mobile.collapsible.css',
- '../../core/jquery.mobile.controlgroup.css',
- '../../core/jquery.mobile.dialog.css',
- '../../core/jquery.mobile.forms.checkboxradio.css',
- '../../core/jquery.mobile.forms.fieldcontain.css',
- '../../core/jquery.mobile.forms.select.css',
- '../../core/jquery.mobile.forms.textinput.css',
- '../../core/jquery.mobile.listview.css',
- '../../core/jquery.mobile.forms.slider.css'
-));
-
-require_once($base.'/../../../combine.php');
-
@@ -0,0 +1,21 @@
+<?php
+$files = array_merge($files, array(
+ '../../structure/jquery.mobile.core.css',
+ '../../structure/jquery.mobile.transitions.css',
+ '../../structure/jquery.mobile.grids.css',
+ '../../structure/jquery.mobile.headerfooter.css',
+ '../../structure/jquery.mobile.navbar.css',
+ '../../structure/jquery.mobile.button.css',
+ '../../structure/jquery.mobile.collapsible.css',
+ '../../structure/jquery.mobile.controlgroup.css',
+ '../../structure/jquery.mobile.dialog.css',
+ '../../structure/jquery.mobile.forms.checkboxradio.css',
+ '../../structure/jquery.mobile.forms.fieldcontain.css',
+ '../../structure/jquery.mobile.forms.select.css',
+ '../../structure/jquery.mobile.forms.textinput.css',
+ '../../structure/jquery.mobile.listview.css',
+ '../../structure/jquery.mobile.forms.slider.css'
+));
+
+require_once($base.'/../../../combine.php');
+
@@ -4,4 +4,4 @@
'jquery.mobile.theme.css'
);
$base = dirname(__FILE__);
-require_once('../../core/index.php');
+require_once('../../structure/index.php');
@@ -4,4 +4,4 @@
'jquery.mobile.theme.css'
);
$base = dirname(__FILE__);
-require_once('../../core/index.php');
+require_once('../../structure/index.php');

0 comments on commit bcbaa38

Please sign in to comment.