summaryrefslogtreecommitdiffstats
path: root/WebContent/VAADIN
diff options
context:
space:
mode:
authorJohannes Dahlström <johannesd@vaadin.com>2014-12-17 11:37:47 +0200
committerJohannes Dahlström <johannesd@vaadin.com>2014-12-17 13:19:54 +0200
commit4a3a97c0d07861568d336ac7f3e0ed496dc8fcbb (patch)
tree3bc05692615a7fdb8fc6184c2638619f62cc4e27 /WebContent/VAADIN
parent48904a34a20f2d501da1b6055143fd73b5b90d50 (diff)
downloadvaadin-framework-4a3a97c0d07861568d336ac7f3e0ed496dc8fcbb.tar.gz
vaadin-framework-4a3a97c0d07861568d336ac7f3e0ed496dc8fcbb.zip
Rename "active" row/cell to "focused" (#13334)
Change-Id: I7a507db8ec62b2e669cc2562cbfaf1693d394f6e
Diffstat (limited to 'WebContent/VAADIN')
-rw-r--r--WebContent/VAADIN/themes/base/grid/grid.scss16
-rw-r--r--WebContent/VAADIN/themes/reindeer/grid/grid.scss4
-rw-r--r--WebContent/VAADIN/themes/runo/grid/grid.scss4
-rw-r--r--WebContent/VAADIN/themes/valo/components/_grid.scss4
4 files changed, 14 insertions, 14 deletions
diff --git a/WebContent/VAADIN/themes/base/grid/grid.scss b/WebContent/VAADIN/themes/base/grid/grid.scss
index cb381236c1..4be0faecc6 100644
--- a/WebContent/VAADIN/themes/base/grid/grid.scss
+++ b/WebContent/VAADIN/themes/base/grid/grid.scss
@@ -1,7 +1,7 @@
$v-grid-border: 1px solid #ddd !default;
$v-grid-cell-vertical-border: $v-grid-border !default;
$v-grid-cell-horizontal-border: $v-grid-cell-vertical-border !default;
-$v-grid-cell-active-border: 1px solid !default;
+$v-grid-cell-focused-border: 1px solid !default;
$v-grid-header-border: $v-grid-border !default;
$v-grid-footer-border: $v-grid-header-border !default;
@@ -9,7 +9,7 @@ $v-grid-row-height: round($v-font-size * 1.5) !default;
$v-grid-row-background-color: #fff !default;
$v-grid-row-stripe-background-color: darken($v-grid-row-background-color, 5%) !default;
$v-grid-row-selected-background-color: darken($v-grid-row-background-color, 25%) !default;
-$v-grid-row-active-background-color: null !default;
+$v-grid-row-focused-background-color: null !default;
$v-grid-header-row-height: null !default;
$v-grid-header-font-size: $v-font-size !default;
@@ -92,8 +92,8 @@ $v-grid-editor-row-background-color: $v-grid-row-background-color !default;
background: $v-grid-row-selected-background-color;
}
- .#{$primaryStyleName}-row-active > td {
- background-color: $v-grid-row-active-background-color;
+ .#{$primaryStyleName}-row-focused > td {
+ background-color: $v-grid-row-focused-background-color;
}
// Header
@@ -169,9 +169,9 @@ $v-grid-editor-row-background-color: $v-grid-row-background-color !default;
border-top: none;
}
- // Active cell style (common for all cells)
+ // Focused cell style (common for all cells)
- .#{$primaryStyleName}-cell-active {
+ .#{$primaryStyleName}-cell-focused {
position: relative;
&:before {
@@ -181,12 +181,12 @@ $v-grid-editor-row-background-color: $v-grid-row-background-color !default;
right: 0;
bottom: 0;
left: 0;
- border: $v-grid-cell-active-border;
+ border: $v-grid-cell-focused-border;
display: none;
}
}
- .#{$primaryStyleName}:focus .#{$primaryStyleName}-cell-active:before {
+ .#{$primaryStyleName}:focus .#{$primaryStyleName}-cell-focused:before {
display: block;
}
diff --git a/WebContent/VAADIN/themes/reindeer/grid/grid.scss b/WebContent/VAADIN/themes/reindeer/grid/grid.scss
index 397aa229cd..8dacb3ccce 100644
--- a/WebContent/VAADIN/themes/reindeer/grid/grid.scss
+++ b/WebContent/VAADIN/themes/reindeer/grid/grid.scss
@@ -29,8 +29,8 @@
border-color: #466c90;
}
- // Selected and active
- > .#{$primaryStyleName}-cell-active:before {
+ // Selected and focused
+ > .#{$primaryStyleName}-cell-focused:before {
border-color: #b1cde4;
}
}
diff --git a/WebContent/VAADIN/themes/runo/grid/grid.scss b/WebContent/VAADIN/themes/runo/grid/grid.scss
index 77d7b0a9af..4d16c79fb8 100644
--- a/WebContent/VAADIN/themes/runo/grid/grid.scss
+++ b/WebContent/VAADIN/themes/runo/grid/grid.scss
@@ -22,8 +22,8 @@
.#{$primaryStyleName}-row-selected {
color: #fff;
- // Selected and active
- > .#{$primaryStyleName}-cell-active:before {
+ // Selected and focused
+ > .#{$primaryStyleName}-cell-focused:before {
border-color: lighten($v-grid-row-selected-background-color, 20%);
}
}
diff --git a/WebContent/VAADIN/themes/valo/components/_grid.scss b/WebContent/VAADIN/themes/valo/components/_grid.scss
index be9201d98d..4b2197f6a4 100644
--- a/WebContent/VAADIN/themes/valo/components/_grid.scss
+++ b/WebContent/VAADIN/themes/valo/components/_grid.scss
@@ -4,7 +4,7 @@ $v-grid-row-background-color: valo-table-background-color() !default;
$v-grid-row-stripe-background-color: scale-color($v-grid-row-background-color, $lightness: if(color-luminance($v-grid-row-background-color) < 10, 4%, -4%)) !default;
$v-grid-border: valo-border($color: $v-grid-row-background-color, $strength: 0.8) !default;
-$v-grid-cell-active-border: max(2px, first-number($v-border)) solid $v-selection-color !default;
+$v-grid-cell-focused-border: max(2px, first-number($v-border)) solid $v-selection-color !default;
$v-grid-row-height: $v-table-row-height !default;
$v-grid-row-selected-background-color: $v-selection-color !default;
@@ -61,7 +61,7 @@ $v-grid-cell-padding-horizontal: $v-table-cell-padding-horizontal !default;
border-color: adjust-color($v-selection-color, $lightness: -8%, $saturation: -8%);
}
- > .#{$primary-stylename}-cell-active:before {
+ > .#{$primary-stylename}-cell-focused:before {
border-color: adjust-color($v-selection-color, $lightness: 20%);
}
}