Skip to content
Browse files

Merge pull request #48 from tarciosaraiva/master

Small fix for -css-remove-concatenated-stylesheets
  • Loading branch information...
2 parents 7fd134f + b4aa39e commit 8e02c9bf22479aa885bd6b92f049aabad3b06293 @roblarsen roblarsen committed Apr 9, 2012
Showing with 7 additions and 3 deletions.
  1. +3 −2 build.xml
  2. +4 −1 config/project.properties
View
5 build.xml
@@ -649,6 +649,8 @@
<fileset dir="${dir.intermediate}" includes="${page-files}"/>
</replaceregexp>
+ <foreach list="${file.stylesheets}" param="css_file" target="-css-remove-concatenated-stylesheets" />
+
</target>
@@ -791,7 +793,7 @@
<target name="-css-remove-concatenated-stylesheets">
<echo>Removing ${css_file} from html</echo>
- <replaceregexp match="&lt;link.+href=&quot;.*${css_file}&quot;.*&gt;" replace=" ">
+ <replaceregexp match="&lt;link.+href=&quot;.*${css_file}&quot;.*&gt;" replace=" " byline="true">
<fileset dir="${dir.intermediate}" includes="${page-files}"/>
</replaceregexp>
</target>
@@ -935,7 +937,6 @@
<mapper type="glob" from="*.css" to="${basedir}/${dir.publish}/${dir.css}/*.css"/>
<targetfile/>
</apply>
- <foreach list="${file.stylesheets}" param="css_file" target="-css-remove-concatenated-stylesheets" />
</target>
View
5 config/project.properties
@@ -9,8 +9,11 @@
# Note: Stylesheets will be concatenated in the order they are listed in the file.stylesheets property (i.e. the last
# file listed will be at the end of the concatenated file), so it probably makes sense to have the main style.css file
# as the first entry
+#
+# NOTE: avoid adding spaces after the comma unless your file name has spaces (which you should probably consider not using anyway)
+#
# Example:
-# file.stylesheets = style.css, lightbox.css, plugin.css
+# file.stylesheets = style.css,lightbox.css,plugin.css
#
file.stylesheets =

0 comments on commit 8e02c9b

Please sign in to comment.
Something went wrong with that request. Please try again.