From bb7a18014a5d3633c5624eee6f80161818baf300 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20R=C3=B6wenstrunk?= <roewenstrunk@uni-paderborn.de> Date: Thu, 30 Jan 2025 14:54:01 +0100 Subject: [PATCH] Default for annotations in texts should be inline display --- app/view/window/text/TextFacsimileSplitView.js | 4 +++- app/view/window/text/TextView.js | 4 +++- resources/css/todo.css | 14 +++++++++++++- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/app/view/window/text/TextFacsimileSplitView.js b/app/view/window/text/TextFacsimileSplitView.js index 282a624db..52c8d0387 100644 --- a/app/view/window/text/TextFacsimileSplitView.js +++ b/app/view/window/text/TextFacsimileSplitView.js @@ -259,7 +259,9 @@ Ext.define('EdiromOnline.view.window.text.TextFacsimileSplitView', { var me = this; var annos = Ext.query('#' + me.id + '_textCont span.annotation'); Ext.Array.each(annos, function(anno) { - Ext.get(anno).hide(); + var a = Ext.get(anno); + a.setVisibilityMode(Ext.Element.DISPLAY); + a.hide(); }); }, diff --git a/app/view/window/text/TextView.js b/app/view/window/text/TextView.js index 9e2180b92..4268d8267 100644 --- a/app/view/window/text/TextView.js +++ b/app/view/window/text/TextView.js @@ -222,7 +222,9 @@ Ext.define('EdiromOnline.view.window.text.TextView', { var me = this; var annos = Ext.query('#' + me.id + '_textCont div.annotation'); Ext.Array.each(annos, function(anno) { - Ext.get(anno).hide(); + var a = Ext.get(anno); + a.setVisibilityMode(Ext.Element.DISPLAY); + a.hide(); }); }, diff --git a/resources/css/todo.css b/resources/css/todo.css index b94fb4654..d4a9cd932 100644 --- a/resources/css/todo.css +++ b/resources/css/todo.css @@ -36,6 +36,18 @@ body { margin-right: 2em; } +.textViewContent span.note::before { + content: none; +} + +.textViewContent span.note::after { + content: none; +} + +.textViewContent span.note div.annotation { + display: inline-block; +} + #ediromToolbar .x-btn.insetButton.x-btn-default-toolbar-small { background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #dddddd), color-stop(30%, #c3c3c3), color-stop(65%, #b8b8b8), color-stop(100%, #a0a0a0)); background-image: -webkit-linear-gradient(top, #dddddd, #c3c3c3 30%, #b8b8b8 65%, #a0a0a0); @@ -93,7 +105,7 @@ span.musicalSymbol { .ediromWindow .annotation { z-index: 10; - display: flex !important; + display: flex; justify-content: center; align-items: center; flex-wrap: wrap; -- GitLab