From df379b8b3ca964dc5b95369f1456f020817060bd Mon Sep 17 00:00:00 2001 From: ulrich <not disclosed> Date: Fri, 05 Jan 2018 11:06:20 +0000 Subject: [PATCH] Breite beim Einblenden des Menüs veränderlich, diverse Anpassungen am Stylesheet --- app.js | 6 ++++-- app.css | 22 ++++++++-------------- 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/app.css b/app.css index 031c422..fe0ac3b 100644 --- a/app.css +++ b/app.css @@ -1,5 +1,10 @@ -/* ehem. app-layout anfang */ +/* + app-layout anfang + + Aus dem app-layout-Projekt übernommen und + teilweise angepasst +*/ html, body { margin: 0; @@ -34,7 +39,7 @@ .west { flex-grow: 0; flex-shrink: 0; - flex-basis: 10em; + flex-basis: 4em; background-color: antiquewhite; transition: all 0.3s ease-in; overflow: hidden; @@ -47,14 +52,6 @@ flex-basis: 10em; background-color: antiquewhite; } -/* -.zentrum { - width: 100%; - height: 100%; - overflow: auto; - -webkit-overflow-scrolling: touch; -} -*/ .zentrum { display: flex; flex-flow: row; @@ -70,9 +67,7 @@ immer ueber das gesamte Browserfenster ausdehnt. */ -/* ehem. app-layout ende */ - - +/* app-layout ende */ #app-titel { padding-left: 2em; @@ -86,7 +81,6 @@ display: flex; flex-flow: column; } - /* Dialogfeld */ diff --git a/app.js b/app.js index 178ee3f..331f3c1 100644 --- a/app.js +++ b/app.js @@ -4,13 +4,13 @@ var TPL_DLG_MSG = 'dlg-msg'; var TPL_DLG_INFO = 'dlg-info'; var TPL_DLG_SENDER = 'dlg-sender'; -var templateCache = {}; // mustache templates 'home', 'prefs', 'sender' +var templateCache = {}; // mustache templates var prefsRendered = false; function app_init() { $('.dialog').hide(); $('.ost').hide(); - app_menu_init("data/menu/", "hauptmenue.json", "../jslib/app-menu/app-menu.tpl", ".west"); + app_menu_init("data/menu/", "hauptmenue.json", "../jslib/app-menu/app-menu.tpl", ".west", "8em"); app_get_template('data/tpl/dlg-msg.tpl', TPL_DLG_MSG); app_get_template('data/tpl/dlg-info.tpl', TPL_DLG_INFO); app_get_template('data/tpl/sender.tpl', TPL_SENDER); @@ -26,10 +26,12 @@ function app_nachricht_test() { app_dialog_laden_und_zeigen(templateCache[TPL_DLG_MSG], 'data/msg-test.json'); + app_menu_toggle(); } function app_info_dialog_zeigen() { app_dialog_laden_und_zeigen(templateCache[TPL_DLG_INFO], ''); + app_menu_toggle(); } function app_neuer_sender() { -- Gitblit v1.9.3