aboutsummaryrefslogtreecommitdiff
path: root/vfd-main
diff options
context:
space:
mode:
Diffstat (limited to 'vfd-main')
-rw-r--r--vfd-main/app/views/dashboard.scala.html27
-rw-r--r--vfd-main/public/stylesheets/main.css191
2 files changed, 159 insertions, 59 deletions
diff --git a/vfd-main/app/views/dashboard.scala.html b/vfd-main/app/views/dashboard.scala.html
index 02a79f7..b2cfdfd 100644
--- a/vfd-main/app/views/dashboard.scala.html
+++ b/vfd-main/app/views/dashboard.scala.html
@@ -2,33 +2,6 @@
@main("Main"){
- <header>
- <nav class="navbar navbar-inverse navbar-static-top" role="navigation">
- <div class="container-fluid">
- <!-- Brand and toggle get grouped for better mobile display -->
- <div class="navbar-header">
- <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-main-collapse">
- <span class="sr-only">Toggle navigation</span>
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- </button>
- <a class="navbar-brand" href="@routes.Application.index">
- <!-- <img style="max-height: 100%;" src="@routes.Assets.at("images/logo-invert.svg")" alt="logo"> -->
- Flight Control Panel
- </a>
- </div>
-
- <!-- Collect the nav links, forms, and other content for toggling -->
- <div class="collapse navbar-collapse" id="navbar-main-collapse">
- <div class="nav navbar-nav navbar-right">
- <p class="navbar-text">Remote System @remoteSystemId</p>
- </div>
- </div><!-- /.navbar-collapse -->
- </div><!-- /.container-fluid -->
- </nav>
- </header>
-
@app("vfd-dashboard")(
"socketUrl" -> socket,
"remoteSystemId" -> remoteSystemId.toString,
diff --git a/vfd-main/public/stylesheets/main.css b/vfd-main/public/stylesheets/main.css
index e92cd24..072f167 100644
--- a/vfd-main/public/stylesheets/main.css
+++ b/vfd-main/public/stylesheets/main.css
@@ -1,18 +1,9 @@
-@font-face {
- font-family: ds-digi;
- src: url('../fonts/ds-digi.ttf')
-}
-
-html {
- height: 100%;
-}
-
-body {
- height: 100%;
+html, body {
+ height: 100%;
}
body {
- background-color: #e6e6e6;
+ background-color: #e6e6e6;
}
.loader {
@@ -21,6 +12,144 @@ body {
text-align: center;
}
+#vfd-dashboard {
+ width: 100%;
+ height: 100%;
+}
+
+#vfd-dashboard header {
+ color: #eeeeee;
+ background-color: #222222;
+ padding-left: 15px;
+ padding-right: 15px;
+ padding-top: 5px;
+ padding-bottom: 5px;
+ margin-bottom: 5px;
+ display: flex;
+}
+
+#vfd-dashboard header > * {
+ margin: 5px;
+ flex: 1;
+}
+
+#vfd-dashboard header > :nth-child(1) {
+ text-align: left;
+}
+
+#vfd-dashboard header > :nth-child(2) {
+ text-align: center;
+}
+
+#vfd-dashboard header > :nth-child(3) {
+ text-align: right;
+}
+
+/* dashboard layout */
+.d-container {
+ display: flex;
+ align-content: flex-start;
+ align-items: stretch;
+}
+
+.d-container > * {
+ flex: 1;
+}
+
+.d-column {
+ flex-direction: column;
+ height: 100%;
+}
+
+.d-row {
+ flex-direction: row;
+ width: 100%;
+}
+
+.d-above {
+ flex: none;
+}
+
+.d-left {
+ flex: 1 1 30%;
+}
+
+.d-middle {
+ flex: 1 1 45%;
+}
+
+.d-right {
+ flex: 1 1 25%;
+}
+
+.d-center {
+ flex: none;
+}
+
+.d-below {
+ flex: 1;
+}
+
+.d-details {
+ display: none;
+}
+
+.d-detailed .d-left, .d-detailed .d-right {
+ display: none;
+}
+
+.d-detailed .d-middle {
+ flex: 1 1 25%;
+}
+
+.d-detailed .d-details {
+ display: flex;
+ flex: 1 1 75%;
+ overerflow-y: scroll;
+}
+
+.d-panel {
+ margin: 5px;
+ padding: 15px;
+ background-color: white;
+ border-radius: 3px;
+}
+
+
+/* Mode styles */
+.mode {
+ display: inline-block;
+ box-sizing: border-box;
+ text-decoration: normal;
+ margin-right: 5px;
+}
+
+.mode.danger {
+ color: #d9534f;
+ text-shadow: 0 0 5px #d9534f;
+}
+
+.mode.warning {
+ color: #f0ad4e;
+ text-shadow: 0 0 5px #f0ad4e;
+}
+
+.mode.info {
+ color: #5bc0de;
+ text-shadow: 0 0 5px #5bc0de;
+}
+
+.mode.success {
+ color: #5cb85c;
+ text-shadow: 0 0 5px #5cb85c;
+}
+
+.mode.off {
+ color: #eeeeee;
+ text-shadow: none;
+}
+
+/* TODO: Rules below are maybe obsolete and need to be reviewed */
.table-instrument {
table-layout: fixed;
width: 100%;
@@ -31,25 +160,23 @@ body {
}
.heartbeat {
- color: rgba(165, 25, 25, 1);
- animation: heartbeat 2s linear infinite;
+ color: rgba(165, 25, 25, 1);
+ animation: heartbeat 2s linear infinite;
}
-
@keyframes heartbeat {
- 0% {
- transform: scale(1);
- }
- 7% {
- transform: scale(1.3);
- }
- 14% {
- transform: scale(1);
- }
- 21% {
- transform: scale(1.3);
- }
- 28% {
- transform: scale(1);
- }
-}
-
+ 0% {
+ transform: scale(1);
+ }
+ 7% {
+ transform: scale(1.3);
+ }
+ 14% {
+ transform: scale(1);
+ }
+ 21% {
+ transform: scale(1.3);
+ }
+ 28% {
+ transform: scale(1);
+ }
+} \ No newline at end of file