diff options
| author | Artur Signell <artur@vaadin.com> | 2013-06-28 14:52:58 +0300 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2013-06-28 14:54:20 +0300 |
| commit | c3540bf1596ca91226435a4456b3d0d2c91cea5f (patch) | |
| tree | 4d000e9f1536f99b74d03a6e3776837563e5e352 /server/src/com/vaadin/annotations | |
| parent | cdb8d682af602cc8731e7a63827b499c2da5144e (diff) | |
| parent | c107efcb1bdcf1528b56016dc277fdd44513077d (diff) | |
| download | vaadin-framework-c3540bf1596ca91226435a4456b3d0d2c91cea5f.tar.gz vaadin-framework-c3540bf1596ca91226435a4456b3d0d2c91cea5f.zip | |
Merge changes from origin/7.1
3affc37 Enable using @Stylesheet with vaadin:// (#9934)
177c424 Updated Atmosphere dependency to 1.0.14.vaadin2 (#12017, #12033, #12115)
dbfb9a3 Add version property to integration tests to servers know if it is a Vaadin 6 or 7 test
e371001 Ensure caption is used when child is set to required (#12077)
90ed657 Use atmosphere 1.0.14.vaadin3 which fixes Android 4.1 support (#12101)
6f2db49 Include Atmosphere fix for Android 4.1 (#12101)
c4ec786 Things now align better in SimpleTree, for #12058
172d704 Actually show loading indicator during loading (#12128)
6c10136 Use varargs instead of array where appropriate (#4513)
939095a Debug window poll interval claims interval is in seconds and not milliseconds (#12098)
68f025f The 'license.html' file has flaw in the HTML (unclosed span tag) (#11952)
c107efc Remove sub window references from Window javadocs (#9892)
Change-Id: Id386718b46f87a91708a51d70cdb5b47a0157e8b
Diffstat (limited to 'server/src/com/vaadin/annotations')
| -rw-r--r-- | server/src/com/vaadin/annotations/StyleSheet.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/server/src/com/vaadin/annotations/StyleSheet.java b/server/src/com/vaadin/annotations/StyleSheet.java index e06140fcd5..2e15d9481c 100644 --- a/server/src/com/vaadin/annotations/StyleSheet.java +++ b/server/src/com/vaadin/annotations/StyleSheet.java @@ -32,6 +32,11 @@ import com.vaadin.server.ClientConnector; * Relative urls are mapped to APP/PUBLISHED/[url] which are by default served * from the classpath relative to the class where the annotation is defined. * <p> + * Special Vaadin urls are also supported. The most useful is vaadin:// which + * maps to the location of the automatically published VAADIN folder. Using the + * VAADIN folder and vaadin:// you can publish stylesheets which use images or + * other files with relative paths. + * <p> * Example: {@code @StyleSheet( "http://host.com/file1.css", "file2.css"})} on * the class com.example.MyConnector would load the file * http://host.com/file1.css as is and file2.css from /com/example/file2.css on |