Merge remote-tracking branch 'origin/master'

This commit is contained in:
unknown committed 2012-07-18 20:02:45 +02:00
commit c9760fe1d8
2 files changed
+3 -7

No files matched your search

+3 -3
View File
@@ -116,7 +116,7 @@ img.openColumn {
right:0;
}
.globalNavigation-leaderBoardGroup a {
.globalNavigation-leaderBoardGroup a, .globalNavigation-home a {
background: url(images/globalNavigation-home_bg.png) 11px 8px no-repeat;
}
@@ -124,7 +124,7 @@ img.openColumn {
background: url(images/globalNavigation-leaderBoard_bg.png) 11px 8px no-repeat;
}
.globalNavigation-leaderBoardGroup, .globalNavigation-leaderBoard {
.globalNavigation-leaderBoardGroup, .globalNavigation-leaderBoard, .globalNavigation-home {
margin: -4px 10px 0 0;
padding: 0;
float: left;
@@ -135,7 +135,7 @@ img.openColumn {
margin-right: 5px;
}
.globalNavigation-leaderBoardGroup a, .globalNavigation-leaderBoard a {
.globalNavigation-leaderBoardGroup a, .globalNavigation-leaderBoard a, .globalNavigation-home a {
color: #fff;
text-decoration: none;
display: block;
@@ -59,8 +59,6 @@ public class TimePanel<T extends TimePanelSettings> extends FormPanel implements
protected final StringMessages stringMessages;
protected final DateTimeFormat dateFormatter = DateTimeFormat.getFormat(DateTimeFormat.PredefinedFormat.DATE_FULL);
protected final DateTimeFormat timeFormatter = DateTimeFormat.getFormat("HH:mm:ss");
private final ImageResource playButtonImg;
private final ImageResource pauseButtonImg;
private final ImageResource playSpeedImg;
private final ImageResource playModeLiveActiveImg;
private final ImageResource playModeReplayActiveImg;
@@ -114,8 +112,6 @@ public class TimePanel<T extends TimePanelSettings> extends FormPanel implements
timePanelSlider.getElement().getStyle().setPaddingLeft(66, Unit.PX);
timePanelSlider.getElement().getStyle().setPaddingRight(66, Unit.PX);
playButtonImg = resources.timesliderPlayActiveIcon();
pauseButtonImg = resources.timesliderPauseIcon();
playSpeedImg = resources.timesliderPlaySpeedIcon();
playPauseButton = new Button("");