From 29f60fc6aade93b3a2d3ff608fbcd949165f6ef7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emanuel=20Sch=C3=BCtze?= <emanuel@intevation.de>
Date: Fri, 8 Sep 2017 18:25:48 +0200
Subject: [PATCH] Fixed motion detail style issues

- margin in motion diff view
- personal note box
---
 openslides/core/static/css/app.css             | 18 ++++--------------
 .../motions/motion-detail/personal-note.html   |  2 +-
 .../motions/motion-detail/view-diff.html       |  2 +-
 3 files changed, 6 insertions(+), 16 deletions(-)

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 @@
 
     <!-- personal note editor field -->
     <div class="col-sm-12">
-      <div id="personal-note-inline-editor" style="min-height: 14px;"
+      <div id="personal-note-inline-editor"
         ng-bind-html="motion.personalNote.note | trusted" contenteditable="{{ personalNoteInlineEditing.isEditable }}"></div>
       <!-- save toolbar -->
       <div class="motion-save-toolbar" ng-class="{ 'visible': (personalNoteInlineEditing.changed && personalNoteInlineEditing.active) }">
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 @@
             <div class="motion-text original-text line-numbers-{{ lineNumberMode }}"
                  ng-bind-html="motion.getTextBetweenChangeRecommendations(version, changes[$index - 1], change, highlight) | trusted"></div>
 
-            <div ng-class="motion.isAllowed('can_manage') ? 'diff-box' : 'diff-box-transparent'"
+            <div ng-class="motion.isAllowed('can_manage') ? 'diff-box' : ''"
                 class="diff-box-{{ change.id }} clearfix">
                 <div class="action-row" ng-if="motion.isAllowed('can_manage')">
                     <div class="btn-group" data-toggle="buttons">