summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--WebContent/VAADIN/themes/base/grid/grid.scss8
-rw-r--r--client/src/com/vaadin/client/ui/grid/Grid.java10
2 files changed, 16 insertions, 2 deletions
diff --git a/WebContent/VAADIN/themes/base/grid/grid.scss b/WebContent/VAADIN/themes/base/grid/grid.scss
index 69b293e26e..de30424d22 100644
--- a/WebContent/VAADIN/themes/base/grid/grid.scss
+++ b/WebContent/VAADIN/themes/base/grid/grid.scss
@@ -31,6 +31,14 @@
background: rgb(244,244,244);
}
}
+
+ .#{$primaryStyleName}-row > td {
+ background-color: #fff;
+ }
+
+ .#{$primaryStyleName}-row-stripe > td {
+ background-color: #eee;
+ }
.#{$primaryStyleName}-row-selected > td {
background: lightblue;
diff --git a/client/src/com/vaadin/client/ui/grid/Grid.java b/client/src/com/vaadin/client/ui/grid/Grid.java
index 7348ae2140..fe2157c7d3 100644
--- a/client/src/com/vaadin/client/ui/grid/Grid.java
+++ b/client/src/com/vaadin/client/ui/grid/Grid.java
@@ -762,6 +762,7 @@ public class Grid<T> extends ResizeComposite implements
private SelectionColumn selectionColumn;
+ private String rowStripeStyleName;
private String rowHasDataStyleName;
private String rowSelectedStyleName;
private String cellFocusStyleName;
@@ -1249,6 +1250,9 @@ public class Grid<T> extends ResizeComposite implements
setStyleName(rowElement, rowHasDataStyleName, hasData);
}
+ boolean isEvenIndex = (row.getRow() % 2 == 0);
+ setStyleName(rowElement, rowStripeStyleName, isEvenIndex);
+
// Assign stylename for selected rows
if (hasData) {
setStyleName(rowElement, rowSelectedStyleName,
@@ -1578,8 +1582,10 @@ public class Grid<T> extends ResizeComposite implements
escalator.setStylePrimaryName(style);
editorRow.setStylePrimaryName(style);
- rowHasDataStyleName = getStylePrimaryName() + "-row-has-data";
- rowSelectedStyleName = getStylePrimaryName() + "-row-selected";
+ String rowStyle = getStylePrimaryName() + "-row";
+ rowHasDataStyleName = rowStyle + "-has-data";
+ rowSelectedStyleName = rowStyle + "-selected";
+ rowStripeStyleName = rowStyle + "-stripe";
/*
* TODO rename CSS "active" to "focused" once Valo theme has been