From f98aed827fef535ad7708fd8b7dd746e1f4a5d9a Mon Sep 17 00:00:00 2001 From: Robert Richter Date: Wed, 29 Apr 2020 14:31:01 +0200 Subject: [PATCH] update Mi 29. Apr 14:31:01 CEST 2020 --- public/css/waip.css | 24 +----------------------- public/js/client_waip.js | 7 +++---- views/includes/master_wachalarm.pug | 17 ++++++++++++++++- 3 files changed, 20 insertions(+), 28 deletions(-) diff --git a/public/css/waip.css b/public/css/waip.css index 709091e..53ac792 100644 --- a/public/css/waip.css +++ b/public/css/waip.css @@ -204,26 +204,4 @@ audio { } -**********/ - -.test-font { - font-size: 1rem; -} - -@include media-breakpoint-up(sm) { - .test-font { - font-size: 1.2rem; - } -} - -@include media-breakpoint-up(md) { - .test-font { - font-size: 1.4rem; - } -} - -@include media-breakpoint-up(lg) { - .test-font { - font-size: 1.6rem; - } -} \ No newline at end of file +****/ \ No newline at end of file diff --git a/public/js/client_waip.js b/public/js/client_waip.js index c4e4c71..3c06238 100644 --- a/public/js/client_waip.js +++ b/public/js/client_waip.js @@ -51,10 +51,9 @@ function resize_text() { detectMultiLine: false }); textFit(document.getElementsByClassName('tf_test'), { - widthOnly: true, - alignHoriz: false, - alignVert: false, - alignVertWithFlexbox: false + detectMultiLine: false, + multiLine: false, + alignVertWithFlexbox: flase }); map.invalidateSize(); $("body").css("background-color", "#222"); diff --git a/views/includes/master_wachalarm.pug b/views/includes/master_wachalarm.pug index fff6dec..f3d1532 100644 --- a/views/includes/master_wachalarm.pug +++ b/views/includes/master_wachalarm.pug @@ -62,7 +62,7 @@ br | -Straße Hsnr- //.col-6.h-65.d-flex.align-items-around.justify-content-end - .col-6.h-65.d-flex.flex-wrap.align-content-end.test-font + .col-6.h-65.d-flex.flex-wrap.align-content-end.tf_test //div.flex-fill.rounded.bg-secondary.p-2.m-1 div.rounded.bg-secondary.d-flex.justify-content-between.flex-fill.p-2.m-1 div.pr-2 FL CB 01/42-01 @@ -82,6 +82,21 @@ div.rounded.bg-secondary.d-flex.justify-content-between.flex-fill.p-2.m-1 div.pr-2 FL CB 01/42-01 div.p-2.badge.badge-success 2 + div.rounded.bg-secondary.d-flex.justify-content-between.flex-fill.p-2.m-1 + div.pr-2 FL CB 01/42-01 + div.p-2.badge.badge-success 2 + div.rounded.bg-secondary.d-flex.justify-content-between.flex-fill.p-2.m-1 + div.pr-2 FL CB 01/42-01 + div.p-2.badge.badge-success 2 + div.rounded.bg-secondary.d-flex.justify-content-between.flex-fill.p-2.m-1 + div.pr-2 FL CB 01/42-01 + div.p-2.badge.badge-success 2 + div.rounded.bg-secondary.d-flex.justify-content-between.flex-fill.p-2.m-1 + div.pr-2 FL CB 01/42-01 + div.p-2.badge.badge-success 2 + div.rounded.bg-secondary.d-flex.justify-content-between.flex-fill.p-2.m-1 + div.pr-2 FL CB 01/42-01 + div.p-2.badge.badge-success 2 //ul#em_alarmiert.list-group