Merge pull request #629 from nschonni/sass-underscores

Use underscores for non-output Sass files

build/build-tasks.xml

@@ -111,38 +111,7 @@
 			<exclude name="**/*.min.js"/>
 		</jshint>
 	</target>
-
-	<target name="build-theme-deps" description="Initializes the Grid, JS and Base CSS projects so that the Sass has been compiled">
-		<if>
-			<available type="dir" file="${gridsrc.dir}/css"/>
-			<then />
-			<else>
-				<ant dir="${gridsrc.dir}" target="compile.sass" inheritAll="false"/>
-			</else>
-		</if>		
-		<if>
-			<available type="dir" file="${basesrc.dir}/css"/>
-			<then />
-			<else>
-				<ant dir="${basesrc.dir}" target="compile.sass" inheritAll="false"/>
-			</else>
-		</if>		
-		<if>
-			<available type="dir" file="${jssrc.dir}/css"/>
-			<then />
-			<else>
-				<ant dir="${jssrc.dir}" target="compile.sass" inheritAll="false"/>
-			</else>
-		</if>
-	</target>
-
-	<target name="clean-theme-deps" description="Clean the Grid, JS and Base CSS files. Used for after building an individual theme">
-		<ant dir="${gridsrc.dir}" target="clean-css" inheritAll="false"/>
-		<ant dir="${basesrc.dir}" target="clean-css" inheritAll="false"/>
-		<ant dir="${jssrc.dir}" target="clean-css" inheritAll="false"/>
-		<antcall target="clean-css" inheritAll="false"/>
-	</target>
-
+
 	<target name="clean-css">
 		<delete dir="${src.dir}/css" />
 	</target>

src/base/build.xml

@@ -7,7 +7,7 @@
 
 	<target name="default" depends="clean,build" description="Performs a clean and build when calling ant without any target"></target>
 
-	<target name="build" depends="-init, compile.sass" />
+	<target name="build" />
 
 	<target name="test" description="Placeholder for future test tasks"/>
 

src/grids/sass/util-ie.scss

@@ -7,15 +7,15 @@
  */
 @media screen{
 /* -----Build Include Section Start----- */
-@import 'includes/util-screen.scss';
-@import 'includes/util-desktop-screen.scss';
-@import 'includes/fix-ie7.scss';
-@import 'includes/fix-ie8.scss';
+@import 'includes/_util-screen.scss';
+@import 'includes/_util-desktop-screen.scss';
+@import 'includes/_fix-ie7.scss';
+@import 'includes/_fix-ie8.scss';
 /* -----Build Include Section End----- */
 }
 
 @media print{
 /* -----Build Include Section Start----- */
-@import 'includes/util-print.scss';
+@import 'includes/_util-print.scss';
 /* -----Build Include Section End----- */
 }

src/grids/sass/util.scss

@@ -7,24 +7,24 @@
  */
 @media screen{
 /* -----Build Include Section Start----- */
-@import 'includes/util-screen.scss';
+@import 'includes/_util-screen.scss';
 /* -----Build Include Section End----- */
 }
 @media screen and (min-width:768px) and (min-device-width:768px) {
 /* -----Build Include Section Start----- */
-@import 'includes/util-desktop-screen.scss';
+@import 'includes/_util-desktop-screen.scss';
 /* -----Build Include Section End----- */
 }
 
 /* Mobile view */
 @media screen and (max-width:767px), screen and (max-device-width:767px) {
 /* -----Build Include Section Start----- */
-@import 'includes/util-mobile.scss';
+@import 'includes/_util-mobile.scss';
 /* -----Build Include Section End----- */
 }
 
 @media print{
 /* -----Build Include Section Start----- */
-@import 'includes/util-print.scss';
+@import 'includes/_util-print.scss';
 /* -----Build Include Section End----- */
 }

src/js/build.xml

@@ -125,26 +125,8 @@
 		</cssurlembed>
 	</target>
 	<target name="-merge-css" depends="compile.sass">
-		<copy todir="${build.dir}/premerge/css">
-			<fileset dir="${src.dir}/css"/>
-		</copy>
-		<replace dir="${build.dir}/premerge/css" token="@charset &quot;utf-8&quot;;" value=" "/>
-		<concat destfile="${build.dir}/premerge/css/pe-ap.css" fixlastline="yes" append="true">
-			<fileset dir="${build.dir}/premerge/css">
-				<include name="*.css"/>
-				<exclude name="*-ie7.css"/>
-				<exclude name="*-ie8.css"/>
-				<exclude name="pe-ap*.css"/>
-			</fileset>
-		</concat>
-		<concat destfile="${build.dir}/premerge/css/pe-ap-ie.css" fixlastline="yes" append="true">
-			<fileset dir="${build.dir}/premerge/css">
-				<include name="*.css"/>
-				<exclude name="pe-ap*.css"/>
-			</fileset>
-		</concat>
 		<copy todir="${build.dir}/premin/css">
