summaryrefslogtreecommitdiffstats
path: root/uitest
diff options
context:
space:
mode:
authorJouni Koivuviita <jouni@vaadin.com>2014-08-12 15:07:45 +0300
committerVaadin Code Review <review@vaadin.com>2014-08-15 13:29:04 +0000
commit9f1f5c5638757f7b727e300c7f437fd805914c54 (patch)
tree02b58ef3513ac5902bee38656ef03476cd357e6a /uitest
parentc961d06c1f3fda81da3ab8700fbda5d33d8a9325 (diff)
downloadvaadin-framework-9f1f5c5638757f7b727e300c7f437fd805914c54.tar.gz
vaadin-framework-9f1f5c5638757f7b727e300c7f437fd805914c54.zip
Add new "colored" style for Label (Valo)
Makes any Label text colored, by default the same as $v-selection-color. Modify the Forms and Labels examples to use the new style, and remove the fixed color from “light” style form layout for header labels. Change-Id: I27a4fce56b1f734aa5c2c837bf1684284b0d96cc
Diffstat (limited to 'uitest')
-rw-r--r--uitest/src/com/vaadin/tests/themes/valo/Forms.java3
-rw-r--r--uitest/src/com/vaadin/tests/themes/valo/Labels.java5
2 files changed, 8 insertions, 0 deletions
diff --git a/uitest/src/com/vaadin/tests/themes/valo/Forms.java b/uitest/src/com/vaadin/tests/themes/valo/Forms.java
index c5b08902be..90a6c51496 100644
--- a/uitest/src/com/vaadin/tests/themes/valo/Forms.java
+++ b/uitest/src/com/vaadin/tests/themes/valo/Forms.java
@@ -59,6 +59,7 @@ public class Forms extends VerticalLayout implements View {
Label section = new Label("Personal Info");
section.addStyleName("h2");
+ section.addStyleName("colored");
form.addComponent(section);
StringGenerator sg = new StringGenerator();
@@ -85,6 +86,7 @@ public class Forms extends VerticalLayout implements View {
section = new Label("Contact Info");
section.addStyleName("h3");
+ section.addStyleName("colored");
form.addComponent(section);
TextField email = new TextField("Email");
@@ -125,6 +127,7 @@ public class Forms extends VerticalLayout implements View {
section = new Label("Additional Info");
section.addStyleName("h4");
+ section.addStyleName("colored");
form.addComponent(section);
TextField website = new TextField("Website");
diff --git a/uitest/src/com/vaadin/tests/themes/valo/Labels.java b/uitest/src/com/vaadin/tests/themes/valo/Labels.java
index 63c138093c..b5bab3a1d3 100644
--- a/uitest/src/com/vaadin/tests/themes/valo/Labels.java
+++ b/uitest/src/com/vaadin/tests/themes/valo/Labels.java
@@ -102,6 +102,11 @@ public class Labels extends VerticalLayout implements View {
label.addStyleName("light");
right.addComponent(label);
+ label = new Label(
+ "Colored type for highlighted text. Etiam at risus et justo dignissim congue. Donec congue lacinia dui, a porttitor lectus condimentum laoreet. Nunc eu.");
+ label.addStyleName("colored");
+ right.addComponent(label);
+
label = new Label("A label for success");
label.addStyleName("success");
right.addComponent(label);