From 20f6f0ea0b94236ffaee985538e77b69f05aed5c Mon Sep 17 00:00:00 2001 From: Jouni Koivuviita Date: Fri, 17 Oct 2014 12:03:48 +0300 Subject: Fix Tabsheet close button not shown on tabsheet (Firefox 24) (#14450) Change-Id: I099f94f47f2f7aa5856026f6cf6e53629732527c --- .../VAADIN/themes/valo/components/_tabsheet.scss | 65 ++++++++++++++-------- 1 file changed, 42 insertions(+), 23 deletions(-) (limited to 'WebContent') diff --git a/WebContent/VAADIN/themes/valo/components/_tabsheet.scss b/WebContent/VAADIN/themes/valo/components/_tabsheet.scss index 7dafbe4624..fc0c67901d 100644 --- a/WebContent/VAADIN/themes/valo/components/_tabsheet.scss +++ b/WebContent/VAADIN/themes/valo/components/_tabsheet.scss @@ -208,6 +208,7 @@ $v-tabsheet-content-animation-enabled: $v-animations-enabled !default; overflow: hidden; text-overflow: ellipsis; border-bottom: max(1px, first-number($v-border))*2 solid transparent; + position: relative; @if $v-animations-enabled { @include transition(border-bottom 200ms, color 200ms); @@ -229,7 +230,6 @@ $v-tabsheet-content-animation-enabled: $v-animations-enabled !default; @include opacity($v-disabled-opacity); cursor: default; color: inherit !important; - border-bottom: none; } } @@ -251,14 +251,23 @@ $v-tabsheet-content-animation-enabled: $v-animations-enabled !default; color: $v-selection-color; } + .v-caption-closable { + padding-right: round($v-unit-size/10) + round($v-font-size * 1.1); + } + + &.icons-on-top .v-caption-closable { + padding-right: round($v-unit-size/10); + } + .#{$primary-stylename}-caption-close { - display: inline-block; + position: absolute; + right: 0; + top: 50%; + margin: round($v-font-size / -2) 0 0; font-size: round($v-font-size * 1.1); line-height: round($v-font-size * 1.1); width: round($v-font-size * 1.1); - vertical-align: middle; text-align: center; - margin: 0 round($v-font-size/-4) 0 round($v-font-size/2); border-radius: round($v-border-radius/2); color: valo-font-color($v-app-background-color, 0.4); @@ -398,9 +407,9 @@ $v-tabsheet-content-animation-enabled: $v-animations-enabled !default; @mixin valo-tabsheet-framed-style ($primary-stylename: v-tabsheet, $frame-inactive-tabs: true, $outer-frame: true, $tab-spacing: round($v-unit-size/10)) { > .#{$primary-stylename}-tabcontainer { .v-caption { - position: relative; margin-left: $tab-spacing or first-number($v-border) * -1; padding: 0 $v-layout-spacing-horizontal; + background-color: $v-app-background-color; border: first-number($v-border) solid transparent; line-height: $v-unit-size - first-number($v-border); border-radius: $v-border-radius $v-border-radius 0 0; @@ -414,6 +423,20 @@ $v-tabsheet-content-animation-enabled: $v-animations-enabled !default; background-color: darken($v-app-background-color, 3%); border-bottom-color: first-color(valo-border($color: $v-app-background-color, $strength: 0.5)); } + + &.v-disabled:hover { + background-color: $v-app-background-color; + } + } + + .v-caption-closable { + padding-right: $v-layout-spacing-horizontal + round($v-font-size * 1.1); + } + + .#{$primary-stylename}-caption-close { + top: round($v-font-size/4); + right: round($v-font-size/4); + margin-top: 0; } td:first-child .v-caption, @@ -433,17 +456,6 @@ $v-tabsheet-content-animation-enabled: $v-animations-enabled !default; border-bottom: none; padding-bottom: first-number($v-border); } - - .v-caption-closable { - padding-right: $v-layout-spacing-horizontal + round($v-font-size * 1.1); - } - - .#{$primary-stylename}-caption-close { - position: absolute; - top: round($v-font-size/4); - right: round($v-font-size/4); - margin: 0; - } } > .#{$primary-stylename}-content { @@ -471,8 +483,10 @@ $v-tabsheet-content-animation-enabled: $v-animations-enabled !default; } } - &.icons-on-top .v-caption-closable { - padding-right: $v-layout-spacing-horizontal; + &.icons-on-top { + > .#{$primary-stylename}-tabcontainer .#{$primary-stylename}-tabitem-selected .v-caption { + padding-bottom: round($v-unit-size/6) + first-number($v-border); + } } } @@ -535,17 +549,13 @@ $v-tabsheet-content-animation-enabled: $v-animations-enabled !default; * @group tabsheet */ @mixin valo-tabsheet-icons-on-top-style ($primary-stylename: v-tabsheet) { - > div > .#{$primary-stylename}-tabs { + > .#{$primary-stylename}-tabcontainer { .v-caption { padding-top: round($v-unit-size/6); padding-bottom: round($v-unit-size/6); line-height: 1.2; } - .#{$primary-stylename}-tabitem-selected .v-caption { - padding-bottom: round($v-unit-size/6) + first-number($v-border); - } - .v-icon { display: block; @@ -553,6 +563,15 @@ $v-tabsheet-content-animation-enabled: $v-animations-enabled !default; margin-left: 0; } } + + .v-caption-closable { + padding-right: $v-layout-spacing-horizontal; + } + + .#{$primary-stylename}-caption-close { + top: round($v-font-size/4); + margin-top: 0; + } } } -- cgit v1.2.3 From 4bf205eb22f94387e6aed128f4b553bdd874f9e4 Mon Sep 17 00:00:00 2001 From: Sara Seppola Date: Thu, 16 Oct 2014 16:54:11 +0300 Subject: Replace no-break-spaces with whitespaces (#14890) Change-Id: Ib378fbea73bc16caa12deb14f760025e68f16288 --- WebContent/VAADIN/themes/valo/components/_accordion.scss | 2 +- WebContent/VAADIN/themes/valo/components/_button.scss | 6 +++--- WebContent/VAADIN/themes/valo/components/_checkbox.scss | 6 +++--- WebContent/VAADIN/themes/valo/components/_combobox.scss | 8 ++++---- WebContent/VAADIN/themes/valo/components/_csslayout.scss | 2 +- WebContent/VAADIN/themes/valo/components/_datefield.scss | 6 +++--- .../VAADIN/themes/valo/components/_formlayout.scss | 10 +++++----- WebContent/VAADIN/themes/valo/components/_label.scss | 2 +- WebContent/VAADIN/themes/valo/components/_tabsheet.scss | 16 ++++++++-------- WebContent/VAADIN/themes/valo/components/_textarea.scss | 4 ++-- WebContent/VAADIN/themes/valo/components/_textfield.scss | 8 ++++---- .../VAADIN/themes/valo/util/_bevel-and-shadow.scss | 10 +++++----- WebContent/VAADIN/themes/valo/util/_gradient.scss | 2 +- WebContent/VAADIN/themes/valo/util/_lists.scss | 6 +++--- WebContent/VAADIN/themes/valo/util/_util.scss | 2 +- 15 files changed, 45 insertions(+), 45 deletions(-) (limited to 'WebContent') diff --git a/WebContent/VAADIN/themes/valo/components/_accordion.scss b/WebContent/VAADIN/themes/valo/components/_accordion.scss index 91ce4efe33..40ab29f862 100644 --- a/WebContent/VAADIN/themes/valo/components/_accordion.scss +++ b/WebContent/VAADIN/themes/valo/components/_accordion.scss @@ -2,7 +2,7 @@ * Outputs the selectors and properties for the Accordion component. * * @param {string} $primary-stylename (v-accordion) - the primary style name for the selectors - * @param {bool} $include-additional-styles - should the mixin output all the different style variations of the component + * @param {bool} $include-additional-styles - should the mixin output all the different style variations of the component * @group accordion */ @mixin valo-accordion ($primary-stylename: v-accordion, $include-additional-styles: contains($v-included-additional-styles, accordion)) { diff --git a/WebContent/VAADIN/themes/valo/components/_button.scss b/WebContent/VAADIN/themes/valo/components/_button.scss index eb57e20d2a..b1b16f5bde 100644 --- a/WebContent/VAADIN/themes/valo/components/_button.scss +++ b/WebContent/VAADIN/themes/valo/components/_button.scss @@ -2,7 +2,7 @@ * Outputs the selectors and properties for the Button component. * * @param {string} $primary-stylename (v-button) - the primary style name for the selectors - * @param {bool} $include-additional-styles - should the mixin output all the different style variations of the component + * @param {bool} $include-additional-styles - should the mixin output all the different style variations of the component * * @group button */ @@ -164,7 +164,7 @@ /** * Outputs the styles for a button variant. * - * @param {size} $unit-size ($v-unit-size) - The sizing of the button, which corresponds its height + * @param {size} $unit-size ($v-unit-size) - The sizing of the button, which corresponds its height * @param {size | list} $padding (null) - The padding of the button. Computed from other parameters by default. * @param {color} $font-color (null) - The font color of the button. Computed from the $background-color by default. * @param {number} $font-weight ($v-font-weight + 100) - The font weight of the button @@ -349,7 +349,7 @@ * Output styles for a borderless button. Expects that the targeted element * already has both valo-button-static-style and valo-button-style included. * - * @param {color} $font-color (inherit) - The font color of the borderless button + * @param {color} $font-color (inherit) - The font color of the borderless button * * @group button */ diff --git a/WebContent/VAADIN/themes/valo/components/_checkbox.scss b/WebContent/VAADIN/themes/valo/components/_checkbox.scss index 7ad08ad74d..3c418ec9b7 100644 --- a/WebContent/VAADIN/themes/valo/components/_checkbox.scss +++ b/WebContent/VAADIN/themes/valo/components/_checkbox.scss @@ -2,7 +2,7 @@ * Outputs the selectors and properties for the CheckBox component. * * @param {string} $primary-stylename (v-checkbox) - the primary style name for the selectors - * @param {bool} $include-additional-styles - should the mixin output all the different style variations of the component + * @param {bool} $include-additional-styles - should the mixin output all the different style variations of the component * * @group checkbox */ @@ -43,8 +43,8 @@ * Outputs the styles for a checkbox variant. * * @param {color} $background-color ($v-background-color) - The background color of the checkbox - * @param {size} $unit-size ($v-unit-size) - The sizing of the checkbox. The width and height of the checkbox will be the unit-size divided by 2. - * @param {color} $selection-color ($v-selection-color) - The color of the checked state icon + * @param {size} $unit-size ($v-unit-size) - The sizing of the checkbox. The width and height of the checkbox will be the unit-size divided by 2. + * @param {color} $selection-color ($v-selection-color) - The color of the checked state icon * * @group checkbox */ diff --git a/WebContent/VAADIN/themes/valo/components/_combobox.scss b/WebContent/VAADIN/themes/valo/components/_combobox.scss index 79107eb0d1..f84faef603 100644 --- a/WebContent/VAADIN/themes/valo/components/_combobox.scss +++ b/WebContent/VAADIN/themes/valo/components/_combobox.scss @@ -2,7 +2,7 @@ * Outputs the selectors and properties for the ComboBox component. * * @param {string} $primary-stylename (v-filterselect) - the primary style name for the selectors - * @param {bool} $include-additional-styles - should the mixin output all the different style variations of the component + * @param {bool} $include-additional-styles - should the mixin output all the different style variations of the component * * @group combobox */ @@ -93,7 +93,7 @@ /** * Outputs the styles for a combobox variant. * - * @param {size} $unit-size ($v-unit-size) - The sizing of the combobox, which corresponds its height + * @param {size} $unit-size ($v-unit-size) - The sizing of the combobox, which corresponds its height * @param {color} $font-color (null) - The font color of the combobox. Computed from the $background-color by default. * @param {number} $font-weight (max(400, $v-font-weight)) - The font weight of the combobox * @param {size} $font-size (null) - The font size of the combobox. Inherited from the parent by default. @@ -201,7 +201,7 @@ /** * Outputs the styles for a combobox variant input element. * - * @param {size} $unit-size ($v-unit-size) - The sizing of the input (affects the padding only, width and height are 100%) + * @param {size} $unit-size ($v-unit-size) - The sizing of the input (affects the padding only, width and height are 100%) * @param {size | list} $padding (null) - The padding of the input. Computed from other parameters by default. * @param {color} $font-color (null) - The font color of the input. Computed from the $background-color by default. * @param {number} $font-weight (null) - The font weight of the input. Inherited from the parent by default. @@ -257,7 +257,7 @@ /** * Outputs the styles for a combobox variant button element. * - * @param {size} $unit-size ($v-unit-size) - The sizing of the button, which corresponds its width. + * @param {size} $unit-size ($v-unit-size) - The sizing of the button, which corresponds its width. * @param {list} $bevel ($v-textfield-bevel) - Box-shadow value according to $v-bevel documentation * @param {color} $background-color ($v-textfield-background-color) - The background color of the input, which affects the font color of the button * @param {size} $border-radius ($v-textfield-border-radius) - The border-radius of the input, which affects the border-radius of the button diff --git a/WebContent/VAADIN/themes/valo/components/_csslayout.scss b/WebContent/VAADIN/themes/valo/components/_csslayout.scss index 3525bcad5a..c06d3c2441 100644 --- a/WebContent/VAADIN/themes/valo/components/_csslayout.scss +++ b/WebContent/VAADIN/themes/valo/components/_csslayout.scss @@ -11,7 +11,7 @@ $v-component-group-spacing: null !default; * Outputs the additional styles for the CssLayout component. Does not produce any other output. * * @param {string} $primary-stylename (v-csslayout) - the primary style name for the selectors - * @param {bool} $include-additional-styles - should the mixin output all the different style variations of the component + * @param {bool} $include-additional-styles - should the mixin output all the different style variations of the component * * @group csslayout */ diff --git a/WebContent/VAADIN/themes/valo/components/_datefield.scss b/WebContent/VAADIN/themes/valo/components/_datefield.scss index 71b50b5a77..3201288120 100644 --- a/WebContent/VAADIN/themes/valo/components/_datefield.scss +++ b/WebContent/VAADIN/themes/valo/components/_datefield.scss @@ -2,7 +2,7 @@ * Outputs the selectors and properties for the DateField component. * * @param {string} $primary-stylename (v-datefield) - the primary style name for the selectors - * @param {bool} $include-additional-styles - should the mixin output all the different style variations of the component + * @param {bool} $include-additional-styles - should the mixin output all the different style variations of the component * * @group datefield */ @@ -120,7 +120,7 @@ * * @param {list} $bevel ($v-textfield-bevel) - Box-shadow value according to $v-bevel documentation * @param {list} $shadow ($v-textfield-shadow) - Box-shadow value according to $v-shadow documentation - * @param {size} $unit-size ($v-unit-size) - The sizing of the datefield, which corresponds its height + * @param {size} $unit-size ($v-unit-size) - The sizing of the datefield, which corresponds its height * @param {list} $border ($v-textfield-border) - The border of the datefield * @param {size} $border-radius ($v-textfield-border-radius) - The border-radius of the datefield * @param {color} $background-color ($v-textfield-background-color) - The background color of the datefield @@ -189,7 +189,7 @@ /** * Outputs the styles for a date field variant button element. * - * @param {size} $unit-size ($v-unit-size) - The sizing of the button, which corresponds its width. + * @param {size} $unit-size ($v-unit-size) - The sizing of the button, which corresponds its width. * @param {list} $bevel ($v-textfield-bevel) - Box-shadow value according to $v-bevel documentation * @param {color} $background-color ($v-textfield-background-color) - The background color of the input, which affects the font color of the button * @param {size} $border-radius ($v-textfield-border-radius) - The border-radius of the input, which affects the border-radius of the button diff --git a/WebContent/VAADIN/themes/valo/components/_formlayout.scss b/WebContent/VAADIN/themes/valo/components/_formlayout.scss index da3d0b987f..f0001ffe94 100644 --- a/WebContent/VAADIN/themes/valo/components/_formlayout.scss +++ b/WebContent/VAADIN/themes/valo/components/_formlayout.scss @@ -2,7 +2,7 @@ * Outputs the selectors and properties for the FormLayout component. * * @param {string} $primary-stylename (v-formlayout) - the primary style name for the selectors - * @param {bool} $include-additional-styles - should the mixin output all the different style variations of the component + * @param {bool} $include-additional-styles - should the mixin output all the different style variations of the component * * @group formlayout */ @@ -85,17 +85,17 @@ $right: $margin; $bottom: $margin; $left: $margin; - } @else if length($margin) == 2 { + } @else if length($margin) == 2 { $top: nth($margin, 1); $right: nth($margin, 2); $bottom: nth($margin, 1); $left: nth($margin, 2); - } @else if length($margin) == 3 { + } @else if length($margin) == 3 { $top: nth($margin, 1); $right: nth($margin, 2); $bottom: nth($margin, 3); $left: nth($margin, 2); - } @else if length($margin) == 4 { + } @else if length($margin) == 4 { $top: nth($margin, 1); $right: nth($margin, 2); $bottom: nth($margin, 3); @@ -141,7 +141,7 @@ /** * Outputs the styles for a light style form layout. This mixin expects the target to have the normal styles of a form layout applied. * - * @param {size} $row-height ($v-unit-size) - The height of an individual form layout row + * @param {size} $row-height ($v-unit-size) - The height of an individual form layout row * * @group formlayout */ diff --git a/WebContent/VAADIN/themes/valo/components/_label.scss b/WebContent/VAADIN/themes/valo/components/_label.scss index b59d3e0e21..cfec847271 100644 --- a/WebContent/VAADIN/themes/valo/components/_label.scss +++ b/WebContent/VAADIN/themes/valo/components/_label.scss @@ -101,7 +101,7 @@ $v-letter-spacing--h4: 0 !default; * Outputs the selectors and styles for the Label component. * * @param {string} $primary-stylename (v-label) - the primary style name for the selectors - * @param {bool} $include-additional-styles - should the mixin output all the different style variations of the component + * @param {bool} $include-additional-styles - should the mixin output all the different style variations of the component * * @group label */ diff --git a/WebContent/VAADIN/themes/valo/components/_tabsheet.scss b/WebContent/VAADIN/themes/valo/components/_tabsheet.scss index fc0c67901d..bb3e55042a 100644 --- a/WebContent/VAADIN/themes/valo/components/_tabsheet.scss +++ b/WebContent/VAADIN/themes/valo/components/_tabsheet.scss @@ -63,7 +63,7 @@ $v-tabsheet-content-animation-enabled: $v-animations-enabled !default; * Outputs the selectors and properties for the TabSheet component. * * @param {string} $primary-stylename (v-tabsheet) - the primary style name for the selectors - * @param {bool} $include-additional-styles - should the mixin output all the different style variations of the component + * @param {bool} $include-additional-styles - should the mixin output all the different style variations of the component * * @group tabsheet */ @@ -397,7 +397,7 @@ $v-tabsheet-content-animation-enabled: $v-animations-enabled !default; /** * Outputs the styles for the framed tabsheet style. * - * @param {string} $primary-stylename (v-tabsheet) - The primary style name for the selectors + * @param {string} $primary-stylename (v-tabsheet) - The primary style name for the selectors * @param {bool} $frame-inactive-tabs (true) - Should inactive tabs be framed as well (the active tab is always framed with this style) * @param {bool} $outer-frame (true) - Should the frame contain the whole tabsheet (i.e. tabbar and tab content). If false, works like a "borderless" style. * @param {size} $tab-spacing ($v-unit-size/10) - The spacing between tabs @@ -494,8 +494,8 @@ $v-tabsheet-content-animation-enabled: $v-animations-enabled !default; /** * Outputs the styles for a tabsheet where the tabs are aligned to the position specified by the parameter in the tabbar. * - * @param {string} $primary-stylename (v-tabsheet) - The primary style name for the selectors - * @param {string} $align (center) - The alignment of the tabs inside the tabbar. Possible values: left, right, center. + * @param {string} $primary-stylename (v-tabsheet) - The primary style name for the selectors + * @param {string} $align (center) - The alignment of the tabs inside the tabbar. Possible values: left, right, center. * * @group tabsheet */ @@ -509,7 +509,7 @@ $v-tabsheet-content-animation-enabled: $v-animations-enabled !default; /** * Outputs the styles for a tabsheet where all tabs in the tabbar have equal width and span the entire width of the tabbar. * - * @param {string} $primary-stylename (v-tabsheet) - The primary style name for the selectors + * @param {string} $primary-stylename (v-tabsheet) - The primary style name for the selectors * @param {bool} $flex (false) - Should the size of the tabs be proportional to their content, i.e. should the available space in the tabbar be distributed to the tabs in relation to their content sizes. * * @group tabsheet @@ -544,7 +544,7 @@ $v-tabsheet-content-animation-enabled: $v-animations-enabled !default; /** * Outputs the styles for a tabsheet where the icons of individual tabs are on top of the tab captions. * - * @param {string} $primary-stylename (v-tabsheet) - The primary style name for the selectors + * @param {string} $primary-stylename (v-tabsheet) - The primary style name for the selectors * * @group tabsheet */ @@ -580,7 +580,7 @@ $v-tabsheet-content-animation-enabled: $v-animations-enabled !default; * Outputs the styles for a tabsheet where only the selected tab has the close button visible. * Note that the other tabs can still be closed programmatically. * - * @param {string} $primary-stylename (v-tabsheet) - The primary style name for the selectors + * @param {string} $primary-stylename (v-tabsheet) - The primary style name for the selectors * * @group tabsheet */ @@ -599,7 +599,7 @@ $v-tabsheet-content-animation-enabled: $v-animations-enabled !default; * Outputs the styles for a tabsheet where the tabbar has increased padding to separate the tabs * inside it from their surrounding container. * - * @param {string} $primary-stylename (v-tabsheet) - The primary style name for the selectors + * @param {string} $primary-stylename (v-tabsheet) - The primary style name for the selectors * * @group tabsheet */ diff --git a/WebContent/VAADIN/themes/valo/components/_textarea.scss b/WebContent/VAADIN/themes/valo/components/_textarea.scss index ffd5ba855a..d600bc14c2 100644 --- a/WebContent/VAADIN/themes/valo/components/_textarea.scss +++ b/WebContent/VAADIN/themes/valo/components/_textarea.scss @@ -2,7 +2,7 @@ * Outputs the selectors and properties for the TextArea component. * * @param {string} $primary-stylename (v-textarea) - the primary style name for the selectors - * @param {bool} $include-additional-styles - should the mixin output all the different style variations of the component + * @param {bool} $include-additional-styles - should the mixin output all the different style variations of the component * * @group textarea */ @@ -62,7 +62,7 @@ /** * Outputs the styles for a text area variant. * - * @param {size} $unit-size ($v-unit-size) - The sizing of the text area, which corresponds its height + * @param {size} $unit-size ($v-unit-size) - The sizing of the text area, which corresponds its height * @param {size | list} $padding (null) - The padding of the text area. Computed from other parameters by default. * @param {color} $font-color (null) - The font color of the text area. Computed from the $background-color by default. * @param {number} $font-weight (max(400, $v-font-weight)) - The font weight of the text area diff --git a/WebContent/VAADIN/themes/valo/components/_textfield.scss b/WebContent/VAADIN/themes/valo/components/_textfield.scss index f4ca3538bd..58f69e5e4c 100644 --- a/WebContent/VAADIN/themes/valo/components/_textfield.scss +++ b/WebContent/VAADIN/themes/valo/components/_textfield.scss @@ -51,7 +51,7 @@ $v-textfield-disabled-opacity: $v-disabled-opacity !default; * Outputs the selectors and properties for the TextField component. * * @param {string} $primary-stylename (v-textfield) - the primary style name for the selectors - * @param {bool} $include-additional-styles - should the mixin output all the different style variations of the component + * @param {bool} $include-additional-styles - should the mixin output all the different style variations of the component * * @group textfield */ @@ -122,7 +122,7 @@ $v-textfield-disabled-opacity: $v-disabled-opacity !default; /** * Outputs the styles for a text field variant. * - * @param {size} $unit-size ($v-unit-size) - The sizing of the text field, which corresponds its height + * @param {size} $unit-size ($v-unit-size) - The sizing of the text field, which corresponds its height * @param {size | list} $padding (null) - The padding of the text field. Computed from other parameters by default. * @param {color} $font-color (null) - The font color of the text field. Computed from the $background-color by default. * @param {number} $font-weight (max(400, $v-font-weight)) - The font weight of the text field @@ -254,7 +254,7 @@ $v-textfield-disabled-opacity: $v-disabled-opacity !default; * @param {list} $bevel ($v-textfield-bevel) - Box-shadow value according to $v-bevel documentation * @param {list} $shadow ($v-textfield-shadow) - Box-shadow value according to $v-shadow documentation * @param {color} $background-color ($v-textfield-background-color) - The background color of the text field - * @param {list} $gradient (null) - Valo specific gradient value. See the documentation for $v-gradient. + * @param {list} $gradient (null) - Valo specific gradient value. See the documentation for $v-gradient. * * @group textfield */ @@ -341,7 +341,7 @@ $v-textfield-disabled-opacity: $v-disabled-opacity !default; * @param {string | list} $stylenames (inline-icon) - The additional style names which will define the inline-icon style * @param {string} $input-selector (null) - Additional selector for a nested input element which should be targeted * @param {size} $unit-size ($v-unit-size) - The unit size which the resulting style will support - * @param {size} $font-size ($v-font-size) - The font size which the resulting style will support (needed for font icons) + * @param {size} $font-size ($v-font-size) - The font size which the resulting style will support (needed for font icons) * @param {size} $image-icon-size (16px) - The image icon height which the resulting style will support (needed to center the icon vertically inside the text field) * * @group text field diff --git a/WebContent/VAADIN/themes/valo/util/_bevel-and-shadow.scss b/WebContent/VAADIN/themes/valo/util/_bevel-and-shadow.scss index 346a50c9de..1065161bfc 100644 --- a/WebContent/VAADIN/themes/valo/util/_bevel-and-shadow.scss +++ b/WebContent/VAADIN/themes/valo/util/_bevel-and-shadow.scss @@ -3,7 +3,7 @@ * * @group style * - * @param {list} $border ($v-border) - CSS border value which can contain any of the color keywords + * @param {list} $border ($v-border) - CSS border value which can contain any of the color keywords * @param {color} $color ($v-background-color) - the base color to which the color keywords are applied to * @param {color} $context (null) - context/surrounding color where the border is expected to appear. The color of the final border is the darker of the two parameters passed to this function. * @param {number} $strength (1) - adjustment for the border contrast @@ -59,7 +59,7 @@ * * @group style * - * @param {list} $border ($v-border) - CSS border value which can contain any of the color keywords + * @param {list} $border ($v-border) - CSS border value which can contain any of the color keywords * @param {color} $color ($v-background-color) - the base color to which the color keywords are applied to * @param {color} $context (null) - context/surrounding color where the border is expected to appear. The color of the final border is the darker of the two parameters passed to this function. * @param {number} $strength (1) - adjustment for the border contrast @@ -88,8 +88,8 @@ * @param {number} $bevel-depth ($v-bevel-depth) - percentage defining the depth/amount of the bevel effect. Affects the color keywords specified in the $bevel parameter. * @param {list} $shadow (null) - box-shadow value according to $v-shadow documentation * @param {number} $shadow-opacity ($v-shadow-opacity) - percentage defining the opacity/amount of the shadow effect. Affects the color keywords specified in the $shadow parameter. - * @param {color} $background-color ($v-background-color) - the base color to which the color keywords are applied to - * @param {list} $gradient (null) - Valo specific gradient value. See the documentation for $v-gradient. Affects the color keywords specified in the $bevel parameter. + * @param {color} $background-color ($v-background-color) - the base color to which the color keywords are applied to + * @param {list} $gradient (null) - Valo specific gradient value. See the documentation for $v-gradient. Affects the color keywords specified in the $bevel parameter. * @param {bool} $include-focus (false) - should the box-shadow value include $v-focus-style as well (only added if $v-focus-style is a) * * @return {list} CSS box-shadow value, combined from $bevel and $shadow with all occurences of v-tint, v-shade and v-tone color keywords replaced with the corresponding actual color @@ -160,7 +160,7 @@ * * @param {list} $list - any CSS list with possible color keywords * @param {color} $color - The color to which color keywords are applied to - * @param {list} $gradient (null) - Valo specific gradient value. See the documentation for $v-gradient. Affects the replacement colors to accommodate the gradient. + * @param {list} $gradient (null) - Valo specific gradient value. See the documentation for $v-gradient. Affects the replacement colors to accommodate the gradient. * * @return {list} The input $list parameter with all occurences of v-tint, v-shade and v-tone color keywords replaced with the corresponding actual color */ diff --git a/WebContent/VAADIN/themes/valo/util/_gradient.scss b/WebContent/VAADIN/themes/valo/util/_gradient.scss index 99490046ba..a38dca704c 100644 --- a/WebContent/VAADIN/themes/valo/util/_gradient.scss +++ b/WebContent/VAADIN/themes/valo/util/_gradient.scss @@ -5,7 +5,7 @@ * * @param {color} $color ($v-background-color) - The base color for the gradient color stops * @param {list} $gradient ($v-gradient) - Valo-specific gradient value. See the documentation for $v-gradient. - * @param {color} $fallback (null) - A fallback color for browser which do not support linear gradients (IE8 and IE9 in particular). If null, the base $color is used instead. + * @param {color} $fallback (null) - A fallback color for browser which do not support linear gradients (IE8 and IE9 in particular). If null, the base $color is used instead. * @param {string} $direction (to bottom) - the direction of the linear gradient. The color stops are by default so that a lighter shade is at the start and a darker shade is at the end. */ @mixin valo-gradient($color: $v-background-color, $gradient: $v-gradient, $fallback: null, $direction: to bottom) { diff --git a/WebContent/VAADIN/themes/valo/util/_lists.scss b/WebContent/VAADIN/themes/valo/util/_lists.scss index f82c4f0fe3..e21c69fd01 100644 --- a/WebContent/VAADIN/themes/valo/util/_lists.scss +++ b/WebContent/VAADIN/themes/valo/util/_lists.scss @@ -5,7 +5,7 @@ * @param {value} $var - the value to search for * @param {bool} $recursive (false) - should any contained lists be checked for the value * - * @return {bool} true if the value is found from the list, false otherwise + * @return {bool} true if the value is found from the list, false otherwise * * @group lists */ @@ -34,7 +34,7 @@ * * @param {list} $list - the list to check * - * @return {bool} true of the list contains other nested lists, false otherwise + * @return {bool} true of the list contains other nested lists, false otherwise * * @group lists */ @@ -132,7 +132,7 @@ /** * Flatten nested lists to one list, while maintaining the original list separators. * - * @param {list} $list - the list to flatten + * @param {list} $list - the list to flatten * * @return {list} the same list with all nested lists flattened * diff --git a/WebContent/VAADIN/themes/valo/util/_util.scss b/WebContent/VAADIN/themes/valo/util/_util.scss index 585504600d..510506805f 100644 --- a/WebContent/VAADIN/themes/valo/util/_util.scss +++ b/WebContent/VAADIN/themes/valo/util/_util.scss @@ -3,7 +3,7 @@ * * @param {string} $to-align (()) - The selector to match the elements which you wish to align vertically. The targeted elements should be inline or inline-block elements. * @param {string} $align (middle) - The vertical-align value, e.g. top, middle, bottom - * @param {string} $pseudo-element (after) - Which pseudo element to use for the vertical align guide + * @param {string} $pseudo-element (after) - Which pseudo element to use for the vertical align guide * * @group util */ -- cgit v1.2.3 From c6c3e3ad49eecceb445dd1b1da70db397fe9c10e Mon Sep 17 00:00:00 2001 From: Jouni Koivuviita Date: Tue, 21 Oct 2014 14:13:15 +0300 Subject: FormLayout margins do not work (#14610) Change-Id: Ibad03664be53489121914a2dd7bb051cc6e5350c --- .../VAADIN/themes/valo/components/_formlayout.scss | 24 ++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) (limited to 'WebContent') diff --git a/WebContent/VAADIN/themes/valo/components/_formlayout.scss b/WebContent/VAADIN/themes/valo/components/_formlayout.scss index f0001ffe94..35627ebd79 100644 --- a/WebContent/VAADIN/themes/valo/components/_formlayout.scss +++ b/WebContent/VAADIN/themes/valo/components/_formlayout.scss @@ -51,6 +51,8 @@ > .v-label-h4 { position: absolute; left: 0; + right: 0; + width: auto !important; margin-top: -0.5em; padding-bottom: 0.5em; border-bottom: valo-border($color: $v-app-background-color, $strength: 0.5); @@ -114,8 +116,22 @@ padding-left: $left; } + [class*="margin-left"] > tbody > [class*="row"] > [class*="contentcell"] { + > .v-label-h2, + > .v-label-h3, + > .v-label-h4 { + left: $left; + } + } + [class*="margin-right"] > tbody > [class*="row"] > [class*="contentcell"] { padding-right: $right; + + > .v-label-h2, + > .v-label-h3, + > .v-label-h4 { + right: $right; + } } } @@ -150,7 +166,7 @@ padding: 0; } - > table > tbody > [class*="row"] > td { + > table > tbody > tr > td { padding-top: 0; height: $row-height; // Effectively min-height border-bottom: valo-border($color: $v-app-background-color, $strength: 0.3); @@ -160,7 +176,7 @@ border-bottom: none; } - > table > tbody > [class*="row"] > [class*="captioncell"] { + > table > tbody > tr > [class*="captioncell"] { color: valo-font-color($v-background-color, .5); text-align: right; padding-left: ceil($v-unit-size/3); @@ -168,6 +184,8 @@ } > table > tbody > [class*="row"] > [class*="contentcell"] { + padding-right: 0; + > .v-textfield, > .v-textarea, > .v-filterselect, @@ -208,6 +226,8 @@ > .v-label-h3, > .v-label-h4 { border-bottom: none; + left: 0; + right: 0; } > .v-label-h3, -- cgit v1.2.3 From 949215f3d89485d02a57bebdd45d7ea2904e28e1 Mon Sep 17 00:00:00 2001 From: "denis.magdenkov" Date: Wed, 1 Oct 2014 17:50:30 +0400 Subject: Fix button on immediate upload does not obey setWidth() (#14485) Added sass selector for upload in base theme. Change-Id: Iebf796f0965de6afeac98d6e2a2a9246c9251bab --- WebContent/VAADIN/themes/base/upload/upload.scss | 3 ++ .../upload/UploadImmediateButtonWidth.java | 55 ++++++++++++++++++++++ .../upload/UploadImmediateButtonWidthTest.java | 47 ++++++++++++++++++ 3 files changed, 105 insertions(+) create mode 100644 uitest/src/com/vaadin/tests/components/upload/UploadImmediateButtonWidth.java create mode 100644 uitest/src/com/vaadin/tests/components/upload/UploadImmediateButtonWidthTest.java (limited to 'WebContent') diff --git a/WebContent/VAADIN/themes/base/upload/upload.scss b/WebContent/VAADIN/themes/base/upload/upload.scss index 933482764c..e705fc1c78 100644 --- a/WebContent/VAADIN/themes/base/upload/upload.scss +++ b/WebContent/VAADIN/themes/base/upload/upload.scss @@ -9,6 +9,9 @@ position: relative; margin: 0; overflow: hidden; + .v-button{ + width:100%; + } } .v-ff & .#{$primaryStyleName}-immediate, diff --git a/uitest/src/com/vaadin/tests/components/upload/UploadImmediateButtonWidth.java b/uitest/src/com/vaadin/tests/components/upload/UploadImmediateButtonWidth.java new file mode 100644 index 0000000000..b0314e9907 --- /dev/null +++ b/uitest/src/com/vaadin/tests/components/upload/UploadImmediateButtonWidth.java @@ -0,0 +1,55 @@ +/* + * Copyright 2000-2014 Vaadin Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ +package com.vaadin.tests.components.upload; + +import com.vaadin.server.VaadinRequest; +import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.ui.Upload; +import com.vaadin.ui.VerticalLayout; + +public class UploadImmediateButtonWidth extends AbstractTestUI { + + @Override + protected void setup(VaadinRequest request) { + VerticalLayout lt = new VerticalLayout(); + lt.setWidth("500px"); + + Upload upload1 = new Upload(); + upload1.setImmediate(true); + upload1.setId("upload1"); + upload1.setWidth("300px"); + lt.addComponent(upload1); + + Upload upload2 = new Upload(); + upload2.setImmediate(true); + upload2.setWidth("50%"); + upload2.setId("upload2"); + lt.addComponent(upload2); + + addComponent(lt); + } + + @Override + protected String getTestDescription() { + return "Width of immediate upload button should obey setWidth()"; + } + + @Override + protected Integer getTicketNumber() { + return 14485; + } + +} diff --git a/uitest/src/com/vaadin/tests/components/upload/UploadImmediateButtonWidthTest.java b/uitest/src/com/vaadin/tests/components/upload/UploadImmediateButtonWidthTest.java new file mode 100644 index 0000000000..37dcb47929 --- /dev/null +++ b/uitest/src/com/vaadin/tests/components/upload/UploadImmediateButtonWidthTest.java @@ -0,0 +1,47 @@ +/* + * Copyright 2000-2014 Vaadin Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ +package com.vaadin.tests.components.upload; + +import static org.junit.Assert.assertEquals; + +import org.junit.Test; +import org.openqa.selenium.WebElement; + +import com.vaadin.testbench.By; +import com.vaadin.tests.tb3.MultiBrowserTest; + +public class UploadImmediateButtonWidthTest extends MultiBrowserTest { + + private void checkButtonWidth(String id, int expectedWidth) { + WebElement upload = driver.findElement(By.id(id)); + WebElement button = upload.findElement(By.className("v-button")); + assertEquals("width of button " + id + " is incorrect", expectedWidth, + button.getSize().getWidth()); + } + + @Test + public void buttonWithPixelWidth() { + openTestURL(); + checkButtonWidth("upload1", 300); + } + + @Test + public void buttonWithPercentageWidth() { + openTestURL(); + checkButtonWidth("upload2", 250); + } + +} -- cgit v1.2.3 From 5a8f373e53f804b1e49d40bf74040fc69381b985 Mon Sep 17 00:00:00 2001 From: Artur Signell Date: Thu, 16 Oct 2014 11:28:12 +0300 Subject: Update GWT to 2.7.0.beta1vaadin1. Update client-compiler-deps to 1.2.0. Fix classpaths for devmodes. Change-Id: I8452271594b4563bf476420ff7ab22985913e397 --- WebContent/license.html | 12 ++++++++- WebContent/licenses/ow2-asm-license.txt | 31 ++++++++++++++++++++++ build.properties | 2 +- build/ide.xml | 3 ++- client-compiler/ivy.xml | 8 +++++- .../src/com/vaadin/tools/CvalChecker.java | 7 ++--- client/src/com/vaadin/Vaadin.gwt.xml | 9 ++----- eclipse/Development Mode (vaadin).launch | 2 +- eclipse/Super Development Mode (vaadin).launch | 2 +- 9 files changed, 60 insertions(+), 16 deletions(-) create mode 100644 WebContent/licenses/ow2-asm-license.txt (limited to 'WebContent') diff --git a/WebContent/license.html b/WebContent/license.html index 0ce22da99c..48be15b98d 100644 --- a/WebContent/license.html +++ b/WebContent/license.html @@ -90,6 +90,16 @@ Apache License, Version 2.0 + + Closure Stylesheets + Apache License, Version 2.0 + + + + ASM + ASM Project License + + Guava @@ -99,7 +109,7 @@ JSON - The JSON License + Apache License, Version 2.0 diff --git a/WebContent/licenses/ow2-asm-license.txt b/WebContent/licenses/ow2-asm-license.txt new file mode 100644 index 0000000000..b8ed869a5c --- /dev/null +++ b/WebContent/licenses/ow2-asm-license.txt @@ -0,0 +1,31 @@ +http://asm.ow2.org/license.html + +Copyright (c) 2000-2011 INRIA, France Telecom +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: + +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + +3. Neither the name of the copyright holders nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF +THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file diff --git a/build.properties b/build.properties index a9ad640e53..9df1c8d767 100644 --- a/build.properties +++ b/build.properties @@ -6,5 +6,5 @@ vaadin.url=http://vaadin.com vaadin.java.version=1.6 vaadin.version=0.0.0.unversioned-development-build vaadin.sass.version=0.9.10 -gwt.version=2.6.0.vaadin5 +gwt.version=2.7.0.beta1vaadin1 commons-io.version=2.4 diff --git a/build/ide.xml b/build/ide.xml index fff4ba911d..7c5267ef30 100755 --- a/build/ide.xml +++ b/build/ide.xml @@ -29,10 +29,10 @@ - + @@ -163,6 +163,7 @@ + diff --git a/client-compiler/ivy.xml b/client-compiler/ivy.xml index 0b87069f2c..af60b76e22 100644 --- a/client-compiler/ivy.xml +++ b/client-compiler/ivy.xml @@ -44,6 +44,12 @@ conf="build,ide -> default" /> + + + @@ -88,7 +94,7 @@ conf="build,ide -> default" /> + rev="1.2.0" conf="build,ide -> default" /> diff --git a/client-compiler/src/com/vaadin/tools/CvalChecker.java b/client-compiler/src/com/vaadin/tools/CvalChecker.java index 53cbce798e..b3345c7658 100644 --- a/client-compiler/src/com/vaadin/tools/CvalChecker.java +++ b/client-compiler/src/com/vaadin/tools/CvalChecker.java @@ -32,10 +32,11 @@ import java.util.Locale; import java.util.ResourceBundle; import java.util.prefs.Preferences; +import org.apache.commons.io.IOUtils; + import elemental.json.JsonException; import elemental.json.JsonObject; import elemental.json.impl.JsonUtil; -import org.apache.commons.io.IOUtils; /** * This class is able to validate the vaadin CVAL license. @@ -54,8 +55,8 @@ public final class CvalChecker { * It is not in a separate f le, so as it is easier to copy into any product * which does not depend on vaadin core. * - * We are using org.json in order not to use additional dependency like - * auto-beans, gson, etc. + * We are using elemental.json in order not to use additional dependency + * like auto-beans, gson, etc. */ public static class CvalInfo { diff --git a/client/src/com/vaadin/Vaadin.gwt.xml b/client/src/com/vaadin/Vaadin.gwt.xml index aad0563975..5e8f08fe22 100644 --- a/client/src/com/vaadin/Vaadin.gwt.xml +++ b/client/src/com/vaadin/Vaadin.gwt.xml @@ -13,11 +13,7 @@ - - - - + @@ -58,10 +54,9 @@ - - + diff --git a/eclipse/Development Mode (vaadin).launch b/eclipse/Development Mode (vaadin).launch index 2b8ff23ce8..072b9a57c4 100644 --- a/eclipse/Development Mode (vaadin).launch +++ b/eclipse/Development Mode (vaadin).launch @@ -15,9 +15,9 @@ - + diff --git a/eclipse/Super Development Mode (vaadin).launch b/eclipse/Super Development Mode (vaadin).launch index ed243cba82..b57410bfd6 100644 --- a/eclipse/Super Development Mode (vaadin).launch +++ b/eclipse/Super Development Mode (vaadin).launch @@ -15,9 +15,9 @@ - + -- cgit v1.2.3 From 77bb7ac886bd9f82e5295323254cd9fbb8ea8a10 Mon Sep 17 00:00:00 2001 From: Sauli Tähkäpää Date: Thu, 30 Oct 2014 16:11:10 +0200 Subject: Set upload button width to 100% when immediate on Valo. (#14485) Change-Id: I473fc080c143bc242326bd6f2b819450c42ffae5 --- WebContent/VAADIN/themes/base/upload/upload.scss | 5 ++- .../VAADIN/themes/valo/components/_upload.scss | 8 +++-- .../upload/UploadImmediateButtonWidth.java | 41 +++++++++++++--------- .../UploadImmediateButtonWidthChameleonTest.java | 36 +++++++++++++++++++ .../UploadImmediateButtonWidthReindeerTest.java | 36 +++++++++++++++++++ .../upload/UploadImmediateButtonWidthRunoTest.java | 36 +++++++++++++++++++ .../upload/UploadImmediateButtonWidthTest.java | 36 ++++++++++++------- .../upload/UploadImmediateButtonWidthValoTest.java | 36 +++++++++++++++++++ 8 files changed, 200 insertions(+), 34 deletions(-) create mode 100644 uitest/src/com/vaadin/tests/components/upload/UploadImmediateButtonWidthChameleonTest.java create mode 100644 uitest/src/com/vaadin/tests/components/upload/UploadImmediateButtonWidthReindeerTest.java create mode 100644 uitest/src/com/vaadin/tests/components/upload/UploadImmediateButtonWidthRunoTest.java create mode 100644 uitest/src/com/vaadin/tests/components/upload/UploadImmediateButtonWidthValoTest.java (limited to 'WebContent') diff --git a/WebContent/VAADIN/themes/base/upload/upload.scss b/WebContent/VAADIN/themes/base/upload/upload.scss index e705fc1c78..f8e707446c 100644 --- a/WebContent/VAADIN/themes/base/upload/upload.scss +++ b/WebContent/VAADIN/themes/base/upload/upload.scss @@ -4,12 +4,11 @@ white-space: nowrap; } - .#{$primaryStyleName}-immediate { position: relative; margin: 0; overflow: hidden; - .v-button{ + .v-button { width:100%; } } @@ -39,4 +38,4 @@ text-align: left; } -} \ No newline at end of file +} diff --git a/WebContent/VAADIN/themes/valo/components/_upload.scss b/WebContent/VAADIN/themes/valo/components/_upload.scss index c301be060a..07a51f03ef 100644 --- a/WebContent/VAADIN/themes/valo/components/_upload.scss +++ b/WebContent/VAADIN/themes/valo/components/_upload.scss @@ -1,7 +1,7 @@ /** * * - * @param {string} $primary-stylename (v-upload) - + * @param {string} $primary-stylename (v-upload) - * * @group upload */ @@ -10,6 +10,10 @@ @include valo-widget-style; } + .#{$primary-stylename}-immediate .v-button { + width: 100%; + } + .#{$primary-stylename}-immediate input[type="file"] { @include opacity(0); z-index: 2; @@ -20,4 +24,4 @@ border: none; background: transparent; } -} \ No newline at end of file +} diff --git a/uitest/src/com/vaadin/tests/components/upload/UploadImmediateButtonWidth.java b/uitest/src/com/vaadin/tests/components/upload/UploadImmediateButtonWidth.java index b0314e9907..48dd96bc43 100644 --- a/uitest/src/com/vaadin/tests/components/upload/UploadImmediateButtonWidth.java +++ b/uitest/src/com/vaadin/tests/components/upload/UploadImmediateButtonWidth.java @@ -20,31 +20,38 @@ import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.Upload; import com.vaadin.ui.VerticalLayout; +// We're explicitly testing only immediate uploads here because non-immediate +// width issues still require planning before we can provide a fix. public class UploadImmediateButtonWidth extends AbstractTestUI { @Override protected void setup(VaadinRequest request) { - VerticalLayout lt = new VerticalLayout(); - lt.setWidth("500px"); - - Upload upload1 = new Upload(); - upload1.setImmediate(true); - upload1.setId("upload1"); - upload1.setWidth("300px"); - lt.addComponent(upload1); - - Upload upload2 = new Upload(); - upload2.setImmediate(true); - upload2.setWidth("50%"); - upload2.setId("upload2"); - lt.addComponent(upload2); - - addComponent(lt); + + // Let's use a separate layout without margins to make the + // button widths not dependent on the selected theme. + VerticalLayout layout = new VerticalLayout(); + layout.setWidth("500px"); + + layout.addComponent(getImmediateUpload("upload1", "300px")); + layout.addComponent(getImmediateUpload("upload2", "50%")); + layout.addComponent(getImmediateUpload("upload3", "")); + + addComponent(layout); + } + + private Upload getImmediateUpload(String id, String width) { + Upload upload = new Upload(); + + upload.setId(id); + upload.setWidth(width); + upload.setImmediate(true); + + return upload; } @Override protected String getTestDescription() { - return "Width of immediate upload button should obey setWidth()"; + return "Width of the upload button should obey setWidth() when using immediate"; } @Override diff --git a/uitest/src/com/vaadin/tests/components/upload/UploadImmediateButtonWidthChameleonTest.java b/uitest/src/com/vaadin/tests/components/upload/UploadImmediateButtonWidthChameleonTest.java new file mode 100644 index 0000000000..a0d6d471fb --- /dev/null +++ b/uitest/src/com/vaadin/tests/components/upload/UploadImmediateButtonWidthChameleonTest.java @@ -0,0 +1,36 @@ +/* + * Copyright 2000-2014 Vaadin Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ +package com.vaadin.tests.components.upload; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.closeTo; + +import com.vaadin.ui.themes.*; +import org.junit.Test; + +public class UploadImmediateButtonWidthChameleonTest extends + UploadImmediateButtonWidthTest { + + @Override + protected String getTheme() { + return ChameleonTheme.THEME_NAME; + } + + @Test + public void immediateButtonWithUndefinedWidth() { + assertThat(getButtonWidth("upload3"), closeTo(69, 4)); + } +} diff --git a/uitest/src/com/vaadin/tests/components/upload/UploadImmediateButtonWidthReindeerTest.java b/uitest/src/com/vaadin/tests/components/upload/UploadImmediateButtonWidthReindeerTest.java new file mode 100644 index 0000000000..c22e416a25 --- /dev/null +++ b/uitest/src/com/vaadin/tests/components/upload/UploadImmediateButtonWidthReindeerTest.java @@ -0,0 +1,36 @@ +/* + * Copyright 2000-2014 Vaadin Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ +package com.vaadin.tests.components.upload; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.closeTo; + +import com.vaadin.ui.themes.*; +import org.junit.Test; + +public class UploadImmediateButtonWidthReindeerTest extends + UploadImmediateButtonWidthTest { + + @Override + protected String getTheme() { + return Reindeer.THEME_NAME; + } + + @Test + public void immediateButtonWithUndefinedWidth() { + assertThat(getButtonWidth("upload3"), closeTo(67, 8)); + } +} \ No newline at end of file diff --git a/uitest/src/com/vaadin/tests/components/upload/UploadImmediateButtonWidthRunoTest.java b/uitest/src/com/vaadin/tests/components/upload/UploadImmediateButtonWidthRunoTest.java new file mode 100644 index 0000000000..0ab4fbbc7e --- /dev/null +++ b/uitest/src/com/vaadin/tests/components/upload/UploadImmediateButtonWidthRunoTest.java @@ -0,0 +1,36 @@ +/* + * Copyright 2000-2014 Vaadin Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ +package com.vaadin.tests.components.upload; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.closeTo; + +import com.vaadin.ui.themes.*; +import org.junit.Test; + +public class UploadImmediateButtonWidthRunoTest extends + UploadImmediateButtonWidthTest { + + @Override + protected String getTheme() { + return Runo.THEME_NAME; + } + + @Test + public void immediateButtonWithUndefinedWidth() { + assertThat(getButtonWidth("upload3"), closeTo(72, 6)); + } +} diff --git a/uitest/src/com/vaadin/tests/components/upload/UploadImmediateButtonWidthTest.java b/uitest/src/com/vaadin/tests/components/upload/UploadImmediateButtonWidthTest.java index 37dcb47929..b2a29c92e3 100644 --- a/uitest/src/com/vaadin/tests/components/upload/UploadImmediateButtonWidthTest.java +++ b/uitest/src/com/vaadin/tests/components/upload/UploadImmediateButtonWidthTest.java @@ -15,7 +15,8 @@ */ package com.vaadin.tests.components.upload; -import static org.junit.Assert.assertEquals; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.MatcherAssert.assertThat; import org.junit.Test; import org.openqa.selenium.WebElement; @@ -23,25 +24,36 @@ import org.openqa.selenium.WebElement; import com.vaadin.testbench.By; import com.vaadin.tests.tb3.MultiBrowserTest; -public class UploadImmediateButtonWidthTest extends MultiBrowserTest { +public abstract class UploadImmediateButtonWidthTest extends MultiBrowserTest { - private void checkButtonWidth(String id, int expectedWidth) { + protected abstract String getTheme(); + + protected double getButtonWidth(String id) { WebElement upload = driver.findElement(By.id(id)); WebElement button = upload.findElement(By.className("v-button")); - assertEquals("width of button " + id + " is incorrect", expectedWidth, - button.getSize().getWidth()); + + return button.getSize().getWidth(); } - @Test - public void buttonWithPixelWidth() { - openTestURL(); - checkButtonWidth("upload1", 300); + @Override + protected Class getUIClass() { + return UploadImmediateButtonWidth.class; + } + + @Override + public void setup() throws Exception { + super.setup(); + + openTestURL(String.format("theme=%s", getTheme())); } @Test - public void buttonWithPercentageWidth() { - openTestURL(); - checkButtonWidth("upload2", 250); + public void immediateButtonWithPixelWidth() { + assertThat(getButtonWidth("upload1"), is(300.0)); } + @Test + public void immediateButtonWithPercentageWidth() { + assertThat(getButtonWidth("upload2"), is(250.0)); + } } diff --git a/uitest/src/com/vaadin/tests/components/upload/UploadImmediateButtonWidthValoTest.java b/uitest/src/com/vaadin/tests/components/upload/UploadImmediateButtonWidthValoTest.java new file mode 100644 index 0000000000..9d8fe6ba9e --- /dev/null +++ b/uitest/src/com/vaadin/tests/components/upload/UploadImmediateButtonWidthValoTest.java @@ -0,0 +1,36 @@ +/* + * Copyright 2000-2014 Vaadin Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ +package com.vaadin.tests.components.upload; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.closeTo; + +import com.vaadin.ui.themes.*; +import org.junit.Test; + +public class UploadImmediateButtonWidthValoTest extends + UploadImmediateButtonWidthTest { + + @Override + protected String getTheme() { + return ValoTheme.THEME_NAME; + } + + @Test + public void immediateButtonWithUndefinedWidth() { + assertThat(getButtonWidth("upload3"), closeTo(89, 2)); + } +} -- cgit v1.2.3 From dda24122a7a0a0491fc5cac69792fe37a826803e Mon Sep 17 00:00:00 2001 From: Sauli Tähkäpää Date: Sat, 1 Nov 2014 14:04:39 +0200 Subject: Reverse asc and desc table sorting indicators for Valo. (#15123) Change-Id: If649d7ab0b4257cfaa1488dfff88afa8ef122f67 --- .../VAADIN/themes/valo/components/_table.scss | 4 +- .../tests/themes/valo/TableSortIndicator.java | 34 ++++++++++++++++ .../tests/themes/valo/TableSortIndicatorTest.java | 46 ++++++++++++++++++++++ 3 files changed, 82 insertions(+), 2 deletions(-) create mode 100644 uitest/src/com/vaadin/tests/themes/valo/TableSortIndicator.java create mode 100644 uitest/src/com/vaadin/tests/themes/valo/TableSortIndicatorTest.java (limited to 'WebContent') diff --git a/WebContent/VAADIN/themes/valo/components/_table.scss b/WebContent/VAADIN/themes/valo/components/_table.scss index d8a673294d..a70532ccfd 100644 --- a/WebContent/VAADIN/themes/valo/components/_table.scss +++ b/WebContent/VAADIN/themes/valo/components/_table.scss @@ -612,7 +612,7 @@ $v-table-background-color: null !default; * @group table */ @mixin valo-table-sort-asc-icon-style { - content: '\f0dd'; + content: '\f0de'; font-family: FontAwesome; } @@ -623,7 +623,7 @@ $v-table-background-color: null !default; * @group table */ @mixin valo-table-sort-desc-icon-style { - content: '\f0de'; + content: '\f0dd'; font-family: FontAwesome; } diff --git a/uitest/src/com/vaadin/tests/themes/valo/TableSortIndicator.java b/uitest/src/com/vaadin/tests/themes/valo/TableSortIndicator.java new file mode 100644 index 0000000000..74e5fcd0ef --- /dev/null +++ b/uitest/src/com/vaadin/tests/themes/valo/TableSortIndicator.java @@ -0,0 +1,34 @@ +package com.vaadin.tests.themes.valo; + +import com.vaadin.annotations.*; +import com.vaadin.server.*; +import com.vaadin.tests.components.*; +import com.vaadin.ui.*; + +@Theme("valo") +public class TableSortIndicator extends AbstractTestUI { + @Override + protected void setup(VaadinRequest request) { + Table table = new Table(); + table.addContainerProperty("Index", Integer.class, ""); + + for(int i=0;i<10;i++) { + table.addItem(new Object[] {i}, i); + } + + table.setPageLength(0); + + addComponent(table); + } + + @Override + protected String getTestDescription() { + return "For Valo, sorting indicators should point up when sorted asc " + + "and down when sorted desc."; + } + + @Override + protected Integer getTicketNumber() { + return 15123; + } +} diff --git a/uitest/src/com/vaadin/tests/themes/valo/TableSortIndicatorTest.java b/uitest/src/com/vaadin/tests/themes/valo/TableSortIndicatorTest.java new file mode 100644 index 0000000000..42f0b2aeae --- /dev/null +++ b/uitest/src/com/vaadin/tests/themes/valo/TableSortIndicatorTest.java @@ -0,0 +1,46 @@ +package com.vaadin.tests.themes.valo; + +import com.vaadin.testbench.By; +import com.vaadin.tests.tb3.*; +import org.junit.*; +import org.openqa.selenium.*; + +import java.io.*; + +public class TableSortIndicatorTest extends MultiBrowserTest { + + private void clickOnCellHeader() { + clickElementByClass("v-table-header-cell"); + } + + @Test + public void ascendingIndicatorIsShown() throws IOException { + openTestURL(); + + clickOnCellHeader(); + + compareScreen("ascending"); + } + + @Test + public void descendingIndicatorIsShown() throws IOException { + openTestURL(); + + clickOnCellHeader(); + clickOnSortIndicator(); + + compareScreen("descending"); + } + + private void clickOnSortIndicator() { + clickElementByClass("v-table-sort-indicator"); + } + + private void clickElementByClass(String className) { + findElementByClass(className).click(); + } + + private WebElement findElementByClass(String className) { + return driver.findElement(By.className(className)); + } +} \ No newline at end of file -- cgit v1.2.3 From 67f669035a12d6c0ec3661f283d28717279e144d Mon Sep 17 00:00:00 2001 From: Anna Koskinen Date: Tue, 28 Oct 2014 16:51:45 +0200 Subject: TreeTable column header and footer height fix (#15121) Fix for regression caused by (#14812) + Valo test for TreeTables. Change-Id: I57f911cbf33e52196fa219b4feddfe62db7f6ded --- WebContent/VAADIN/themes/valo/components/_treetable.scss | 6 ++++++ uitest/src/com/vaadin/tests/themes/valo/ValoThemeUITest.java | 9 +++++++++ 2 files changed, 15 insertions(+) (limited to 'WebContent') diff --git a/WebContent/VAADIN/themes/valo/components/_treetable.scss b/WebContent/VAADIN/themes/valo/components/_treetable.scss index e025df2bc9..60b696315b 100644 --- a/WebContent/VAADIN/themes/valo/components/_treetable.scss +++ b/WebContent/VAADIN/themes/valo/components/_treetable.scss @@ -14,6 +14,12 @@ padding-left: 0; padding-right: 0; } + + [class*="caption-container"], + [class*="footer-container"] { + $vertical-padding: round(($v-table-row-height - $v-table-header-font-size)/2); + min-height: $v-table-row-height - $vertical-padding - ($vertical-padding - $v-table-border-width); + } [class*="cell-wrapper"] { min-height: $v-font-size; diff --git a/uitest/src/com/vaadin/tests/themes/valo/ValoThemeUITest.java b/uitest/src/com/vaadin/tests/themes/valo/ValoThemeUITest.java index b0af0db8c6..92cb837b38 100644 --- a/uitest/src/com/vaadin/tests/themes/valo/ValoThemeUITest.java +++ b/uitest/src/com/vaadin/tests/themes/valo/ValoThemeUITest.java @@ -132,6 +132,15 @@ public class ValoThemeUITest extends MultiBrowserTest { compareScreen("tables"); } + @Test + public void treeTables() throws Exception { + openTestURL("test"); + open("Tables"); + check("Hierarchical"); + check("Footer"); + compareScreen("treetables"); + } + @Test public void dragging() throws Exception { openTestURL("test"); -- cgit v1.2.3 From d7ff3b7d65d9840c1180da5248bc90bb467de29d Mon Sep 17 00:00:00 2001 From: Leif Åstrand Date: Wed, 12 Nov 2014 12:14:07 +0200 Subject: Update supported browser versions (#15207) Mention Safari 8 and iOS 8 and bump evergreen browser versions Change-Id: I9c6494a0e5967539385fabd05b540e1f0622b96c --- WebContent/release-notes.html | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'WebContent') diff --git a/WebContent/release-notes.html b/WebContent/release-notes.html index b6e31b953d..658b61624e 100644 --- a/WebContent/release-notes.html +++ b/WebContent/release-notes.html @@ -501,12 +501,12 @@

    -
  • Mozilla Firefox 18-29
    • -
  • Mozilla Firefox 17 ESR, 24 ESR
    • +
  • Mozilla Firefox 18-33
    • +
  • Mozilla Firefox 17 ESR, 24 ESR, 31 ESR
  • Internet Explorer 8-11
    • -
  • Safari 6-7
    • -
  • Opera 12, 16-20
    • -
  • Google Chrome 23-34
    • +
  • Safari 6-8
    • +
  • Opera 12, 16-25
    • +
  • Google Chrome 23-38

@@ -515,7 +515,7 @@

    -
  • iOS 5-7
    • +
  • iOS 5-8
  • Android 2.3-4
  • Windows Phone 8
-- cgit v1.2.3