launchpad-reviewers team mailing list archive

[Steve Kowalik <stevenk@xxxxxxxxxx>]

Steve Kowalik has proposed merging lp:~stevenk/launchpad/3102-by-default into lp:launchpad.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~stevenk/launchpad/3102-by-default/+merge/172937

Stop building YUI 3.9.1, and switch the default YUI version to 3.10.2. This necessitated a change in combine-css's buildout template, as one of the CSS filenames has changed.
-- 
https://code.launchpad.net/~stevenk/launchpad/3102-by-default/+merge/172937
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~stevenk/launchpad/3102-by-default into lp:launchpad.

=== modified file 'Makefile'
--- Makefile	2013-06-06 04:05:38 +0000
+++ Makefile	2013-07-04 01:23:27 +0000
@@ -23,9 +23,9 @@
 LP_BUILT_JS_ROOT=${ICING}/build
 
 JS_BUILD_DIR := build/js
-YUI_VERSIONS := 3.9.1 3.10.2
+YUI_VERSIONS := 3.10.2
 YUI_BUILDS := $(patsubst %,$(JS_BUILD_DIR)/yui-%, $(YUI_VERSIONS))
-YUI_DEFAULT := yui-3.9.1
+YUI_DEFAULT := yui-3.10.2
 YUI_DEFAULT_SYMLINK := $(JS_BUILD_DIR)/yui
 LP_JS_BUILD := $(JS_BUILD_DIR)/lp
 

=== modified file 'buildout-templates/bin/combine-css.in'
--- buildout-templates/bin/combine-css.in	2013-04-22 06:31:23 +0000
+++ buildout-templates/bin/combine-css.in	2013-07-04 01:23:27 +0000
@@ -22,7 +22,7 @@
 names = [
     'ubuntu-webfonts.css',
     'style.css',
-    'yui/cssreset/reset.css',
+    'yui/cssreset/cssreset.css',
     'yui/assets/skins/sam/calendar-base.css',
     'yui/assets/skins/sam/calendar.css',
     'yui/assets/skins/sam/calendarnavigator.css',