Browse Source

Fix readonly checkbox opacity in Valo. (#17548)

Change-Id: I633e0deeca6c1268937d8c9b918ea414355c85f3
tags/7.5.0.rc1
Sauli Tähkäpää 9 years ago
parent
commit
45fb2934f2

+ 20
- 0
WebContent/VAADIN/themes/valo/components/_checkbox.scss View File

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


}

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

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

+ 1
- 1
uitest/src/com/vaadin/tests/themes/valo/ValoThemeUITest.java View File

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

Loading…
Cancel
Save