summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorHenri Sara <hesara@vaadin.com>2012-08-10 09:10:40 +0300
committerHenri Sara <hesara@vaadin.com>2012-08-10 09:10:40 +0300
commit239ce71f498fcdf2809c5561bf5028bf216265ca (patch)
tree01b7abefa7a870902c80848577d554595ea5da82 /build
parent0a4a462fd1e4edc71682d4b350cd03bb27700b72 (diff)
downloadvaadin-framework-239ce71f498fcdf2809c5561bf5028bf216265ca.tar.gz
vaadin-framework-239ce71f498fcdf2809c5561bf5028bf216265ca.zip
Merge SASS fixes keeping comments, remove hack for reindeer (#9223)
Diffstat (limited to 'build')
-rw-r--r--build/buildhelpers/com/vaadin/buildhelpers/CompileDefaultTheme.java17
1 files changed, 0 insertions, 17 deletions
diff --git a/build/buildhelpers/com/vaadin/buildhelpers/CompileDefaultTheme.java b/build/buildhelpers/com/vaadin/buildhelpers/CompileDefaultTheme.java
index a23e5e912e..45079ac21f 100644
--- a/build/buildhelpers/com/vaadin/buildhelpers/CompileDefaultTheme.java
+++ b/build/buildhelpers/com/vaadin/buildhelpers/CompileDefaultTheme.java
@@ -79,23 +79,6 @@ public class CompileDefaultTheme {
+ "\";}\n");
cssHeader.append(".v-theme-version-" + version + " {display: none;}\n");
- // TODO temporary hack for Reindeer
- if (useSmartSprites) {
- // TODO removed "../" from paths here
- cssHeader
- .append("/** sprite: verticals; sprite-image: url(common/img/vertical-sprites.png); sprite-layout: vertical */\n");
- cssHeader
- .append("/** sprite: horizontals; sprite-image: url(common/img/horizontal-sprites.png); sprite-layout: horizontal */\n");
- cssHeader
- .append("/** sprite: black-verticals; sprite-image: url(common/img/black-vertical-sprites.png); sprite-layout: vertical; sprite-matte-color: #1e2022 */\n");
- cssHeader
- .append("/** sprite: black-horizontals; sprite-image: url(common/img/black-horizontal-sprites.png); sprite-layout: horizontal; sprite-matte-color: #1e2022 */\n");
- cssHeader
- .append("/** sprite: buttons; sprite-image: url(button/img/button-sprites.png); sprite-layout: vertical */\n");
- cssHeader
- .append("/** sprite: black-buttons; sprite-image: url(button/img/black-button-sprites.png); sprite-layout: vertical */\n");
- }
-
String stylesCssDir = THEME_DIR + themeName + "/";
String stylesCssName = stylesCssDir + "styles.css";