From c50b443eca4449b9ea82dc640294f1fd7d29c2ed Mon Sep 17 00:00:00 2001 From: Matt Lott Date: Thu, 25 Sep 2014 16:17:29 -0700 Subject: [PATCH] IE9 compat: css fixes Linking to bless-brunch git for fixes that blocked bless from splitting app.css into multiple files to address IE9 limits. sass-brunch version update fixes problems during the css file-splitting that were messing up nested @media queries. --- app/locale/en.coffee | 2 +- app/templates/home.jade | 4 ++-- package.json | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/locale/en.coffee b/app/locale/en.coffee index 2dcbae4c3..a053a90d0 100644 --- a/app/locale/en.coffee +++ b/app/locale/en.coffee @@ -95,7 +95,7 @@ home: slogan: "Learn to Code by Playing a Game" - no_ie: "CodeCombat does not run in Internet Explorer 9 or older. Sorry!" + no_ie: "CodeCombat does not run in Internet Explorer 8 or older. Sorry!" no_mobile: "CodeCombat wasn't designed for mobile devices and may not work!" play: "Play" # The big play button that just starts playing a level old_browser: "Uh oh, your browser is too old to run CodeCombat. Sorry!" diff --git a/app/templates/home.jade b/app/templates/home.jade index 4a4ab5426..119032578 100644 --- a/app/templates/home.jade +++ b/app/templates/home.jade @@ -4,8 +4,8 @@ block content h1#site-slogan(data-i18n="home.slogan") Learn to Code by Playing a Game - .alert.alert-danger.lt-ie10 - strong(data-i18n="home.no_ie") CodeCombat does not run in Internet Explorer 9 or older. Sorry! + .alert.alert-danger.lt-ie9 + strong(data-i18n="home.no_ie") CodeCombat does not run in Internet Explorer 8 or older. Sorry! if isMobile .alert.alert-danger.mobile diff --git a/package.json b/package.json index 95d305bcd..d5a56c0af 100644 --- a/package.json +++ b/package.json @@ -75,7 +75,7 @@ "javascript-brunch": "> 1.0 < 1.8", "coffee-script-brunch": "https://github.com/brunch/coffee-script-brunch/tarball/master", "coffeelint-brunch": "> 1.0 < 1.8", - "sass-brunch": "1.7.0", + "sass-brunch": "1.8.3", "css-brunch": "> 1.0 < 1.8", "jade-brunch": "> 1.0 < 1.8", "uglify-js-brunch": "~1.7.4", @@ -86,7 +86,7 @@ "marked": "0.2.x", "telepath-brunch": "https://github.com/nwinter/telepath-brunch/tarball/master", "bower": "~1.3.8", - "bless-brunch": "~1.6.1", + "bless-brunch": "https://github.com/ThomasConner/bless-brunch/tarball/master", "karma-script-launcher": "~0.1.0", "karma-chrome-launcher": "~0.1.2", "karma-firefox-launcher": "~0.1.3",