-			<filelist dir="${build.dir}/premerge/css">
+			<filelist dir="${src.dir}/css">
 				<file name="pe-ap.css"/>
 				<file name="pe-ap-ie.css"/>
 			</filelist>
@@ -156,7 +138,6 @@
 				</replacetokens>
 			</filterchain>
 		</copy>
-		<delete dir="${build.dir}/premerge"/>
 	</target>
 
 	<target name="clean-css">

src/js/sass/pe-ap-ie.scss

@@ -1,4 +1,47 @@
 /*
- * Web Experience Toolkit (WET) / Boîte à outils de l'expérience Web (BOEW)
+ * Web Experience Toolkit (WET) / Boîte à outils de l.scss';expérience Web (BOEW)
  * wet-boew.github.com/wet-boew/License-eng.txt / wet-boew.github.com/wet-boew/Licence-fra.txt
- */
+ */
+
+@import 'includes/archived';
+@import 'includes/calendar-base';
+@import 'includes/calendar-theme';
+@import 'includes/charts';
+@import 'includes/core';
+@import 'includes/datalist-ie7.scss';
+@import 'includes/datalist';
+@import 'includes/datepicker';
+@import 'includes/details-ie7.scss';
+@import 'includes/details';
+@import 'includes/events-calendar';
+@import 'includes/feedback';
+@import 'includes/footnotes-ie7.scss';
+@import 'includes/footnotes-ie8.scss';
+@import 'includes/footnotes';
+@import 'includes/formvalid';
+@import 'includes/lightbox';
+@import 'includes/menubar-ie7.scss';
+@import 'includes/menubar';
+@import 'includes/multimedia-ie7.scss';
+@import 'includes/multimedia-ie8.scss';
+@import 'includes/multimedia';
+@import 'includes/prettify';
+@import 'includes/progress';
+@import 'includes/sessiontimeout-ie7.scss';
+@import 'includes/sessiontimeout-ie8.scss';
+@import 'includes/sessiontimeout';
+@import 'includes/share-ie7.scss';
+@import 'includes/share';
+@import 'includes/slideout';
+@import 'includes/slideout-ie7.scss';
+@import 'includes/slider-ie7.scss';
+@import 'includes/slider-ie8.scss';
+@import 'includes/slider';
+@import 'includes/tabbedinterface-ie7.scss';
+@import 'includes/tabbedinterface-ie8.scss';
+@import 'includes/tabbedinterface';
+@import 'includes/texthighlight';
+@import 'includes/wamethod-ie7.scss';
+@import 'includes/wamethod';
+@import 'includes/webwidget';
+@import 'includes/zebra';

src/js/sass/pe-ap.scss

@@ -1,4 +1,31 @@
 /*
- * Web Experience Toolkit (WET) / Boîte à outils de l'expérience Web (BOEW)
- * wet-boew.github.com/wet-boew/License-eng.txt / wet-boew.github.com/wet-boew/Licence-fra.txt
- */
+ * Web Experience Toolkit (WET) / Boîte à outils de l'expérience Web (BOEW)';
+ * wet-boew.github.com/wet-boew/License-eng.txt / wet-boew.github.com/wet-boew/Licence-fra.txt';
+ */
+
+@import 'includes/archived';
+@import 'includes/calendar-base';
+@import 'includes/calendar-theme';
+@import 'includes/charts';
+@import 'includes/core';
+@import 'includes/datalist';
+@import 'includes/datepicker';
+@import 'includes/details';
+@import 'includes/events-calendar';
+@import 'includes/feedback';
+@import 'includes/footnotes';
+@import 'includes/formvalid';
+@import 'includes/lightbox';
+@import 'includes/menubar';
+@import 'includes/multimedia';
+@import 'includes/prettify';
+@import 'includes/progress';
+@import 'includes/sessiontimeout';
+@import 'includes/share';
+@import 'includes/slideout';
+@import 'includes/slider';
+@import 'includes/tabbedinterface';
+@import 'includes/texthighlight';
+@import 'includes/wamethod';
+@import 'includes/webwidget';
+@import 'includes/zebra';

src/theme-clf2-nsi2/build.xml

@@ -49,35 +49,9 @@
 		</cssurlembed>
 	</target>
 
