Changed font to Open Sans for LiveAverageComponent

This commit is contained in:
Alexander Ries committed 2015-06-02 14:30:15 +02:00
1 parent 94b59f98a3
commit 280e309602
4 files changed
+21 -11

No files matched your search

@@ -141,7 +141,7 @@ public class StartlineAnalysisCard extends Composite implements HasWidgets, Star
zoomTypes.add(ZoomTypes.BUOYS);
} else {
timer.setTime(startAnalysisDTO.timeOfStartInMilliSeconds);
zoomTypes.add(ZoomTypes.TAILS);
zoomTypes.add(ZoomTypes.BOATS);
}
AsyncActionsExecutor asyncActionsExecutor = new AsyncActionsExecutor();
RaceTimesInfoProvider raceTimesInfoProvider = new RaceTimesInfoProvider(sailingServiceAsync,
@@ -55,13 +55,21 @@
}
.liveAverageCompoment_panel_value_number {
font-family: 'Open Sans', Arial, Verdana, sans-serif;
font-size: 27pt;
}
.liveAverageCompoment_panel_value_unit {
font-family: 'Open Sans', Arial, Verdana, sans-serif;
font-size: 12pt;
}
.liveAverageCompoment_panel_value_unit_degrees {
position: absolute;
font-size: 20pt;
font-weight: lighter;
}
.liveAverageCompoment_value_panel {
margin: 0px;
width: 100%;
@@ -5,9 +5,7 @@ import java.util.Iterator;
import com.google.gwt.core.client.GWT;
import com.google.gwt.dom.client.DivElement;
import com.google.gwt.dom.client.SpanElement;
import com.google.gwt.dom.client.Style;
import com.google.gwt.dom.client.Style.Position;
import com.google.gwt.dom.client.Style.Unit;
import com.google.gwt.resources.client.CssResource;
import com.google.gwt.uibinder.client.UiBinder;
import com.google.gwt.uibinder.client.UiField;
import com.google.gwt.user.client.ui.Composite;
@@ -32,6 +30,11 @@ public class LiveAverageComponent extends Composite implements HasWidgets, Verti
interface LiveAverageComponentUiBinder extends UiBinder<Widget, LiveAverageComponent> {
}
interface LiveAverageComponentStyle extends CssResource {
String liveAverageCompoment_panel_value_unit_degrees();
}
@UiField
HTMLPanel liveAveragePanel;
@@ -65,6 +68,9 @@ public class LiveAverageComponent extends Composite implements HasWidgets, Verti
@UiField
HTMLPanel averagePanel;
@UiField
LiveAverageComponentStyle style;
private StringMessages stringConstants;
public LiveAverageComponent() {
@@ -87,12 +93,8 @@ public class LiveAverageComponent extends Composite implements HasWidgets, Verti
this.averageUnit.setInnerText(unit);
// Lifts the degrees unit string "°". Otherwise it would be too small.
if (unit.equals("°")) {
this.liveUnit.getStyle().setFontSize(15, Unit.PT);
this.averageUnit.getStyle().setFontSize(15, Unit.PT);
this.liveUnit.getStyle().setFontWeight(Style.FontWeight.LIGHTER);
this.averageUnit.getStyle().setFontWeight(Style.FontWeight.LIGHTER);
this.liveUnit.getStyle().setPosition(Position.ABSOLUTE);
this.averageUnit.getStyle().setPosition(Position.ABSOLUTE);
this.liveUnit.addClassName(style.liveAverageCompoment_panel_value_unit_degrees());
this.averageUnit.setClassName(style.liveAverageCompoment_panel_value_unit_degrees());
}
this.liveLabel.setInnerHTML(stringConstants.dashboardLiveWind());
this.averageLabel.setInnerHTML(stringConstants.dashboardAverageWind()+"<br>"+stringConstants.dashboardAverageWindMinutes(15));
@@ -2,7 +2,7 @@
<ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder"
xmlns:g="urn:import:com.google.gwt.user.client.ui">
<ui:style src="LiveAverageComponent.css" />
<ui:style type='com.sap.sailing.dashboards.gwt.client.startlineadvantage.LiveAverageComponent.LiveAverageComponentStyle' src='LiveAverageComponent.css'></ui:style>
<g:HTMLPanel ui:field="liveAveragePanel" styleName="{style.liveAverageCompoment_panel}">