diff --git a/openslides/core/static/css/app.css b/openslides/core/static/css/app.css index 9c26b9fab..15695ddae 100644 --- a/openslides/core/static/css/app.css +++ b/openslides/core/static/css/app.css @@ -106,15 +106,10 @@ h4 { text-decoration: none; } -p { - padding-bottom: 14px; -} p.os-split-after { - padding-bottom: 0; margin-bottom: 0; } p.os-split-before { - padding-top: 0; margin-top: 0; } @@ -569,7 +564,7 @@ img { display: none; max-width: 150px; left: -45px; - margin-top: -8px !important; + margin-top: -15px !important; z-index: 10000; } /* special hack for firefox only (see issue#2967) */ @@ -676,15 +671,9 @@ img { padding-top: 0; padding-right: 155px; } -.diff-box-transparent { - margin-top: -24px; -} .motion-text-with-diffs li.os-split-before { list-style-type: none; } -.motion-text-with-diffs .original-text { - min-height: 30px; /* Spacer between .diff-box, in case .original-text is empty */ -} .motion-text-with-diffs .original-text ul:last-child, .motion-text-with-diffs .original-text ol:last-child { padding-bottom: 16px; } @@ -753,8 +742,9 @@ img { box-shadow: 0px 0px 10px 1px rgba(0,0,0,0.5); } -#personalNote.pinned .col-sm-12 { - overflow-x: auto; +#personalNote.pinned #personal-note-inline-editor { + overflow-y: scroll; + min-height: 100px; max-height: 200px; } diff --git a/openslides/motions/static/templates/motions/motion-detail/personal-note.html b/openslides/motions/static/templates/motions/motion-detail/personal-note.html index 704927fc7..1d4bf2d12 100644 --- a/openslides/motions/static/templates/motions/motion-detail/personal-note.html +++ b/openslides/motions/static/templates/motions/motion-detail/personal-note.html @@ -27,7 +27,7 @@
-
diff --git a/openslides/motions/static/templates/motions/motion-detail/view-diff.html b/openslides/motions/static/templates/motions/motion-detail/view-diff.html index ea4dd2fc3..9b7fd0251 100644 --- a/openslides/motions/static/templates/motions/motion-detail/view-diff.html +++ b/openslides/motions/static/templates/motions/motion-detail/view-diff.html @@ -6,7 +6,7 @@
-