mirror of
https://github.com/eclipse-sailing-analytics/sailing-analytics.git
synced 2026-09-30 17:36:40 +00:00
Merge branch 'master' into confidencewind
This commit is contained in:
commit
ce06f866d4
16 files changed
+71
-35
No files matched your search
@@ -83,3 +83,25 @@
|
||||
padding: 9px;
|
||||
|
||||
}
|
||||
|
||||
.breadcrumbPanel-NextArrow {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.breadcrumbPanel-ActiveBreadcrumb {
|
||||
font-size: 18px;
|
||||
font-family: 'UbuntuLight',Arial,Verdana,sans-serif;
|
||||
margin: 5px 10px 0 0;
|
||||
}
|
||||
|
||||
.breadcrumbPanel-InactiveBreadcrumb {
|
||||
font-size: 24px;
|
||||
}
|
||||
|
||||
.breadcrumbPanel-ActiveBreadcrumb a, .breadcrumbPanel-InactiveBreadcrumb a, .breadcrumbPanel-NextArrow a {
|
||||
color:#A1A1A1;
|
||||
}
|
||||
|
||||
.breadcrumbPanel-ActiveBreadcrumb, .breadcrumbPanel-InactiveBreadcrumb, .breadcrumbPanel-NextArrow {
|
||||
color:#A1A1A1;
|
||||
}
|
||||
@@ -74,12 +74,6 @@ table td, table th {
|
||||
visibility: hidden;
|
||||
}
|
||||
|
||||
.breadcrumbPanel-ActiveBreadcrumb, .breadcrumbPanel-InactiveBreadcrumb, .breadcrumbPanel-NextArrow {
|
||||
font-size: 20px;
|
||||
text-transform: uppercase;
|
||||
color: #a1a1a1;
|
||||
font-weight: 500;
|
||||
}
|
||||
|
||||
.sapLogo {
|
||||
float: left;
|
||||
@@ -130,17 +124,8 @@ body, table td, select, button {
|
||||
font-size: 14px;
|
||||
}
|
||||
|
||||
.breadcrumbPanel-ActiveBreadcrumb, .breadcrumbPanel-InactiveBreadcrumb, .breadcrumbPanel-NextArrow {
|
||||
font-size: 20px;
|
||||
text-transform: uppercase;
|
||||
color: #a1a1a1;
|
||||
font-family: 'UbuntuRegular', Arial, Verdana, sans-serif;
|
||||
}
|
||||
|
||||
.breadcrumbPanel-ActiveBreadcrumb a, .breadcrumbPanel-InactiveBreadcrumb a, .breadcrumbPanel-NextArrow a {
|
||||
color:#A1A1A1;
|
||||
}
|
||||
|
||||
.busyIndicator-simpleBusyIndicator {
|
||||
margin-top: 7px;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -235,16 +235,6 @@ input.magnifier {
|
||||
z-index: 20;
|
||||
}
|
||||
|
||||
.breadcrumbPanel-ActiveBreadcrumb, .breadcrumbPanel-InactiveBreadcrumb, .breadcrumbPanel-NextArrow {
|
||||
font-size: 20px;
|
||||
text-transform: uppercase;
|
||||
color: #a1a1a1;
|
||||
font-family: 'UbuntuRegular', Arial, Verdana, sans-serif;
|
||||
}
|
||||
|
||||
.breadcrumbPanel-ActiveBreadcrumb a, .breadcrumbPanel-InactiveBreadcrumb a, .breadcrumbPanel-NextArrow a {
|
||||
color:#A1A1A1;
|
||||
}
|
||||
|
||||
.abstractChartPanel-importantMessageOfChart {
|
||||
font-family: 'UbuntuBold',Arial,Verdana,sans-serif;
|
||||
@@ -255,4 +245,8 @@ input.magnifier {
|
||||
width: 300px;
|
||||
color: #7c7c7c;
|
||||
background: url(images/important-message.png) left center no-repeat;
|
||||
}
|
||||
|
||||
.breadcrumbPanel-NextArrow {
|
||||
display: none;
|
||||
}
|
||||
@@ -12,7 +12,8 @@
|
||||
<link rel="shortcut icon" type="image/x-icon" href="images/sap.ico" />
|
||||
<link href="CommonControls.css" rel="stylesheet" type="text/css">
|
||||
<!--<link href='http://fonts.googleapis.com/css?family=Ubuntu:300,400,500,700,300italic,400italic,500italic,700italic' rel='stylesheet' type='text/css'>-->
|
||||
|
||||
<!-- <link href='http://fonts.googleapis.com/css?family=Open+Sans+Condensed:700,300,300italic' rel='stylesheet' type='text/css'>-->
|
||||
|
||||
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
|
||||
<script type="text/javascript" src="highcharts/js/highcharts.js"></script>
|
||||
|
||||
|
||||
Executable → Regular
+32
@@ -92,3 +92,35 @@
|
||||
|
||||
}
|
||||
|
||||
@font-face {
|
||||
font-family: 'OpenSansCondensedLight';
|
||||
src: url('webfonts/OpenSans-CondLight-webfont.eot');
|
||||
src: url('webfonts/OpenSans-CondLight-webfont.eot?#iefix') format('embedded-opentype'),
|
||||
url('webfonts/OpenSans-CondLight-webfont.woff') format('woff'),
|
||||
url('webfonts/OpenSans-CondLight-webfont.ttf') format('truetype');
|
||||
font-weight: normal;
|
||||
font-style: normal;
|
||||
|
||||
}
|
||||
|
||||
@font-face {
|
||||
font-family: 'OpenSansCondensedLightItalic';
|
||||
src: url('webfonts/OpenSans-CondLightItalic-webfont.eot');
|
||||
src: url('webfonts/OpenSans-CondLightItalic-webfont.eot?#iefix') format('embedded-opentype'),
|
||||
url('webfonts/OpenSans-CondLightItalic-webfont.woff') format('woff'),
|
||||
url('webfonts/OpenSans-CondLightItalic-webfont.ttf') format('truetype');
|
||||
font-weight: normal;
|
||||
font-style: normal;
|
||||
|
||||
}
|
||||
|
||||
@font-face {
|
||||
font-family: 'OpenSansCondensedBold';
|
||||
src: url('webfonts/OpenSans-CondBold-webfont.eot');
|
||||
src: url('webfonts/OpenSans-CondBold-webfont.eot?#iefix') format('embedded-opentype'),
|
||||
url('webfonts/OpenSans-CondBold-webfont.woff') format('woff'),
|
||||
url('webfonts/OpenSans-CondBold-webfont.ttf') format('truetype');
|
||||
font-weight: normal;
|
||||
font-style: normal;
|
||||
|
||||
}
|
||||
Executable → Regular
+4
-5
@@ -13,9 +13,10 @@
|
||||
border-right: 1px solid #ffffff !important;
|
||||
border-top: none !important;
|
||||
border-bottom: 1px solid #c9caca !important;
|
||||
padding: 3px 12px;
|
||||
padding: 3px 5px;
|
||||
padding-bottom: 5px;
|
||||
text-align: center;
|
||||
font-family: 'OpenSansCondensedLight', 'UbuntuRegular', Arial, Verdana, sans-serif;
|
||||
}
|
||||
|
||||
.cellTableFirstColumnHeader {
|
||||
@@ -26,8 +27,6 @@
|
||||
border-right: 1px solid #ffffff !important;
|
||||
border-top: none !important;
|
||||
border-bottom: 1px solid #c9caca !important;
|
||||
padding: 3px 12px;
|
||||
padding-bottom: 5px;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
@@ -38,8 +37,6 @@
|
||||
border-right: 1px solid #c9caca !important;
|
||||
border-top: none !important;
|
||||
border-bottom: 1px solid #c9caca !important;
|
||||
padding: 3px 12px;
|
||||
padding-bottom: 5px;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
@@ -60,6 +57,7 @@
|
||||
border-bottom: 1px solid #c9caca !important;
|
||||
padding: 5px 17px 5px !important;
|
||||
white-space: nowrap;
|
||||
font-family: 'OpenSansCondensedLight', 'UbuntuRegular', Arial, Verdana, sans-serif;
|
||||
}
|
||||
|
||||
.cellTableOddRow {
|
||||
@@ -74,6 +72,7 @@
|
||||
border-bottom: 1px solid #c9caca !important;
|
||||
padding: 5px 17px 5px !important;
|
||||
white-space: nowrap;
|
||||
font-family: 'OpenSansCondensedLight', 'UbuntuRegular', Arial, Verdana, sans-serif;
|
||||
}
|
||||
|
||||
.cellTableHoveredRow {
|
||||
|
||||
+5
-2
@@ -48,7 +48,9 @@ public class SpectatorEntryPoint extends AbstractEntryPoint implements EventRefr
|
||||
|
||||
FormPanel panelToDisplay = null;
|
||||
if (groupName == null) {
|
||||
panelToDisplay = new LeaderboardGroupOverviewPanel(sailingService, this, stringMessages);
|
||||
//TODO Enable code below, when the LeaderboardGroupOverviewPanel was styled
|
||||
// panelToDisplay = new LeaderboardGroupOverviewPanel(sailingService, this, stringMessages);
|
||||
Window.alert("No leaderboard group name was given.");
|
||||
} else {
|
||||
panelToDisplay = new LeaderboardGroupPanel(sailingService, stringMessages, this, groupName, root);
|
||||
LeaderboardGroupPanel groupPanel = (LeaderboardGroupPanel) panelToDisplay;
|
||||
@@ -59,8 +61,9 @@ public class SpectatorEntryPoint extends AbstractEntryPoint implements EventRefr
|
||||
" the leader board displays information such as in-race ranking, average speeds, distance travelled, ETA" +
|
||||
" (estimated time of arrival at the next mark rounding), gaps to leader, gains and losses per leg.\n\n" +
|
||||
"Check out the results for yourself to see who triumphed - and how they did it."));
|
||||
rootPanel.add(panelToDisplay);
|
||||
}
|
||||
rootPanel.add(panelToDisplay);
|
||||
// rootPanel.add(panelToDisplay);
|
||||
|
||||
fillEvents();
|
||||
}
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Reference in new issue
Block a user