ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3398 from emanuelschuetze/motion-detail-style

Browse Source 
Fixed motion detail style issues
This commit is contained in:
Norman Jäckel 2017-09-08 19:43:31 +02:00 committed by GitHub
commit 544dd4ce13
3 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
openslides/core/static/css/app.css
View File

@ -106,15 +106,10 @@ h4 {
text-decoration: none; text-decoration: none;
} }
p {
padding-bottom: 14px;
}
p.os-split-after { p.os-split-after {
padding-bottom: 0;
margin-bottom: 0; margin-bottom: 0;
} }
p.os-split-before { p.os-split-before {
padding-top: 0;
margin-top: 0; margin-top: 0;
} }
@ -569,7 +564,7 @@ img {
display: none; display: none;
max-width: 150px; max-width: 150px;
left: -45px; left: -45px;
margin-top: -8px !important; margin-top: -15px !important;
z-index: 10000; z-index: 10000;
} }
/* special hack for firefox only (see issue#2967) */ /* special hack for firefox only (see issue#2967) */
@ -676,15 +671,9 @@ img {
padding-top: 0; padding-top: 0;
padding-right: 155px; padding-right: 155px;
} }
.diff-box-transparent {
margin-top: -24px;
}
.motion-text-with-diffs li.os-split-before { .motion-text-with-diffs li.os-split-before {
list-style-type: none; 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 { .motion-text-with-diffs .original-text ul:last-child, .motion-text-with-diffs .original-text ol:last-child {
padding-bottom: 16px; padding-bottom: 16px;
} }
@ -753,8 +742,9 @@ img {
box-shadow: 0px 0px 10px 1px rgba(0,0,0,0.5); box-shadow: 0px 0px 10px 1px rgba(0,0,0,0.5);
} }
#personalNote.pinned .col-sm-12 { #personalNote.pinned #personal-note-inline-editor {
overflow-x: auto; overflow-y: scroll;
min-height: 100px;
max-height: 200px; max-height: 200px;
} }

2
openslides/motions/static/templates/motions/motion-detail/personal-note.html
View File

@ -27,7 +27,7 @@
<!-- personal note editor field --> <!-- personal note editor field -->
<div class="col-sm-12"> <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> ng-bind-html="motion.personalNote.note | trusted" contenteditable="{{ personalNoteInlineEditing.isEditable }}"></div>
<!-- save toolbar --> <!-- save toolbar -->
<div class="motion-save-toolbar" ng-class="{ 'visible': (personalNoteInlineEditing.changed && personalNoteInlineEditing.active) }"> <div class="motion-save-toolbar" ng-class="{ 'visible': (personalNoteInlineEditing.changed && personalNoteInlineEditing.active) }">

2
openslides/motions/static/templates/motions/motion-detail/view-diff.html
View File

@ -6,7 +6,7 @@
<div class="motion-text original-text line-numbers-{{ lineNumberMode }}" <div class="motion-text original-text line-numbers-{{ lineNumberMode }}"
ng-bind-html="motion.getTextBetweenChangeRecommendations(version, changes[$index - 1], change, highlight) | trusted"></div> 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"> class="diff-box-{{ change.id }} clearfix">
<div class="action-row" ng-if="motion.isAllowed('can_manage')"> <div class="action-row" ng-if="motion.isAllowed('can_manage')">
<div class="btn-group" data-toggle="buttons"> <div class="btn-group" data-toggle="buttons">