diff options
Diffstat (limited to 'WebContent/VAADIN/themes')
5 files changed, 50 insertions, 5 deletions
diff --git a/WebContent/VAADIN/themes/base/grid/grid.scss b/WebContent/VAADIN/themes/base/grid/grid.scss index ede4ccca0d..1653032703 100644 --- a/WebContent/VAADIN/themes/base/grid/grid.scss +++ b/WebContent/VAADIN/themes/base/grid/grid.scss @@ -125,7 +125,7 @@ $v-grid-details-border-bottom-stripe: 1px solid darken($v-grid-row-background-co border-radius: 0; } - &.opened { + &.open { .#{$primaryStyleName}-sidebar-button { width: 100%; @@ -137,11 +137,11 @@ $v-grid-details-border-bottom-stripe: 1px solid darken($v-grid-row-background-co } } - .v-ie &.opened .#{$primaryStyleName}-sidebar-button { + .v-ie &.open .#{$primaryStyleName}-sidebar-button { vertical-align: middle; } - .v-ie8 &.opened .#{$primaryStyleName}-sidebar-button:after { + .v-ie8 &.open .#{$primaryStyleName}-sidebar-button:after { display: inline; } @@ -366,6 +366,18 @@ $v-grid-details-border-bottom-stripe: 1px solid darken($v-grid-row-background-co min-height: 100%; max-height: 100%; } + + .v-datefield-button { + .v-ie8 & { + margin-left: -30px; + } + } + + .v-filterselect-button { + .v-ie8 & { + margin-left: -27px; + } + } .v-select, .v-select-select { diff --git a/WebContent/VAADIN/themes/chameleon/components/selects/selects.scss b/WebContent/VAADIN/themes/chameleon/components/selects/selects.scss index 767daa7f42..fc51e8a779 100644 --- a/WebContent/VAADIN/themes/chameleon/components/selects/selects.scss +++ b/WebContent/VAADIN/themes/chameleon/components/selects/selects.scss @@ -73,6 +73,7 @@ $select-button-negative-width : -16px; .#{$primaryStyleName}-search .#{$primaryStyleName}-button { width: 0; overflow: hidden; + margin-right: 0; } .#{$primaryStyleName}-prompt .#{$primaryStyleName}-input { diff --git a/WebContent/VAADIN/themes/runo/grid/grid.scss b/WebContent/VAADIN/themes/runo/grid/grid.scss index 71ec6e06e0..aca9821c53 100644 --- a/WebContent/VAADIN/themes/runo/grid/grid.scss +++ b/WebContent/VAADIN/themes/runo/grid/grid.scss @@ -30,7 +30,7 @@ // Sidebar .#{$primaryStyleName}-sidebar.v-contextmenu { - &.opened { + &.open { .#{$primaryStyleName}-sidebar-button { &:after { font-size: 22px; diff --git a/WebContent/VAADIN/themes/valo/components/_checkbox.scss b/WebContent/VAADIN/themes/valo/components/_checkbox.scss index 7283c4cbbf..1be12d3533 100644 --- 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/WebContent/VAADIN/themes/valo/components/_grid.scss b/WebContent/VAADIN/themes/valo/components/_grid.scss index c07d330410..27d421b9f2 100644 --- a/WebContent/VAADIN/themes/valo/components/_grid.scss +++ b/WebContent/VAADIN/themes/valo/components/_grid.scss @@ -146,6 +146,18 @@ $v-grid-details-border-bottom-stripe: $v-grid-cell-horizontal-border !default; @include box-shadow(none); } } + + .v-datefield-button { + .v-ie8 & { + margin-left: 0px; + } + } + + .v-filterselect-button { + .v-ie8 & { + margin-left: 0px; + } + } .v-textfield-focus, .v-datefield .v-textfield-focus, @@ -190,7 +202,7 @@ $v-grid-details-border-bottom-stripe: $v-grid-cell-horizontal-border !default; // Sidebar .#{$primary-stylename}-sidebar.v-contextmenu { - &.opened { + &.open { .#{$primary-stylename}-sidebar-button:after { font-size: 20px; } |