summaryrefslogtreecommitdiffstats
path: root/tests/sass/resources
diff options
context:
space:
mode:
authorHenri Sara <hesara@vaadin.com>2012-08-09 14:53:56 +0300
committerHenri Sara <hesara@vaadin.com>2012-08-09 14:53:56 +0300
commit0a4a462fd1e4edc71682d4b350cd03bb27700b72 (patch)
treedafdf5fc91784a81d54756df12e73dfc8a144002 /tests/sass/resources
parentef64d5becc40d85a5a27735775376062fa4ed8ff (diff)
downloadvaadin-framework-0a4a462fd1e4edc71682d4b350cd03bb27700b72.tar.gz
vaadin-framework-0a4a462fd1e4edc71682d4b350cd03bb27700b72.zip
Merge SASS change: Fixed a bug regarding replaceValue in LexicalUnitImpl
Diffstat (limited to 'tests/sass/resources')
-rw-r--r--tests/sass/resources/css/comments.css2
-rw-r--r--tests/sass/resources/css/variables.css2
-rw-r--r--tests/sass/resources/scss/variables.scss2
3 files changed, 4 insertions, 2 deletions
diff --git a/tests/sass/resources/css/comments.css b/tests/sass/resources/css/comments.css
index 32f348da9e..2a32b49ec2 100644
--- a/tests/sass/resources/css/comments.css
+++ b/tests/sass/resources/css/comments.css
@@ -1,5 +1,7 @@
/** 0sprite: verticals; sprite-image: url(../common/img/vertical-sprites.png); sprite-layout: vertical */
+
/** 1sprite: verticals; sprite-image: url(../common/img/vertical-sprites.png); sprite-layout: vertical */
+
.v-button:focus {
background-image: url(img/left-focus.png);/** sprite-ref: buttons */
outline: none;
diff --git a/tests/sass/resources/css/variables.css b/tests/sass/resources/css/variables.css
index 7c56a24c90..d54ae6cd30 100644
--- a/tests/sass/resources/css/variables.css
+++ b/tests/sass/resources/css/variables.css
@@ -1,7 +1,7 @@
.content-navigation {
border-color: #3bbfce;
color: #0000ff;
- color1: #cc0000;
+ color1: #0000d1;
font-family: Arial, Helvetica, "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana, sans-serif;
}
diff --git a/tests/sass/resources/scss/variables.scss b/tests/sass/resources/scss/variables.scss
index 3d9dada294..60acc5dd10 100644
--- a/tests/sass/resources/scss/variables.scss
+++ b/tests/sass/resources/scss/variables.scss
@@ -6,7 +6,7 @@ $chameleon-font-family: Arial, Helvetica, "Lucida Grande", "Lucida Sans Unicode"
border-color: $blue;
$blue: #0000ff;
color: $blue;
- color1: darken($blue);
+ color1: darken($blue, 9%);
font-family: $chameleon-font-family;
}