summaryrefslogtreecommitdiffstats
path: root/documentation
diff options
context:
space:
mode:
authorHenri Sara <hesara@vaadin.com>2016-08-04 16:17:47 +0300
committerHenri Sara <hesara@vaadin.com>2016-08-05 09:25:44 +0300
commit1cb6ec0785ef0202064028146f5d64bcbe784f0f (patch)
treeffbd01112b9b12dc41ab986784532b08f6973012 /documentation
parent119434318dfbfc867c1cc0a63139feba6cb21731 (diff)
downloadvaadin-framework-1cb6ec0785ef0202064028146f5d64bcbe784f0f.tar.gz
vaadin-framework-1cb6ec0785ef0202064028146f5d64bcbe784f0f.zip
Remove the "liferay" theme
The theme was designed for Liferay 6.0 and was following its look. Liferay 6.0 is no longer officially supported by Vaadin 8. Change-Id: I79e8ecd6674b1dce2424121d4c298b69d3f932d4
Diffstat (limited to 'documentation')
-rw-r--r--documentation/portal/portal-liferay.asciidoc9
-rw-r--r--documentation/portal/portal-ui.asciidoc3
-rw-r--r--documentation/themes/themes-creating.asciidoc1
3 files changed, 6 insertions, 7 deletions
diff --git a/documentation/portal/portal-liferay.asciidoc b/documentation/portal/portal-liferay.asciidoc
index 4081422fad..3cb0339872 100644
--- a/documentation/portal/portal-liferay.asciidoc
+++ b/documentation/portal/portal-liferay.asciidoc
@@ -136,7 +136,7 @@ The other parameters are the following:
vaadinVersion:: Vaadin release version for the Maven dependency.
uiClassName:: Class name of the UI class stub to be created.
-theme:: Theme to use. You can use either a project theme, which must be compiled before deployment, or use the [literal]#++liferay++# theme.
+theme:: Theme to use. You can use either a project theme, which must be compiled before deployment, or use one of the default themes.
portletTitle:: Title shown in the portlet title bar.
portletShortTitle:: Title shown in contexts where a shorter title is preferred.
portletKeywords:: Keywords for finding the portlet in Liferay.
@@ -195,7 +195,7 @@ If you are installing Vaadin in a Liferay version that comes bundled with an
older version of Vaadin, you first need to remove the resources as described in
<<portal.liferay.remove>>.
-In the following, we assume that you use only the built-in "liferay" theme in
+In the following, we assume that you use only the built-in "reindeer" theme in
Vaadin and the default widget set.
. Get the Vaadin installation package from the Vaadin download page
@@ -249,7 +249,8 @@ Below is an example of a [filename]#portal-ext.properties# file:
vaadin.widgetset=com.vaadin.server.DefaultWidgetSet
# Theme to use
-vaadin.theme=liferay
+# This is the default theme if nothing is specified
+vaadin.theme=reindeer
----
The allowed parameters are:
@@ -263,7 +264,7 @@ application server; in Liferay with Tomcat it would be located at
notation. If the parameter is not given, the default widget set is used.
[parameter]#vaadin.theme#:: Name of the theme to use. If the parameter is not given, the default theme is
-used, which is [literal]#++reindeer++# in Vaadin 6.
+used, which is [literal]#++reindeer++#.
diff --git a/documentation/portal/portal-ui.asciidoc b/documentation/portal/portal-ui.asciidoc
index 69c6cc3b58..9983d8004c 100644
--- a/documentation/portal/portal-ui.asciidoc
+++ b/documentation/portal/portal-ui.asciidoc
@@ -53,8 +53,7 @@ which may be easier than deploying to a portal. For Servlet 2.4 projects, a
The portlet theme is defined with the [classname]#@Theme# annotation as usual.
The theme for the UI must match a theme installed in the portal. You can use any
-of the built-in themes in Vaadin. For Liferay theme compatibility, there is a
-special [literal]#++liferay++# theme. If you use a custom theme, you need to
+of the built-in themes in Vaadin. If you use a custom theme, you need to
compile it to CSS with the theme compiler and install it in the portal under the
[filename]#VAADIN/themes# context to be served statically.
diff --git a/documentation/themes/themes-creating.asciidoc b/documentation/themes/themes-creating.asciidoc
index e856c2b41e..a28812b36d 100644
--- a/documentation/themes/themes-creating.asciidoc
+++ b/documentation/themes/themes-creating.asciidoc
@@ -170,7 +170,6 @@ Vaadin currently includes the following built-in themes:
* [literal]#++reindeer++#, the primary theme in Vaadin 6 and 7
* [literal]#++chameleon++#, an easily customizable theme
* [literal]#++runo++#, the default theme in IT Mill Toolkit 5
-* [literal]#++liferay++#, for Liferay portlets
In addition, there is the [literal]#++base++# theme, which should not be used
directly, but is extended by the other built-in themes, except valo.