diff options
author | Jouni Koivuviita <jouni@vaadin.com> | 2014-11-20 12:08:13 +0200 |
---|---|---|
committer | Vaadin Code Review <review@vaadin.com> | 2015-04-17 06:20:19 +0000 |
commit | be8befcb2006683ea57be7f9479e4aef63cc19f2 (patch) | |
tree | dddb551aeaca0d90599002f50ebc059b2381f5a6 /WebContent/VAADIN/themes/valo | |
parent | f90d32f230888de7ee684a93bcfbfb6ad2d25293 (diff) | |
download | vaadin-framework-be8befcb2006683ea57be7f9479e4aef63cc19f2.tar.gz vaadin-framework-be8befcb2006683ea57be7f9479e4aef63cc19f2.zip |
Row focus bleeds out of Table area in Valo (#14761)
Redesigned the Table column selector button, now rendered completely
inside the Table header, which works regardless of the placement of the
Table, and with the fix for the main issue.
Change-Id: I63ba34a0afc2d7b0d6b4c2dfd006cb6d0aebf2db
Diffstat (limited to 'WebContent/VAADIN/themes/valo')
-rw-r--r-- | WebContent/VAADIN/themes/valo/components/_table.scss | 50 |
1 files changed, 23 insertions, 27 deletions
diff --git a/WebContent/VAADIN/themes/valo/components/_table.scss b/WebContent/VAADIN/themes/valo/components/_table.scss index 019d8673ce..aa0465d860 100644 --- a/WebContent/VAADIN/themes/valo/components/_table.scss +++ b/WebContent/VAADIN/themes/valo/components/_table.scss @@ -137,6 +137,9 @@ $v-table-background-color: null !default; position: relative; background: $v-background-color; color: valo-font-color($v-background-color); + + // Hide row focus outline + overflow: hidden; } .#{$primary-stylename}-header table, @@ -381,7 +384,7 @@ $v-table-background-color: null !default; .#{$primary-stylename}-focus-slot-right { border-right: $v-table-border-width + 2px solid $v-focus-color; right: -$v-table-border-width - 1px; - margin-left: -$v-table-resizer-width - $v-table-border-width - 2px; + margin-left: -$v-table-resizer-width - $v-table-border-width - 2px !important; } .#{$primary-stylename}-focus-slot-left { @@ -394,33 +397,34 @@ $v-table-background-color: null !default; } .#{$primary-stylename}-column-selector { - @include valo-button-style; + @include valo-button-style($shadow: null); position: absolute; z-index: 2; - top: round($v-unit-size/-4); - right: round($v-unit-size/-4); + top: 0; + right: 0; + width: round($v-unit-size/2); height: round($v-unit-size/2); line-height: round($v-unit-size/2); - width: round($v-unit-size/2); padding: 0; - border-radius: 50%; + border-top-width: 0; + border-right-width: 0; + border-radius: 0 0 0 $v-border-radius; cursor: pointer; text-align: center; @include opacity(0); @if $v-animations-enabled { - @include transition(opacity 200ms 1s); + @include transition(opacity 200ms 2s); } &:after { content: ""; position: absolute; - $v-button-border-width: first-number($v-border); - top: -$v-button-border-width; - right: -$v-button-border-width; - bottom: -$v-button-border-width; - left: -$v-button-border-width; - border-radius: inherit; + border: none; + top: 0; + right: 0; + bottom: 0; + left: 0; } &:active:after { @include valo-button-active-style; @@ -430,22 +434,9 @@ $v-table-background-color: null !default; } } - .v-scrollable > .#{$primary-stylename} .#{$primary-stylename}-column-selector { - right: 0; - top: 0; - border-top: none; - border-right: none; - border-radius: 0 0 0 50%; - - &:after { - top: 0; - right: 0; - } - } - .#{$primary-stylename}-header-wrap:hover .#{$primary-stylename}-column-selector { @include opacity(1); - @include transition-delay(100ms); + @include transition-delay(200ms); } .v-on, @@ -505,6 +496,11 @@ $v-table-background-color: null !default; // Drag'n'drop styles + .#{$primary-stylename}-drag { + // Show drag focus outline + overflow: visible; + } + .#{$primary-stylename}-drag .#{$primary-stylename}-body { @include box-shadow(0 0 0 2px rgba($v-focus-color, .5)); |