diff options
| author | Henrik Paul <henrik@vaadin.com> | 2015-03-04 10:01:31 +0200 |
|---|---|---|
| committer | Henrik Paul <henrik@vaadin.com> | 2015-03-04 16:07:29 +0200 |
| commit | dc760a8a2cd74642c5e188ad7f890cb43047a6ad (patch) | |
| tree | 41902bbe0b4e7939f8292100415b84af4025024b /WebContent/VAADIN/themes | |
| parent | b4a5adca6c2d69bb521ae71fd584bef7a320e7d0 (diff) | |
| parent | 6e6dd6ff0d64917effed33c7253c3b135183c355 (diff) | |
| download | vaadin-framework-dc760a8a2cd74642c5e188ad7f890cb43047a6ad.tar.gz vaadin-framework-dc760a8a2cd74642c5e188ad7f890cb43047a6ad.zip | |
Merge branch 'master' into HEAD
Change-Id: Id48abba25a16fe7f8e679e5ce2ab3ab536951676
Diffstat (limited to 'WebContent/VAADIN/themes')
| -rw-r--r-- | WebContent/VAADIN/themes/valo/util/bourbon/functions/_transition-property-name.scss | 2 | ||||
| -rw-r--r-- | WebContent/VAADIN/themes/valo/util/readme.txt | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/WebContent/VAADIN/themes/valo/util/bourbon/functions/_transition-property-name.scss b/WebContent/VAADIN/themes/valo/util/bourbon/functions/_transition-property-name.scss index 111deeb70f..6ceae72102 100644 --- a/WebContent/VAADIN/themes/valo/util/bourbon/functions/_transition-property-name.scss +++ b/WebContent/VAADIN/themes/valo/util/bourbon/functions/_transition-property-name.scss @@ -14,7 +14,7 @@ @function transition-property-name($prop, $vendor: false) { // put other properties that need to be prefixed here aswell @if $vendor and $prop == transform { - @return unquote('-'+$vendor+'-'+$prop); + @return unquote('-' + $vendor + '-' + $prop); } @else { @return $prop; diff --git a/WebContent/VAADIN/themes/valo/util/readme.txt b/WebContent/VAADIN/themes/valo/util/readme.txt new file mode 100644 index 0000000000..6da898220f --- /dev/null +++ b/WebContent/VAADIN/themes/valo/util/readme.txt @@ -0,0 +1,8 @@ +The Bourbon library has been modified to work around the limitations of the Sass Compiler. +The following changes should be taken into account if Bourbon is upgraded to a newer +version: + +file _transition-property-name.scss, function transition-property-name: added space around +the operation '+'. This changed one line from +@return unquote('-'+$vendor+'-'+$prop); +to @return unquote('-' + $vendor + '-' + $prop);
\ No newline at end of file |