diff options
7 files changed, 89 insertions, 10 deletions
diff --git a/WebContent/VAADIN/themes/reindeer/common/common.css b/WebContent/VAADIN/themes/reindeer/common/common.css index 342990894e..34c4f4c585 100644 --- a/WebContent/VAADIN/themes/reindeer/common/common.css +++ b/WebContent/VAADIN/themes/reindeer/common/common.css @@ -107,4 +107,18 @@ .v-contextmenu .gwt-MenuItem-selected div { background: transparent; cursor: default; +} + +/* Fixes for Liferay 6.0 */ +.portlet .v-app { + background: transparent; +} +.v-app .v-radiobutton input, +.v-window .v-radiobutton input, +.v-popupview-popup .v-radiobutton input, +.v-app .v-checkbox input, +.v-window .v-checkbox input, +.v-popupview-popup .v-checkbox input { + margin-right: 3px; + background: transparent; }
\ No newline at end of file diff --git a/WebContent/VAADIN/themes/reindeer/datefield/datefield.css b/WebContent/VAADIN/themes/reindeer/datefield/datefield.css index 4b4ccce4c8..8529082ea5 100644 --- a/WebContent/VAADIN/themes/reindeer/datefield/datefield.css +++ b/WebContent/VAADIN/themes/reindeer/datefield/datefield.css @@ -72,6 +72,9 @@ td.v-datefield-calendarpanel-nextyear { padding: 0; text-indent: -9999px; outline: none; + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; } .v-ie .v-datefield-calendarpanel-prevyear button, .v-ie .v-datefield-calendarpanel-nextyear button, @@ -263,6 +266,9 @@ td.v-datefield-calendarpanel-nextyear { padding: 0; background-image: url(img/popup-btn.png); /** sprite-ref: verticals */ cursor: default; + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; } .v-datefield-popupcalendar .v-datefield-button:active { background-image: url(img/popup-btn-pressed.png); /** sprite-ref: verticals */ diff --git a/WebContent/VAADIN/themes/reindeer/styles.css b/WebContent/VAADIN/themes/reindeer/styles.css index 7ec6aaac59..20c7bb00b0 100644 --- a/WebContent/VAADIN/themes/reindeer/styles.css +++ b/WebContent/VAADIN/themes/reindeer/styles.css @@ -2739,6 +2739,20 @@ div.v-window-header { cursor: default; } +/* Fixes for Liferay 6.0 */ +.portlet .v-app { + background: transparent; +} +.v-app .v-radiobutton input, +.v-window .v-radiobutton input, +.v-popupview-popup .v-radiobutton input, +.v-app .v-checkbox input, +.v-window .v-checkbox input, +.v-popupview-popup .v-checkbox input { + margin-right: 3px; + background: transparent; +} + .v-datefield-calendarpanel { border-collapse: collapse; margin: 0; @@ -2817,6 +2831,9 @@ td.v-datefield-calendarpanel-nextyear { padding: 0; text-indent: -9999px; outline: none; + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; } .v-ie .v-datefield-calendarpanel-prevyear button, .v-ie .v-datefield-calendarpanel-nextyear button, @@ -3032,6 +3049,9 @@ td.v-datefield-calendarpanel-nextyear { -background-image: url(common/img/vertical-sprites-ie6.png); background-position: left -337px; cursor: default; + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; } .v-datefield-popupcalendar .v-datefield-button:active { background-image: url(common/img/vertical-sprites.png); @@ -5063,6 +5083,7 @@ td.v-datefield-calendarpanel-nextyear { border-top-color: #4f83b4; border-bottom-color: #5ca0df; outline: none; + background-color: #fff; } input.v-textfield-prompt, textarea.v-textarea-prompt { @@ -5123,6 +5144,7 @@ textarea.v-textarea-prompt { border-color: #4b7192; border-top-color: #3b5a75; border-bottom-color: #507596; + background-color: #151717; } .black input.v-textfield-prompt { color: #5f6366; diff --git a/WebContent/VAADIN/themes/reindeer/textfield/textfield.css b/WebContent/VAADIN/themes/reindeer/textfield/textfield.css index 1603fecd75..4c8ed4251e 100644 --- a/WebContent/VAADIN/themes/reindeer/textfield/textfield.css +++ b/WebContent/VAADIN/themes/reindeer/textfield/textfield.css @@ -45,6 +45,7 @@ border-top-color: #4f83b4; border-bottom-color: #5ca0df; outline: none; + background-color: #fff; } input.v-textfield-prompt, textarea.v-textarea-prompt { @@ -103,6 +104,7 @@ textarea.v-textarea-prompt { border-color: #4b7192; border-top-color: #3b5a75; border-bottom-color: #507596; + background-color: #151717; } .black input.v-textfield-prompt { color: #5f6366; diff --git a/WebContent/VAADIN/themes/sampler/sampler/styles.css b/WebContent/VAADIN/themes/sampler/sampler/styles.css index fb1f952d0f..a43d2bd122 100644 --- a/WebContent/VAADIN/themes/sampler/sampler/styles.css +++ b/WebContent/VAADIN/themes/sampler/sampler/styles.css @@ -42,7 +42,7 @@ .v-customcomponent-breadcrumbs { font-family: arial, helvetica, verdana, sans-serif; } -.v-sa .v-customcomponent-breadcrumbs { +.v-mac .v-customcomponent-breadcrumbs { font-family: helvetica, arial, verdana, sans-serif; } .v-customcomponent-breadcrumbs .v-horizontallayout-spacing-on { @@ -288,7 +288,7 @@ line-height: 15px; padding: 0 0 13px; } -.v-sa .v-app-SamplerApplication .v-tree-menu { +.v-mac .v-app-SamplerApplication .v-tree-menu { font-family: helvetica, arial, verdana, sans-serif; } .v-app-SamplerApplication .v-tree-menu .v-tree-node span { @@ -327,7 +327,7 @@ clear: left; } -.v-sa .v-app-SamplerApplication .v-label-root-section { +.v-mac .v-app-SamplerApplication .v-label-root-section { font-family: helvetica, arial, verdana, sans-serif; } @@ -488,7 +488,7 @@ overflow: hidden; } -.v-sa .v-csslayout-highlight { +.v-mac .v-csslayout-highlight { font-family: Helvetica, Arial, sans-serif; } @@ -639,8 +639,8 @@ .feature-controls .v-nativebutton-reset { font-family: arial, helvetica, verdana, sans-serif; } -.v-sa .feature-controls .v-link-showcode a, -.v-sa .feature-controls .v-nativebutton-reset { +.v-mac .feature-controls .v-link-showcode a, +.v-mac .feature-controls .v-nativebutton-reset { font-family: helvetica, arial, verdana, sans-serif; } .feature-controls .v-nativebutton-reset:focus { @@ -664,7 +664,7 @@ font-size: 12px; line-height: 19px; } -.v-sa .v-app-SamplerApplication .feature-info { +.v-mac .v-app-SamplerApplication .feature-info { font-family: helvetica, arial, verdana, sans-serif; } .v-app-SamplerApplication .feature-info div.v-link a { diff --git a/WebContent/VAADIN/themes/sampler/styles.css b/WebContent/VAADIN/themes/sampler/styles.css index fbb7f167e9..1ee032e25a 100644 --- a/WebContent/VAADIN/themes/sampler/styles.css +++ b/WebContent/VAADIN/themes/sampler/styles.css @@ -3,7 +3,8 @@ @import url(dummy/styles.css); /* - * Not in use currently, breaks ShortcutBasics example. + * Not in use currently, breaks all Reindeer "primary/default" button styles. + * Fix by replacing the "v-button-primary" to some other style name. * *@import url(prominentprimaryaction/styles.css); */ @@ -23,3 +24,38 @@ @import url(table/styles.css); @import url(misc/item-styles.css); + +/* Fixes for Liferay 6.0 */ +.portlet .v-app-SamplerApplication { + background-color: #fff; +} + +.portlet .v-app .topbar .v-nativebutton { + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; +} + +.portlet .v-app .topbar .v-nativebutton .v-icon { + vertical-align: baseline; +} + +.portlet .v-app .v-customcomponent-breadcrumbs { + margin: 0; +} + +.portlet .v-app .v-nativebutton-reset, +.portlet .v-app .v-nativebutton-reset:focus, +.portlet .v-app .v-nativebutton-reset:hover, +.portlet .v-app .v-nativebutton-reset:active { + border: none; + background: transparent; + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; + text-shadow: none; +} + +.portlet .v-app .showcode a { + vertical-align: baseline; +}
\ No newline at end of file diff --git a/src/com/vaadin/terminal/gwt/client/ui/dd/VDragAndDropManager.java b/src/com/vaadin/terminal/gwt/client/ui/dd/VDragAndDropManager.java index a696a1380f..0fbc561c7f 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/dd/VDragAndDropManager.java +++ b/src/com/vaadin/terminal/gwt/client/ui/dd/VDragAndDropManager.java @@ -468,8 +468,7 @@ public class VDragAndDropManager { } currentDropHandler = null; serverCallback = null; - visitId = -1; // ignore possibly on going server check - + visitId = 0; // reset to ignore ongoing server check } currentDrag = null; |