diff --git a/.gitignore b/.gitignore index 0b9bf2965..441995df5 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,5 @@ mgwt.iml gwt-unitCache war/ www-test/ +bin +.gwt \ No newline at end of file diff --git a/src/main/java/com/googlecode/mgwt/ui/client/theme/platform/button/button-android.css b/src/main/java/com/googlecode/mgwt/ui/client/theme/platform/button/button-android.css index e38fa487e..ab5a8e987 100644 --- a/src/main/java/com/googlecode/mgwt/ui/client/theme/platform/button/button-android.css +++ b/src/main/java/com/googlecode/mgwt/ui/client/theme/platform/button/button-android.css @@ -18,7 +18,6 @@ @if user.agent gecko1_8 { .mgwt-Button { - \-moz-border-radius: 4px; border-radius: 4px; background-image: literal('-moz-linear-gradient(top, rgb(180, 180, 180), rgb(160, 160, 160))'); } diff --git a/src/main/java/com/googlecode/mgwt/ui/client/theme/platform/input/input-android.css b/src/main/java/com/googlecode/mgwt/ui/client/theme/platform/input/input-android.css index 4b2a9e28f..2fd257971 100644 --- a/src/main/java/com/googlecode/mgwt/ui/client/theme/platform/input/input-android.css +++ b/src/main/java/com/googlecode/mgwt/ui/client/theme/platform/input/input-android.css @@ -15,14 +15,32 @@ color: #666; } +@if user.agent safari { + .mgwt-InputBox-disabled::-webkit-input-placeholder { color: #666; } -.mgwt-InputBox-invalid { +.mgwt-InputBox-invalid::-webkit-input-placeholder { color: rgb(197, 3, 3); } -.mgwt-InputBox-invalid::-webkit-input-placeholder { +} + +@if user.agent gecko1_8 { + +.mgwt-InputBox-disabled::-moz-placeholder { + color: #666; +} + +.mgwt-InputBox-invalid::-moz-placeholder { color: rgb(197, 3, 3); } + +} + + +.mgwt-InputBox-invalid { + color: rgb(197, 3, 3); +} + diff --git a/src/main/java/com/googlecode/mgwt/ui/client/widget/animation/bundle/dissolve.css b/src/main/java/com/googlecode/mgwt/ui/client/widget/animation/bundle/dissolve.css index ee13eed55..3b4ed3bca 100644 --- a/src/main/java/com/googlecode/mgwt/ui/client/widget/animation/bundle/dissolve.css +++ b/src/main/java/com/googlecode/mgwt/ui/client/widget/animation/bundle/dissolve.css @@ -2,22 +2,30 @@ -webkit-animation-timing-function: ease-in-out; -webkit-animation-duration: 300ms; -webkit-animation-fill-mode: both; + + -moz-animation-timing-function: ease-in-out; + -moz-animation-duration: 300ms; + -moz-animation-fill-mode: both; } .in { -webkit-animation-name: appear; + -moz-animation-name: appear; } .out { -webkit-animation-name: dissolve; + -moz-animation-name: dissolve; } .in.reverse { -webkit-animation-name: appear; + -moz-animation-name: appear; } .out.reverse { -webkit-animation-name: dissolve; + -moz-animation-name: dissolve; } @-webkit-keyframes dissolve { @@ -29,3 +37,13 @@ from { opacity: 0; } to { opacity: 1; } } + +@-moz-keyframes dissolve { + from { opacity: 1; } + to { opacity: 0; } +} + +@-moz-keyframes appear { + from { opacity: 0; } + to { opacity: 1; } +} diff --git a/src/main/java/com/googlecode/mgwt/ui/client/widget/animation/bundle/fade.css b/src/main/java/com/googlecode/mgwt/ui/client/widget/animation/bundle/fade.css index 602c79db9..8611681a9 100644 --- a/src/main/java/com/googlecode/mgwt/ui/client/widget/animation/bundle/fade.css +++ b/src/main/java/com/googlecode/mgwt/ui/client/widget/animation/bundle/fade.css @@ -2,21 +2,29 @@ -webkit-animation-timing-function: ease-in-out; -webkit-animation-duration: 300ms; -webkit-animation-fill-mode: both; + + -moz-animation-timing-function: ease-in-out; + -moz-animation-duration: 300ms; + -moz-animation-fill-mode: both; } .in { -webkit-animation-name: fadein; + -moz-animation-name: fadein; } .out { -webkit-animation-name: fadeout; + -moz-animation-name: fadeout; } .in.reverse { -webkit-animation-name: fadein; + -moz-animation-name: fadein; } .out.reverse { -webkit-animation-name: fadeout; + -moz-animation-name: fadeout; } @-webkit-keyframes fadein { @@ -28,3 +36,13 @@ from { opacity: 1; } to { opacity: 0; } } + +@-moz-keyframes fadein { + from { opacity: 0; } + to { opacity: 1; } +} + +@-moz-keyframes fadeout { + from { opacity: 1; } + to { opacity: 0; } +} diff --git a/src/main/java/com/googlecode/mgwt/ui/client/widget/animation/bundle/flip.css b/src/main/java/com/googlecode/mgwt/ui/client/widget/animation/bundle/flip.css index cb9df89f4..e821901e7 100644 --- a/src/main/java/com/googlecode/mgwt/ui/client/widget/animation/bundle/flip.css +++ b/src/main/java/com/googlecode/mgwt/ui/client/widget/animation/bundle/flip.css @@ -4,22 +4,32 @@ -webkit-animation-fill-mode: both; -webkit-animation-duration: .65s; -webkit-backface-visibility: hidden; + + -moz-animation-timing-function: ease-in-out; + -moz-animation-duration: 300ms; + -moz-animation-fill-mode: both; + -moz-animation-duration: .65s; + -moz-backface-visibility: hidden; } .in { -webkit-animation-name: flipinfromleft; + -moz-animation-name: flipinfromleft; } .out { -webkit-animation-name: flipouttoleft; + -moz-animation-name: flipouttoleft; } .in.reverse { -webkit-animation-name: flipinfromright; + -moz-animation-name: flipinfromright; } .out.reverse { -webkit-animation-name: flipouttoright; + -moz-animation-name: flipouttoright; } @-webkit-keyframes flipinfromright { @@ -41,3 +51,23 @@ from { -webkit-transform: rotateY(0) scale(1); } to { -webkit-transform: rotateY(180deg) scale(.8); } } + +@-moz-keyframes flipinfromright { + from { -moz-transform: rotateY(-180deg) scale(.8); } + to { -moz-transform: rotateY(0) scale(1); } +} + +@-moz-keyframes flipinfromleft { + from { -moz-transform: rotateY(180deg) scale(.8); } + to { -moz-transform: rotateY(0) scale(1); } +} + +@-moz-keyframes flipouttoleft { + from { -moz-transform: rotateY(0) scale(1); } + to { -moz-transform: rotateY(-180deg) scale(.8); } +} + +@-moz-keyframes flipouttoright { + from { -moz-transform: rotateY(0) scale(1); } + to { -moz-transform: rotateY(180deg) scale(.8); } +} diff --git a/src/main/java/com/googlecode/mgwt/ui/client/widget/animation/bundle/pop.css b/src/main/java/com/googlecode/mgwt/ui/client/widget/animation/bundle/pop.css index 58689fa58..aa92b822b 100644 --- a/src/main/java/com/googlecode/mgwt/ui/client/widget/animation/bundle/pop.css +++ b/src/main/java/com/googlecode/mgwt/ui/client/widget/animation/bundle/pop.css @@ -2,22 +2,29 @@ -webkit-animation-timing-function: ease-in-out; -webkit-animation-duration: 300ms; -webkit-animation-fill-mode: both; + -moz-animation-timing-function: ease-in-out; + -moz-animation-duration: 300ms; + -moz-animation-fill-mode: both; } .in { -webkit-animation-name: popin; + -moz-animation-name: popin; } .out { -webkit-animation-name: popout; + -moz-animation-name: popout; } .in.reverse { -webkit-animation-name: popin; + -moz-animation-name: popin; } .out.reverse { -webkit-animation-name: popout; + -moz-animation-name: popout; } @-webkit-keyframes popin { @@ -41,3 +48,25 @@ opacity: 0; } } + +@-moz-keyframes popin { + from { + -moz-transform: scale(.3); + opacity: 0; + } + to { + -moz-transform: scale(1); + opacity: 1; + } +} + +@-moz-keyframes popout { + from { + -moz-transform: scale(1); + opacity: 1; + } + to { + -moz-transform: scale(.3); + opacity: 0; + } +} diff --git a/src/main/java/com/googlecode/mgwt/ui/client/widget/animation/bundle/slide-up.css b/src/main/java/com/googlecode/mgwt/ui/client/widget/animation/bundle/slide-up.css index 9fc0ea77e..a0d0021a0 100644 --- a/src/main/java/com/googlecode/mgwt/ui/client/widget/animation/bundle/slide-up.css +++ b/src/main/java/com/googlecode/mgwt/ui/client/widget/animation/bundle/slide-up.css @@ -2,26 +2,34 @@ -webkit-animation-timing-function: ease-in-out; -webkit-animation-duration: 300ms; -webkit-animation-fill-mode: both; + + -moz-animation-timing-function: ease-in-out; + -moz-animation-duration: 300ms; + -moz-animation-fill-mode: both; } .in { -webkit-animation-name: slideupfrombottom; + -moz-animation-name: slideupfrombottom; z-index: 10; } .out { -webkit-animation-name: slideupfrommiddle; + -moz-animation-name: slideupfrommiddle; z-index: 0; } .out.reverse { z-index: 10; -webkit-animation-name: slidedownfrommiddle; + -moz-animation-name: slidedownfrommiddle; } .in.reverse { z-index: 0; -webkit-animation-name: slidedownfromtop; + -moz-animation-name: slidedownfromtop; } @-webkit-keyframes slideupfrombottom { @@ -43,3 +51,23 @@ from { -webkit-transform: translateY(-100%); } to { -webkit-transform: translateY(0%); } } + +@-moz-keyframes slideupfrombottom { + from { -moz-transform: translateY(100%); } + to { -moz-transform: translateY(0); } +} + +@-moz-keyframes slidedownfrommiddle { + from { -moz-transform: translateY(0); } + to { -moz-transform: translateY(100%); } +} + +@-moz-keyframes slideupfrommiddle { + from { -moz-transform: translateY(0); } + to { -moz-transform: translateY(-100%); } +} + +@-moz-keyframes slidedownfromtop { + from { -moz-transform: translateY(-100%); } + to { -moz-transform: translateY(0%); } +} diff --git a/src/main/java/com/googlecode/mgwt/ui/client/widget/animation/bundle/slide.css b/src/main/java/com/googlecode/mgwt/ui/client/widget/animation/bundle/slide.css index 407ff7c55..21a4bd56a 100644 --- a/src/main/java/com/googlecode/mgwt/ui/client/widget/animation/bundle/slide.css +++ b/src/main/java/com/googlecode/mgwt/ui/client/widget/animation/bundle/slide.css @@ -2,6 +2,11 @@ -webkit-animation-timing-function: ease-in-out; -webkit-animation-duration: 300ms; -webkit-animation-fill-mode: both; + + -moz-animation-timing-function: ease; + -moz-animation-duration: 300ms; + -moz-animation-fill-mode: both; + } .in { @@ -14,18 +19,22 @@ .in { -webkit-animation-name: slideinfromright; + -moz-animation-name: slideinfromright; } .out { -webkit-animation-name: slideouttoleft; + -moz-animation-name: slideouttoleft; } .in.reverse { -webkit-animation-name: slideinfromleft; + -moz-animation-name: slideinfromleft; } .out.reverse { -webkit-animation-name: slideouttoright; + -moz-animation-name: slideouttoright; } @-webkit-keyframes slideinfromright { @@ -47,3 +56,23 @@ from { -webkit-transform: translateX(0); } to { -webkit-transform: translateX(100%); } } + +@-moz-keyframes slideinfromright { + from { -moz-transform: translateX(100%); } + to { -moz-transform: translateX(0); } +} + +@-moz-keyframes slideinfromleft { + from { -moz-transform: translateX(-100%); } + to { -moz-transform: translateX(0); } +} + +@-moz-keyframes slideouttoleft { + from { -moz-transform: translateX(0); } + to { -moz-transform: translateX(-100%); } +} + +@-moz-keyframes slideouttoright { + from { -moz-transform: translateX(0); } + to { -moz-transform: translateX(100%); } +} \ No newline at end of file diff --git a/src/main/java/com/googlecode/mgwt/ui/client/widget/animation/bundle/swap.css b/src/main/java/com/googlecode/mgwt/ui/client/widget/animation/bundle/swap.css index 18d2e6db5..28c63a08f 100644 --- a/src/main/java/com/googlecode/mgwt/ui/client/widget/animation/bundle/swap.css +++ b/src/main/java/com/googlecode/mgwt/ui/client/widget/animation/bundle/swap.css @@ -4,19 +4,29 @@ -webkit-transform: perspective(800); -webkit-animation-duration: .7s; -webkit-transform-style: preserve-3d; + + -moz-animation-timing-function: ease-in-out; + -moz-animation-fill-mode: both; + -moz-transform: perspective(800); + -moz-animation-duration: .7s; + -moz-transform-style: preserve-3d; } .out { -webkit-animation-name: swapouttoleft; + -moz-animation-name: swapouttoleft; } .in { -webkit-animation-name: swapinfromright; + -moz-animation-name: swapinfromright; } .out.reverse { -webkit-animation-name: swapouttoright; + -moz-animation-name: swapouttoright; } .in.reverse { -webkit-animation-name: swapinfromleft; + -moz-animation-name: swapinfromleft; } @@ -79,3 +89,63 @@ -webkit-transform: translate3d(0px, 0px, 0px) rotateY(0deg); } } + +@-moz-keyframes swapouttoright { + 0% { + -moz-transform: translate3d(0px, 0px, 0px) rotateY(0deg); + -moz-animation-timing-function: ease-in-out; + } + 50% { + -moz-transform: translate3d(-180px, 0px, -400px) rotateY(20deg); + -moz-animation-timing-function: ease-in; + opacity: 0.8; + } + 100% { + -moz-transform: translate3d(0px, 0px, -800px) rotateY(70deg); + opacity: 0; + } +} + +@-moz-keyframes swapouttoleft { + 0% { + -moz-transform: translate3d(0px, 0px, 0px) rotateY(0deg); + -moz-animation-timing-function: ease-in-out; + } + 50% { + -moz-transform: translate3d(180px, 0px, -400px) rotateY(-20deg); + -moz-animation-timing-function: ease-in; + opacity: 0.8; + } + 100% { + -moz-transform: translate3d(0px, 0px, -800px) rotateY(-70deg); + opacity: 0; + } +} + +@-moz-keyframes swapinfromright { + 0% { + -moz-transform: translate3d(0px, 0px, -800px) rotateY(70deg); + -moz-animation-timing-function: ease-out; + } + 50% { + -moz-transform: translate3d(-180px, 0px, -400px) rotateY(20deg); + -moz-animation-timing-function: ease-in-out; + } + 100% { + -moz-transform: translate3d(0px, 0px, 0px) rotateY(0deg); + } +} + +@-moz-keyframes swapinfromleft { + 0% { + -moz-transform: translate3d(0px, 0px, -800px) rotateY(-70deg); + -moz-animation-timing-function: ease-out; + } + 50% { + -moz-transform: translate3d(180px, 0px, -400px) rotateY(-20deg); + -moz-animation-timing-function: ease-in-out; + } + 100% { + -moz-transform: translate3d(0px, 0px, 0px) rotateY(0deg); + } +} diff --git a/src/main/java/com/googlecode/mgwt/ui/client/widget/animation/impl/animation-display.css b/src/main/java/com/googlecode/mgwt/ui/client/widget/animation/impl/animation-display.css index 7ad9c9954..8e9263a71 100644 --- a/src/main/java/com/googlecode/mgwt/ui/client/widget/animation/impl/animation-display.css +++ b/src/main/java/com/googlecode/mgwt/ui/client/widget/animation/impl/animation-display.css @@ -3,7 +3,7 @@ width: 100%; height: 100%; overflow:hidden; - -webkit-backface-visibility: hidden; + backface-visibility: hidden; } .display { @@ -13,8 +13,35 @@ right: 0px; bottom: 0px; overflow:hidden; + transform-style: preserve-3d; + backface-visibility: hidden; + transform: translate3d(0,0,0) rotate(0) scale(1); + perspective: 800px; +} + +@if user.agent gecko1_8 { + +.displayContainer { + -moz-backface-visibility: hidden; +} +.display { + -moz-transform-style: preserve-3d; + -moz-backface-visibility: hidden; + -moz-transform: translate3d(0,0,0) rotate(0) scale(1); + -moz-perspective: 800px; +} + +} +@else { + +.displayContainer { + -webkit-backface-visibility: hidden; +} +.display { -webkit-transform-style: preserve-3d; -webkit-backface-visibility: hidden; -webkit-transform: translate3d(0,0,0) rotate(0) scale(1); - -webkit-perspective: 800; + -webkit-perspective: 800px; +} + } diff --git a/src/main/java/com/googlecode/mgwt/ui/client/widget/button/ImageButton.java b/src/main/java/com/googlecode/mgwt/ui/client/widget/button/ImageButton.java index 968de7e4d..7c5cd2624 100644 --- a/src/main/java/com/googlecode/mgwt/ui/client/widget/button/ImageButton.java +++ b/src/main/java/com/googlecode/mgwt/ui/client/widget/button/ImageButton.java @@ -15,6 +15,8 @@ */ package com.googlecode.mgwt.ui.client.widget.button; +import com.google.gwt.core.client.Scheduler; +import com.google.gwt.core.client.Scheduler.ScheduledCommand; import com.google.gwt.core.shared.GWT; import com.google.gwt.dom.client.Element; import com.google.gwt.dom.client.Style.Display; @@ -25,7 +27,6 @@ import com.google.gwt.resources.client.ImageResource; import com.google.gwt.uibinder.client.UiFactory; import com.google.gwt.uibinder.client.UiField; - import com.googlecode.mgwt.dom.client.event.touch.TouchHandler; import com.googlecode.mgwt.ui.client.MGWT; import com.googlecode.mgwt.ui.client.util.IconHandler; @@ -69,7 +70,18 @@ public ImageButton(ImageButtonAppearance appearance, String text) { this(appearance, null, text); } - public ImageButton(ImageButtonAppearance appearance, ImageResource iconImage, String text) { + @Override + protected void onLoad() { + super.onLoad(); + Scheduler.get().scheduleDeferred(new ScheduledCommand() { + @Override + public void execute() { + setIcon(icon); + } + }); + } + + public ImageButton(ImageButtonAppearance appearance, final ImageResource iconImage, String text) { super(appearance); this.appearance = appearance; setElement(appearance.uiBinder().createAndBindUi(this)); @@ -88,7 +100,7 @@ public ImageButton(ImageButtonAppearance appearance, ImageResource iconImage, St @Override public void onTouchCancel(TouchCancelEvent event) { - IconHandler.setIcons(image, icon, iconColor); + IconHandler.setIcons(image, iconImage, iconColor); } @Override diff --git a/src/main/java/com/googlecode/mgwt/ui/client/widget/carousel/Carousel.java b/src/main/java/com/googlecode/mgwt/ui/client/widget/carousel/Carousel.java index 1c50668b3..10c2eea3a 100644 --- a/src/main/java/com/googlecode/mgwt/ui/client/widget/carousel/Carousel.java +++ b/src/main/java/com/googlecode/mgwt/ui/client/widget/carousel/Carousel.java @@ -13,7 +13,15 @@ */ package com.googlecode.mgwt.ui.client.widget.carousel; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; +import java.util.Set; + import com.google.gwt.core.client.GWT; +import com.google.gwt.core.client.Scheduler; +import com.google.gwt.core.client.Scheduler.ScheduledCommand; import com.google.gwt.dom.client.Document; import com.google.gwt.dom.client.Style.Unit; import com.google.gwt.event.dom.client.TouchMoveEvent; @@ -31,7 +39,6 @@ import com.google.gwt.user.client.ui.HasWidgets; import com.google.gwt.user.client.ui.Widget; import com.google.web.bindery.event.shared.HandlerRegistration; - import com.googlecode.mgwt.collection.shared.LightArrayInt; import com.googlecode.mgwt.dom.client.event.orientation.OrientationChangeEvent; import com.googlecode.mgwt.dom.client.event.orientation.OrientationChangeHandler; @@ -46,12 +53,6 @@ import com.googlecode.mgwt.ui.client.widget.panel.scroll.ScrollRefreshEvent; import com.googlecode.mgwt.ui.client.widget.touch.TouchWidget; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; -import java.util.Set; - /** * A carousel renders its children in a row. * A user can select a different child by swiping between them. @@ -262,7 +263,7 @@ public boolean remove(Widget w) { @Override protected void onLoad() { - refresh(); + refresh(); } /** @@ -385,17 +386,25 @@ public void adjust(Widget main, FlowPanel container) { @SuppressWarnings("unused") private static class CarouselImplGecko implements CarouselImpl { - @Override - public void adjust(Widget main, FlowPanel container) { - int widgetCount = container.getWidgetCount(); - int offsetWidth = main.getOffsetWidth(); + @Override + public void adjust(final Widget main, final FlowPanel container) { - container.setWidth(widgetCount * offsetWidth + "px"); + Scheduler.get().scheduleDeferred(new ScheduledCommand() { - for (int i = 0; i < widgetCount; i++) { - container.getWidget(i).setWidth(offsetWidth + "px"); - } - } + @Override + public void execute() { + int widgetCount = container.getWidgetCount(); + int offsetWidth = main.getOffsetWidth(); + + container.setWidth(widgetCount * offsetWidth + "px"); + for (int i = 0; i < widgetCount; i++) { + container.getWidget(i).setWidth(offsetWidth + "px"); + container.getWidget(i).getElement().getStyle().setLeft(i * offsetWidth, Unit.PX); + + } + } + }); + } } /** diff --git a/src/main/java/com/googlecode/mgwt/ui/client/widget/carousel/carousel.css b/src/main/java/com/googlecode/mgwt/ui/client/widget/carousel/carousel.css index b912d0e36..fe6aacdf1 100644 --- a/src/main/java/com/googlecode/mgwt/ui/client/widget/carousel/carousel.css +++ b/src/main/java/com/googlecode/mgwt/ui/client/widget/carousel/carousel.css @@ -29,6 +29,13 @@ } } +@if user.agent gecko1_8 { + .mgwt-Carousel-Scroller, .mgwt-Carousel-Container { + height: 100%; + } + +} + .mgwt-Carousel-Scroller { flex: 1 } @@ -54,6 +61,12 @@ border-radius: 5px; } +@if user.agent gecko1_8 { +.mgwt-Carousel-Indicator-Container { + margin: auto; + } +} + .mgwt-Carousel-Indicator { width: 8px; height: 8px; diff --git a/src/main/java/com/googlecode/mgwt/ui/client/widget/input/checkbox/checkbox.css b/src/main/java/com/googlecode/mgwt/ui/client/widget/input/checkbox/checkbox.css index 648fe6eba..73b721bb5 100644 --- a/src/main/java/com/googlecode/mgwt/ui/client/widget/input/checkbox/checkbox.css +++ b/src/main/java/com/googlecode/mgwt/ui/client/widget/input/checkbox/checkbox.css @@ -44,7 +44,7 @@ @if user.agent gecko1_8 { .mgwt-CheckBox-middle { -moz-transition: all 0.1s ease-in-out; - -moz-border-radius: 6px; + border-radius: 6px; } } diff --git a/src/main/java/com/googlecode/mgwt/ui/client/widget/input/input.css b/src/main/java/com/googlecode/mgwt/ui/client/widget/input/input.css index 56a30e7e6..f88f7b5ed 100644 --- a/src/main/java/com/googlecode/mgwt/ui/client/widget/input/input.css +++ b/src/main/java/com/googlecode/mgwt/ui/client/widget/input/input.css @@ -44,14 +44,32 @@ color: #CCC; } +@if user.agent safari { + .mgwt-InputBox-disabled::-webkit-input-placeholder { color: #CCC; } -.mgwt-InputBox-invalid { +.mgwt-InputBox-invalid::-webkit-input-placeholder { color: rgb(197, 3, 3); } -.mgwt-InputBox-invalid::-webkit-input-placeholder { +} + +@if user.agent gecko1_8 { + +.mgwt-InputBox-disabled::-moz-placeholder { + color: #CCC; +} + +.mgwt-InputBox-invalid::-moz-placeholder { + color: rgb(197, 3, 3); +} +} + + + +.mgwt-InputBox-invalid { color: rgb(197, 3, 3); } + diff --git a/src/main/java/com/googlecode/mgwt/ui/client/widget/input/radio/mradiobutton.css b/src/main/java/com/googlecode/mgwt/ui/client/widget/input/radio/mradiobutton.css index c2eff4c5a..9618bea98 100644 --- a/src/main/java/com/googlecode/mgwt/ui/client/widget/input/radio/mradiobutton.css +++ b/src/main/java/com/googlecode/mgwt/ui/client/widget/input/radio/mradiobutton.css @@ -45,7 +45,7 @@ position: relative; display: flex; flex: 1; - flex-diretion: row; + flex-direction: row; } .mgwt-RadioButton-label { diff --git a/src/main/java/com/googlecode/mgwt/ui/client/widget/input/search/searchbox.css b/src/main/java/com/googlecode/mgwt/ui/client/widget/input/search/searchbox.css index 4947d2f9a..f57607769 100644 --- a/src/main/java/com/googlecode/mgwt/ui/client/widget/input/search/searchbox.css +++ b/src/main/java/com/googlecode/mgwt/ui/client/widget/input/search/searchbox.css @@ -93,6 +93,13 @@ } } +@if user.agent gecko1_8 { + .mgwt-SearchBox-icon { + background-image: searchImage; + background-repeat: no-repeat; + } +} + .mgwt-SearchBox-icon { position: relative; top: 7px; @@ -105,12 +112,14 @@ @if mgwt.density high { .mgwt-SearchBox-icon { -webkit-mask-size: 17px 17px; + background-size: 17px 17px; } } @if mgwt.density xhigh { .mgwt-SearchBox-icon { -webkit-mask-size: 12px 12px; + background-size: 12px 12px; } } @@ -122,6 +131,14 @@ } } +@if user.agent gecko1_8 { + .mgwt-SearchBox-clear { + background: clearImage; + background-position: center center; + background-repeat: no-repeat; + } +} + .mgwt-SearchBox-clear { position: absolute; top: -2px; @@ -134,11 +151,13 @@ @if mgwt.density high { .mgwt-SearchBox-clear { -webkit-mask-size: 19px 19px; + mask-size: 19px 19px; } } @if mgwt.density xhigh { .mgwt-SearchBox-clear { -webkit-mask-size: 14px 14px; + mask-size: 14px 14px; } } diff --git a/src/main/java/com/googlecode/mgwt/ui/client/widget/main/main.css b/src/main/java/com/googlecode/mgwt/ui/client/widget/main/main.css index a13553213..81fdf440e 100644 --- a/src/main/java/com/googlecode/mgwt/ui/client/widget/main/main.css +++ b/src/main/java/com/googlecode/mgwt/ui/client/widget/main/main.css @@ -1,11 +1,13 @@ @external body, *; * { - -webkit-text-size-adjust: none; - -webkit-touch-callout: none; - -webkit-text-size-adjust: none; margin: 0px; padding: 0px; font-family: Helvetica, sans-serif; + + user-select: none; + text-size-adjust: none; + touch-callout: none; + } @@ -15,36 +17,53 @@ body { background: #dfe2e2; color: #000; font-weight: 400; - -webkit-perspective: 800; - -webkit-transform-style: preserve-3d; + perspective: 800px; + transform-style: preserve-3d; position: absolute; width: 100%; height: 100%; } + :focus { outline-color: transparent; outline-style: none; } + @if user.agent gecko1_8 { * { - -webkit-user-select: none; + -moz-user-select: none; + -moz-text-size-adjust: none; + -moz-touch-callout: none; } input, textarea { - -webkit-user-select: text; + -moz-user-select: text; } -} -@if user.agent gecko1_8 { + body { + -moz-perspective: 800px; + -moz-transform-style: preserve-3d; + } +} +@else { + * { - -moz-user-select: none; + -webkit-user-select: none; + -webkit-text-size-adjust: none; + -webkit-touch-callout: none; } input, textarea { - -moz-user-select: text; + -webkit-user-select: text; + } + + body { + -webkit-perspective: 800px; + -webkit-transform-style: preserve-3d; } + } input:FOCUS,button:FOCUS { diff --git a/src/main/java/com/googlecode/mgwt/ui/client/widget/panel/flex/flex.css b/src/main/java/com/googlecode/mgwt/ui/client/widget/panel/flex/flex.css index c481f710c..792697e5d 100644 --- a/src/main/java/com/googlecode/mgwt/ui/client/widget/panel/flex/flex.css +++ b/src/main/java/com/googlecode/mgwt/ui/client/widget/panel/flex/flex.css @@ -39,7 +39,7 @@ @if user.agent gecko1_8 { .mgwt-FlexPanel-flex { - -moz-flex: 1; + -moz-box-flex: 1; } } diff --git a/src/main/java/com/googlecode/mgwt/ui/client/widget/panel/scroll/scrollpanel.css b/src/main/java/com/googlecode/mgwt/ui/client/widget/panel/scroll/scrollpanel.css index 21e49a97f..4c9724cec 100644 --- a/src/main/java/com/googlecode/mgwt/ui/client/widget/panel/scroll/scrollpanel.css +++ b/src/main/java/com/googlecode/mgwt/ui/client/widget/panel/scroll/scrollpanel.css @@ -88,11 +88,11 @@ @if user.agent gecko1_8 { .mgwt-Scrollbar-Bar { - -moz-background-clip:padding-box; + background-clip:padding-box; -moz-box-sizing:border-box; -moz-transition-property:literal('-webkit-transform'); -moz-transition-timing-function:cubic-bezier(0.33,0.66,0.66,1); - -moz-transform: translate('0,0'); - -moz-transition-duration:0; + -moz-transform: translate(0,0); + -moz-transition-duration:0s; } }