From cd96006d7c65f973c5f45e6f55e5e2f03829b588 Mon Sep 17 00:00:00 2001 From: Stephan Richter Date: Sat, 5 Dec 2020 23:14:24 +0100 Subject: [PATCH] improved css --- pom.xml | 2 +- resources/css/style.css | 10 ++++++++-- .../srsoftware/web4rail/tiles/TextDisplay.java | 16 +++++++++------- 3 files changed, 18 insertions(+), 10 deletions(-) diff --git a/pom.xml b/pom.xml index e4a95b4..8098245 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 de.srsoftware web4rail - 1.2.27 + 1.2.28 Web4Rail jar Java Model Railway Control diff --git a/resources/css/style.css b/resources/css/style.css index 95381b0..624de84 100644 --- a/resources/css/style.css +++ b/resources/css/style.css @@ -7,7 +7,10 @@ html{ } body{ min-height: 100%; - background: rgb(198,219,210); + background-size: 30px 30px; + background-image: + linear-gradient(to right, grey 1px, transparent 1px), + linear-gradient(to bottom, grey 1px, transparent 1px); } button{ border: 1px solid blue; @@ -36,11 +39,14 @@ button{ } .tile{ - border: 1px solid black; width: 30px; height: 30px; position: absolute; +} + +.tile.fill{ background: white; + border: 1px solid black; } .crossH{ diff --git a/src/main/java/de/srsoftware/web4rail/tiles/TextDisplay.java b/src/main/java/de/srsoftware/web4rail/tiles/TextDisplay.java index 06332b7..236c5d9 100644 --- a/src/main/java/de/srsoftware/web4rail/tiles/TextDisplay.java +++ b/src/main/java/de/srsoftware/web4rail/tiles/TextDisplay.java @@ -32,13 +32,6 @@ public class TextDisplay extends StretchableTile { return super.load(json); } - @Override - public Tag tag(Map replacements) throws IOException { - if (isNull(replacements)) replacements = new HashMap(); - replacements.put("%text%",text); - return super.tag(replacements); - } - @Override protected Window properties(List
preForm, FormInput formInputs, List
postForm) { formInputs.add(t("Text"),new Input(TEXT, text)); @@ -61,6 +54,15 @@ public class TextDisplay extends StretchableTile { protected String stretchType() { return t("Width"); } + + + @Override + public Tag tag(Map replacements) throws IOException { + if (isNull(replacements)) replacements = new HashMap(); + replacements.put("%text%",text); + Tag tag = super.tag(replacements); + return tag.clazz(tag.get("class")+" fill"); + } public TextDisplay text(String tx) { text = tx;