Merge remote-tracking branch 'origin/master' into bug2913

Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_cn.properties
This commit is contained in:
Steffen Schaefer committed 2015-06-11 11:57:32 +02:00
commit e675abfb2b
28 files changed
+120 -50

No files matched your search

@@ -9,6 +9,7 @@ import com.google.gwt.dom.client.DivElement;
import com.google.gwt.dom.client.Document;
import com.google.gwt.dom.client.Element;
import com.google.gwt.dom.client.ImageElement;
import com.google.gwt.dom.client.Style.Cursor;
import com.google.gwt.dom.client.Style.Unit;
import com.google.gwt.safehtml.shared.UriUtils;
import com.google.gwt.uibinder.client.UiBinder;
@@ -179,6 +180,9 @@ public class ImageCarousel<TYPE extends ImageDTO> extends Widget {
DivElement imageHolder = Document.get().createDivElement();
ImageElement imageElement = Document.get().createImageElement();
imageElement.setAttribute("data-lazy", UriUtils.fromString(url).asString());
if(fsViewer != null) {
imageElement.getStyle().setCursor(Cursor.POINTER);
}
imageHolder.getStyle().setHeight(imagesHeight, Unit.PX);
imageHolder.getStyle().setWidth(Math.round(width * (imagesHeight / (double) height)), Unit.PX);
@@ -312,4 +316,4 @@ public class ImageCarousel<TYPE extends ImageDTO> extends Widget {
public void show(TYPE selectedImage, List<TYPE> imageList);
}
}
}
@@ -95,7 +95,6 @@
position: absolute;
background-position: 0 0;
background-repeat: no-repeat;
z-index: 10;
cursor: pointer;
top: 50%;
-webkit-transform: translate(0, -50%);
@@ -117,7 +116,6 @@
.slider .slick-prev {
left: 0px;
z-index: 1;
height: 60px;
width: 60px;
background-position: 0 0;
@@ -21,7 +21,6 @@
.slider .slick-prev {
left: 0px;
z-index: 1;
height: 60px;
width: 60px;
}
@@ -30,7 +29,6 @@
position: absolute;
background-position: 0 0;
background-repeat: no-repeat;
z-index: 10;
cursor: pointer;
top: 40%;
-webkit-transform: translate(0, -50%);