Adds combination step for CSS files

main.py

@@ -318,7 +318,7 @@ def get(self, relpath):
                                permanent=True)
 
       if (relpath == ''):
-        css_file = 'v2'
+        css_file = 'v2-base'
 
       path = os.path.join('content', relpath, 'index.html')
     else:
@@ -384,7 +384,7 @@ def get(self, relpath):
           if tut.description:
             tut.description = _(tut.description)
 
-        css_file = 'v2'
+        css_file = 'v2-combined'
         page_class = 'article'
 
         # Gather list of localizations by globbing matching directories, then

scripts/update_site_oauth.sh

@@ -2,7 +2,7 @@
 #
 # Compresses the site's JS/CSS and cache busts links before uploading the app
 # to App Engine.
-# 
+#
 # Note: This script should be used in place of using appcfg.py update directly
 # to update the application on App Engine.
 #
@@ -12,7 +12,7 @@ for arg in $@
 do
  if [ $arg = "--release" ] ; then
    versionStr=v`date +%Y%m%d`
-   
+
    git checkout -b $versionStr
 
    if [ $? -ne 0 ] ; then
@@ -34,6 +34,7 @@ do
  fi
 done
 
+./combine_css_files.sh
 ./compress_js_css.sh
 # Cache busting is handled by the GAE PageSpeed feature generating unique URLs.
 #./cachebust.py