diff options
| author | Henri Sara <hesara@vaadin.com> | 2012-08-10 09:10:40 +0300 |
|---|---|---|
| committer | Henri Sara <hesara@vaadin.com> | 2012-08-10 09:10:40 +0300 |
| commit | 239ce71f498fcdf2809c5561bf5028bf216265ca (patch) | |
| tree | 01b7abefa7a870902c80848577d554595ea5da82 /WebContent/VAADIN | |
| parent | 0a4a462fd1e4edc71682d4b350cd03bb27700b72 (diff) | |
| download | vaadin-framework-239ce71f498fcdf2809c5561bf5028bf216265ca.tar.gz vaadin-framework-239ce71f498fcdf2809c5561bf5028bf216265ca.zip | |
Merge SASS fixes keeping comments, remove hack for reindeer (#9223)
Diffstat (limited to 'WebContent/VAADIN')
| -rw-r--r-- | WebContent/VAADIN/themes/reindeer/a-sprite-definitions/a-sprite-definitions.scss | 12 | ||||
| -rw-r--r-- | WebContent/VAADIN/themes/reindeer/reindeer.scss | 1 |
2 files changed, 6 insertions, 7 deletions
diff --git a/WebContent/VAADIN/themes/reindeer/a-sprite-definitions/a-sprite-definitions.scss b/WebContent/VAADIN/themes/reindeer/a-sprite-definitions/a-sprite-definitions.scss index 87c598956f..ffa7ca349a 100644 --- a/WebContent/VAADIN/themes/reindeer/a-sprite-definitions/a-sprite-definitions.scss +++ b/WebContent/VAADIN/themes/reindeer/a-sprite-definitions/a-sprite-definitions.scss @@ -1,14 +1,14 @@ /*------------ * General vertical and horizontal sprites * -----------*/ -/** sprite: verticals; sprite-image: url(../common/img/vertical-sprites.png); sprite-layout: vertical */ -/** sprite: horizontals; sprite-image: url(../common/img/horizontal-sprites.png); sprite-layout: horizontal */ +/** sprite: verticals; sprite-image: url(common/img/vertical-sprites.png); sprite-layout: vertical */ +/** sprite: horizontals; sprite-image: url(common/img/horizontal-sprites.png); sprite-layout: horizontal */ -/** sprite: black-verticals; sprite-image: url(../common/img/black-vertical-sprites.png); sprite-layout: vertical; sprite-matte-color: #1e2022 */ -/** sprite: black-horizontals; sprite-image: url(../common/img/black-horizontal-sprites.png); sprite-layout: horizontal; sprite-matte-color: #1e2022 */ +/** sprite: black-verticals; sprite-image: url(common/img/black-vertical-sprites.png); sprite-layout: vertical; sprite-matte-color: #1e2022 */ +/** sprite: black-horizontals; sprite-image: url(common/img/black-horizontal-sprites.png); sprite-layout: horizontal; sprite-matte-color: #1e2022 */ /*------------ * Buttons * -----------*/ -/** sprite: buttons; sprite-image: url(../button/img/button-sprites.png); sprite-layout: vertical */ -/** sprite: black-buttons; sprite-image: url(../button/img/black-button-sprites.png); sprite-layout: vertical */
\ No newline at end of file +/** sprite: buttons; sprite-image: url(button/img/button-sprites.png); sprite-layout: vertical */ +/** sprite: black-buttons; sprite-image: url(button/img/black-button-sprites.png); sprite-layout: vertical */ diff --git a/WebContent/VAADIN/themes/reindeer/reindeer.scss b/WebContent/VAADIN/themes/reindeer/reindeer.scss index 6033466f63..0cd01f7885 100644 --- a/WebContent/VAADIN/themes/reindeer/reindeer.scss +++ b/WebContent/VAADIN/themes/reindeer/reindeer.scss @@ -3,7 +3,6 @@ // common between others for now for backwards compatibility @import "accordion/accordion.scss"; -// TODO this is problematic: comments get stripped out @import "a-sprite-definitions/a-sprite-definitions.scss"; @import "button/button.scss"; |