diff options
| author | Jouni Koivuviita <jouni@vaadin.com> | 2014-04-16 14:08:16 +0300 |
|---|---|---|
| committer | Jouni Koivuviita <jouni@vaadin.com> | 2014-04-16 16:06:49 +0300 |
| commit | f04287fbe3d8bc9751e22608fe84a436a272dd7d (patch) | |
| tree | 2f3504f44c127f2a73e2a45cb1939ce377e59272 /WebContent/license.html | |
| parent | 9c521a6d3e2022bbdbc6bb94aca7ffe4cd01bf93 (diff) | |
| download | vaadin-framework-f04287fbe3d8bc9751e22608fe84a436a272dd7d.tar.gz vaadin-framework-f04287fbe3d8bc9751e22608fe84a436a272dd7d.zip | |
Updated license.html and release-notes.html
Added a license notice to license.html of each font that is bundled in
Valo.
Modified release notes to mention Valo (removed enhancement notes that
relate to previous release) and wrote a short how-to for using Valo in
the alpha releases.
Change-Id: I68b32856a3c5317635a40d9a0460be18d82be555
Diffstat (limited to 'WebContent/license.html')
| -rw-r--r-- | WebContent/license.html | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/WebContent/license.html b/WebContent/license.html index 0bb3f70f01..f432f68890 100644 --- a/WebContent/license.html +++ b/WebContent/license.html @@ -135,6 +135,31 @@ <td title="Custom web font">FontAwesome</td> <td><a href="licenses/OFL.txt">SIL OFL 1.1</a></td> </tr> + <!-- Included in the Valo theme --> + <tr> + <td title="Custom web font">Open Sans</td> + <td><a href="licenses/apache-license-version-2-0.txt">Apache License, version 2.0</a></td> + </tr> + <tr> + <td title="Custom web font">Roboto</td> + <td><a href="licenses/apache-license-version-2-0.txt">Apache License, version 2.0</a></td> + </tr> + <tr> + <td title="Custom web font">Roboto Condensed</td> + <td><a href="licenses/apache-license-version-2-0.txt">Apache License, version 2.0</a></td> + </tr> + <tr> + <td title="Custom web font">Source Sans Pro</td> + <td><a href="licenses/OFL.txt">SIL OFL 1.1</a></td> + </tr> + <tr> + <td title="Custom web font">Lato</td> + <td><a href="licenses/OFL.txt">SIL OFL 1.1</a></td> + </tr> + <tr> + <td title="Custom web font">Lora</td> + <td><a href="licenses/OFL.txt">SIL OFL 1.1</a></td> + </tr> <!-- The extracted vaadin-sass-compiler --> <tr> <td>Vaadin Sass Compiler</td> |