Fix readonly checkbox opacity in Valo. (#17548)

Change-Id: I633e0deeca6c1268937d8c9b918ea414355c85f3

diff --git a/WebContent/VAADIN/themes/valo/components/_checkbox.scss b/WebContent/VAADIN/themes/valo/components/_checkbox.scss
index 7283c4cbbf832c3276abb73870cca09740d9c94d..1be12d35338c1c3ef86a613f3cda619f12a047dd 100644 (file)
--- a/WebContent/VAADIN/themes/valo/components/_checkbox.scss
+++ b/WebContent/VAADIN/themes/valo/components/_checkbox.scss
@@ -144,4 +144,24 @@
     }
   }
 
+  &.v-readonly {
+    > label,
+    > .v-icon {
+      cursor: default;
+    }
+
+    > label > .v-icon {
+      cursor: default;
+    }
+
+    :root & > input:active ~ label:after {
+      background: transparent;
+    }
+
+    :root & > input ~ label:after {
+      @include opacity($v-disabled-opacity);
+    }
+  }
+
+
 }

diff --git a/uitest/src/com/vaadin/tests/themes/valo/CheckBoxes.java b/uitest/src/com/vaadin/tests/themes/valo/CheckBoxes.java
index c79447bd8698ae2d1600af1b2ee40ce7f01f58aa..9a889b3bdaf189d247f9a7b3dba49bbee7348486 100644 (file)
--- a/uitest/src/com/vaadin/tests/themes/valo/CheckBoxes.java
+++ b/uitest/src/com/vaadin/tests/themes/valo/CheckBoxes.java
@@ -84,6 +84,11 @@ public class CheckBoxes extends VerticalLayout implements View {
         check.setIcon(testIcon.get());
         row.addComponent(check);
 
+        check = new CheckBox("Readonly", true);
+        check.setReadOnly(true);
+        check.setIcon(testIcon.get());
+        row.addComponent(check);
+
         h1 = new Label("Option Groups");
         h1.addStyleName("h1");
         addComponent(h1);

diff --git a/uitest/src/com/vaadin/tests/themes/valo/ValoThemeUITest.java b/uitest/src/com/vaadin/tests/themes/valo/ValoThemeUITest.java
index 3ab224f105f66a8c3550c25ae419dc120653530e..4ed7e33e131bf3b809f53d9de8a134749b509279 100644 (file)
--- a/uitest/src/com/vaadin/tests/themes/valo/ValoThemeUITest.java
+++ b/uitest/src/com/vaadin/tests/themes/valo/ValoThemeUITest.java
@@ -86,7 +86,7 @@ public class ValoThemeUITest extends MultiBrowserTest {
     public void checkboxes() throws Exception {
         openTestURL("test");
         open("Check Boxes & Option Groups", "Check Boxes");
-        compareScreen("checkboxes_with_disabled");
+        compareScreen("checkboxes_with_readonly");
     }
 
     @Test