summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--WebContent/VAADIN/themes/valo/components/_link.scss8
-rw-r--r--uitest/src/com/vaadin/tests/themes/valo/ButtonsAndLinks.java5
-rw-r--r--uitest/src/com/vaadin/tests/themes/valo/ValoThemeUITest.java2
3 files changed, 12 insertions, 3 deletions
diff --git a/WebContent/VAADIN/themes/valo/components/_link.scss b/WebContent/VAADIN/themes/valo/components/_link.scss
index b568df1d7b..270de1aace 100644
--- a/WebContent/VAADIN/themes/valo/components/_link.scss
+++ b/WebContent/VAADIN/themes/valo/components/_link.scss
@@ -20,8 +20,8 @@ $v-link-cursor: pointer !default;
/**
*
*
- * @param {string} $primary-stylename (v-link) -
- * @param {bool} $include-additional-styles -
+ * @param {string} $primary-stylename (v-link) -
+ * @param {bool} $include-additional-styles -
*
* @group link
*/
@@ -74,4 +74,8 @@ $v-link-cursor: pointer !default;
&:hover {
color: lighten($v-link-font-color, 10%);
}
+
+ &.v-disabled {
+ @include opacity($v-disabled-opacity);
+ }
}
diff --git a/uitest/src/com/vaadin/tests/themes/valo/ButtonsAndLinks.java b/uitest/src/com/vaadin/tests/themes/valo/ButtonsAndLinks.java
index e66cd2668b..9ed48896eb 100644
--- a/uitest/src/com/vaadin/tests/themes/valo/ButtonsAndLinks.java
+++ b/uitest/src/com/vaadin/tests/themes/valo/ButtonsAndLinks.java
@@ -178,6 +178,11 @@ public class ButtonsAndLinks extends VerticalLayout implements View {
link.setIcon(testIcon.get());
link.addStyleName("large");
row.addComponent(link);
+
+ link = new Link("Disabled", new ExternalResource("https://vaadin.com"));
+ link.setIcon(testIcon.get());
+ link.setEnabled(false);
+ row.addComponent(link);
}
@Override
diff --git a/uitest/src/com/vaadin/tests/themes/valo/ValoThemeUITest.java b/uitest/src/com/vaadin/tests/themes/valo/ValoThemeUITest.java
index 92cb837b38..a826d9a8f2 100644
--- a/uitest/src/com/vaadin/tests/themes/valo/ValoThemeUITest.java
+++ b/uitest/src/com/vaadin/tests/themes/valo/ValoThemeUITest.java
@@ -39,7 +39,7 @@ public class ValoThemeUITest extends MultiBrowserTest {
public void buttonsLinks() throws Exception {
openTestURL("test");
open("Buttons & Links", "Buttons");
- compareScreen("buttonsLinks");
+ compareScreen("buttonsLinks_with_disabled");
}
@Test