From d12f6ef6e56ac9b696d643dd0945573424a1afdc Mon Sep 17 00:00:00 2001
From: ulrich
Date: Sun, 11 Apr 2021 14:39:04 +0000
Subject: [PATCH] UI-Feinschliff
---
www/ui/app.css | 47 ++++++++++++++++++++++++++++++++++++++++++++---
src/de/uhilger/mediaz/api/MediaSteuerung.java | 1 +
www/ui/index.html | 5 ++---
3 files changed, 47 insertions(+), 6 deletions(-)
diff --git a/src/de/uhilger/mediaz/api/MediaSteuerung.java b/src/de/uhilger/mediaz/api/MediaSteuerung.java
index 326692a..cd689d0 100644
--- a/src/de/uhilger/mediaz/api/MediaSteuerung.java
+++ b/src/de/uhilger/mediaz/api/MediaSteuerung.java
@@ -91,6 +91,7 @@
if (elems[5].equalsIgnoreCase(PL_CMD_ENDE)) {
response = naechsterTitel(fs, elems[4]);
} else if(elems[5].equalsIgnoreCase(PL_CMD_STOP)) {
+ spielt.remove(elems[4]);
response = kommandoSenden(fs, elems[4], PL_CMD_AVD_STOP);
} else if(elems[5].equalsIgnoreCase(PL_CMD_PAUSE)) {
response = kommandoSenden(fs, elems[4], PL_CMD_AVD_PAUSE);
diff --git a/www/ui/app.css b/www/ui/app.css
index 7a2cdb7..8d3e430 100644
--- a/www/ui/app.css
+++ b/www/ui/app.css
@@ -3,7 +3,7 @@
padding: 0;
height: 100%; /* Anmerkung 2 */
font-size: larger;
- font-family: 'Roboto Condensed';
+ font-family: 'Roboto';
}
body {
min-height: 0; /* Anmerkung 1 */
@@ -22,9 +22,12 @@
background-color: black;
display: flex;
flex-flow: row;
- height: 2em;
+ height: 1.3em;
align-items: center;
justify-content: space-between;
+}
+#nav-menu {
+ margin-left: 0.4rem;
}
.sued {
height: 1.5em;
@@ -78,6 +81,7 @@
*/
.app-titel {
+ font-family: 'Roboto Condensed';
margin-left: 0.6em;
color: white;
}
@@ -89,6 +93,7 @@
.top-band {
display: flex;
flex-flow: row;
+ padding: 0.2rem 0 0.2rem 0.2rem;
}
.breadcrumb-behaelter {
@@ -109,6 +114,8 @@
.bereich-name {
padding-left: 0.4rem;
+ font-family: 'Roboto';
+ font-size: smaller;
}
.dialog {
@@ -156,6 +163,9 @@
.entity-formular {
display: flex;
flex-flow: column;
+ user-select: none;
+ font-size: smaller;
+ font-family: 'Roboto-Light';
}
.entity-liste-kopf {
@@ -172,7 +182,14 @@
.entity-element {
margin: 0.4rem;
+ user-select: none;
}
+
+/*
+.entity-element:focus {
+ outline: none;
+}
+*/
.entity-element:hover {
background-color: #ececec;
@@ -299,7 +316,7 @@
display: flex;
flex-flow: row;
/*margin-left: auto;*/
- margin: -0.5em 1em 0 2em;
+ margin: -0.2em 1em 0 2em;
}
.top-btn, .top-btn:focus {
@@ -327,6 +344,30 @@
}
}
+/* Fonts */
+
+@font-face {
+ font-family: 'Roboto Condensed';
+ src: url('font/RobotoCondensed-Regular.ttf') format('truetype');
+ font-weight: normal;
+ font-style: normal;
+}
+
+@font-face {
+ font-family: 'Roboto-Thin';
+ src: url('font/Roboto-Thin.ttf') format('truetype');
+}
+
+@font-face {
+ font-family: 'Roboto-Light';
+ src: url('font/Roboto-Light.ttf') format('truetype');
+}
+
+@font-face {
+ font-family: 'Roboto';
+ src: url('font/Roboto-Regular.ttf') format('truetype');
+}
+
/* Font für Piktogramme mit Fontello aus FontAwesome erzeugt */
@font-face {
diff --git a/www/ui/index.html b/www/ui/index.html
index f88e463..f822b41 100644
--- a/www/ui/index.html
+++ b/www/ui/index.html
@@ -18,11 +18,10 @@
-->
<html>
<head>
- <title>Mediazentrale</title>
+ <title>Intendant</title>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="apple-mobile-web-app-capable" content="yes" />
- <link href="https://fonts.googleapis.com/css?family=Roboto+Condensed" rel="stylesheet">
<link rel="stylesheet" type="text/css" href="app-menu.css">
<link rel="stylesheet" type="text/css" href="hamburger.css">
<link rel="stylesheet" type="text/css" href="app.css">
@@ -38,7 +37,7 @@
</div>
</div>
<div class="app-titel">
- <span id="app-titel">Mediazentrale</span>
+ <span id="app-titel">Intendant</span>
</div>
<div class="top-btn-area">
<div class="top-btns">
--
Gitblit v1.9.3