diff options
| author | Pekka Hyvönen <pekka@vaadin.com> | 2015-03-06 11:56:53 +0200 |
|---|---|---|
| committer | Pekka Hyvönen <pekka@vaadin.com> | 2015-03-06 12:29:24 +0200 |
| commit | 741e798633edd584e62bcb4e6a00911a86908cdf (patch) | |
| tree | 22d3b4c625376ba7f79ec82488a64f1696539d5b /WebContent/VAADIN/themes/valo | |
| parent | 3c84a54591d792b69a4d6d736714941edb1d818a (diff) | |
| parent | 4db0b55aefd83d149e62a7fad2b14fb232d976c8 (diff) | |
| download | vaadin-framework-741e798633edd584e62bcb4e6a00911a86908cdf.tar.gz vaadin-framework-741e798633edd584e62bcb4e6a00911a86908cdf.zip | |
Merge branch 'master' into grid-columnreorder
Conflicts:
uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridBasicFeaturesTest.java
uitest/src/com/vaadin/tests/widgetset/client/grid/GridBasicClientFeaturesWidget.java
Change-Id: Ic77c717b9bbdcc38585382d4944ee4491aba3f7d
Diffstat (limited to 'WebContent/VAADIN/themes/valo')
| -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 |