Browse Source

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
tags/7.3.0.rc1
Jouni Koivuviita 9 years ago
parent
commit
9f1f5c5638

+ 0
- 1
WebContent/VAADIN/themes/valo/components/_formlayout.scss View File

@@ -198,7 +198,6 @@
> .v-label-h3,
> .v-label-h4 {
border-bottom: none;
color: $v-selection-color;
}

> .v-label-h3,

+ 5
- 0
WebContent/VAADIN/themes/valo/components/_label.scss View File

@@ -1,6 +1,7 @@
$v-font-weight--header: $v-font-weight - 100 !default;
$v-line-height--header: 1.1 !default;
$v-font-family--header: null !default;
$v-font-color--colored: $v-selection-color !default;

$v-font-size--h1: 2.4em !default;
$v-font-size--h2: 1.6em !default;
@@ -104,6 +105,10 @@ $v-letter-spacing--h4: 0 !default;

@if $include-additional-styles {

.#{$primary-stylename}-colored {
color: $v-font-color--colored;
}

.#{$primary-stylename}-large {
font-size: $v-font-size--large;
}

+ 5
- 0
server/src/com/vaadin/ui/themes/ValoTheme.java View File

@@ -185,6 +185,11 @@ public class ValoTheme {
*/
public static final String LABEL_BOLD = "bold";

/**
* Colored text. Can be combined with any other Label style.
*/
public static final String LABEL_COLORED = "colored";

/**
* Success badge style. Adds a border around the label and an icon next to
* the text. Suitable for UI notifications that need to in the direct

+ 3
- 0
uitest/src/com/vaadin/tests/themes/valo/Forms.java View File

@@ -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");

+ 5
- 0
uitest/src/com/vaadin/tests/themes/valo/Labels.java View File

@@ -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);

Loading…
Cancel
Save