-	<target name="-merge-css" depends="compile.sass, build-theme-deps">
-		<copy todir="${build.dir}/pre/merge/css">
-			<fileset dir="${src.dir}/css"/>
-		</copy>
-		<replace dir="${build.dir}/pre/merge/css" token="@charset &quot;utf-8&quot;;" value=" "/>
-		<copy todir="${build.dir}/pre/merge/../css">
-			<fileset dir="${src.dir}/../base/css"/>
-		</copy>
-		<copy todir="${build.dir}/pre/merge/../grids/css">
-			<fileset dir="${src.dir}/../grids/css"/>
-		</copy>
-		<copy todir="${build.dir}/pre/merge/../js/css">
-			<filelist dir="${src.dir}/../js/css">
-				<file name="pe-ap-ns.css"/>
-			</filelist>
-		</copy>
-		<replace dir="${build.dir}/pre/merge/../css" token="@charset &quot;utf-8&quot;;" value=" "/>
-		<filelist id="corefiles" dir="${build.dir}/pre/merge/css">
-			<file name="theme.css"/>
-			<file name="theme-ie.css"/>
-			<file name="theme-sp-pe.css"/>
-			<file name="theme-sp-pe-ie.css"/>
-			<file name="theme-serv.css"/>
-			<file name="theme-serv-ie.css"/>
-			<file name="theme-ns.css"/>
-		</filelist>
-
+	<target name="-merge-css" depends="compile.sass">
 		<copy todir="${build.dir}/css">
-			<filelist dir="${build.dir}/pre/merge/css">
+			<filelist dir="${src.dir}/css">
 				<file name="theme.css"/>
 				<file name="theme-ie.css"/>
 				<file name="theme-sp-pe.css"/>
@@ -94,7 +68,6 @@
 				</replacetokens>
 			</filterchain>
 		</copy>
-		<delete dir="${build.dir}/pre"/>
 	</target>
 
 	<target name="test" depends="-jshint"/>

src/theme-clf2-nsi2/sass/theme-ie.scss

@@ -3,37 +3,37 @@
  * wet-boew.github.com/wet-boew/License-eng.txt / wet-boew.github.com/wet-boew/Licence-fra.txt
  */
 /* -----Build Include Section Start----- */
-@import '../../base/sass/base.scss';
-@import '../../base/sass/base-desktop.scss';
-@import '../../base/sass/base-ie7.scss';
-@import '../../base/sass/base-ie8.scss';
-@import 'includes/default.scss';
-@import 'includes/default-desktop.scss';
-@import 'includes/default-ie7.scss';
-@import 'includes/default-ie8.scss';
+@import '../../base/sass/base';
+@import '../../base/sass/base-desktop';
+@import '../../base/sass/base-ie7';
+@import '../../base/sass/base-ie8';
+@import 'includes/default';
+@import 'includes/default-desktop';
+@import 'includes/default-ie7';
+@import 'includes/default-ie8';
 /* -----Build Include Section End----- */
 
 @media screen{
 /* -----Build Include Section Start----- */
-@import '../../base/sass/base-screen.scss';
-@import '../../base/sass/base-desktop-screen.scss';
-@import '../../base/sass/base-screen-ie7.scss';
-@import '../../base/sass/base-screen-ie8.scss';
-@import 'includes/default-screen.scss';
-@import 'includes/default-desktop-screen.scss';
-@import 'includes/default-screen-ie7.scss';
-@import 'includes/default-screen-ie8.scss';
-@import 'includes/default-responsive.scss';
+@import '../../base/sass/base-screen';
+@import '../../base/sass/base-desktop-screen';
+@import '../../base/sass/base-screen-ie7';
+@import '../../base/sass/base-screen-ie8';
+@import 'includes/default-screen';
+@import 'includes/default-desktop-screen';
+@import 'includes/default-screen-ie7';
+@import 'includes/default-screen-ie8';
+@import 'includes/default-responsive';
 /* -----Build Include Section End----- */
 }
 
 @media print{
 /* -----Build Include Section Start----- */
-@import '../../base/sass/base-print.scss';
-@import '../../base/sass/base-print-ie7.scss';
-@import '../../base/sass/base-print-ie8.scss';
-@import 'includes/default-print.scss';
-@import 'includes/default-print-ie7.scss';
-@import 'includes/default-print-ie8.scss';
+@import '../../base/sass/base-print';
+@import '../../base/sass/base-print-ie7';
+@import '../../base/sass/base-print-ie8';
+@import 'includes/default-print';
+@import 'includes/default-print-ie7';
+@import 'includes/default-print-ie8';
 /* -----Build Include Section End----- */
 }

src/theme-clf2-nsi2/sass/theme-ns.scss

@@ -3,8 +3,8 @@
  * wet-boew.github.com/wet-boew/License-eng.txt / wet-boew.github.com/wet-boew/Licence-fra.txt
  */
 /* -----Build Include Section Start----- */
-@import '../../base/sass/base-ns.scss';
-@import '../../grids/sass/responsive-ns.scss';
-@import '../../grids/sass/util-ns.scss';
-@import '../../js/sass/pe-ap-ns.scss';
+@import '../../base/sass/base-ns';
+@import '../../grids/sass/responsive-ns';
+@import '../../grids/sass/util-ns';
+@import '../../js/sass/pe-ap-ns';
 /* -----Build Include Section End----- */