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

Merge pull request #4960 from GabrielInTheWorld/someUI

Browse Source 
Improves some user-interfaces for motion-detail
This commit is contained in:
Emanuel Schütze 2019-09-02 10:20:21 +02:00 committed by GitHub
commit ecd107bf73
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/app/shared/components/icon-container/icon-container.component.scss
View File

@ -14,6 +14,7 @@ os-icon-container {
font-size: $size; font-size: $size;
height: $size; height: $size;
width: $size; width: $size;
margin-top: 0 !important;
} }
} }
@ -25,6 +26,7 @@ os-icon-container {
font-size: $size; font-size: $size;
width: $size; width: $size;
height: $size; height: $size;
margin-top: 0 !important;
} }
.content-node { .content-node {

16
client/src/app/site/motions/modules/motion-detail/components/motion-detail-diff/motion-detail-diff.component.scss
View File

@ -1,11 +1,12 @@
/* Diffbox */ /* Diffbox */
.diff-box { .diff-box {
position: relative;
background-color: #f9f9f9; background-color: #f9f9f9;
border: solid 1px #eee; border: solid 1px #eee;
border-radius: 3px; border-radius: 3px;
margin-bottom: 0; margin-bottom: 0;
padding-top: 0; padding-top: 0;
padding-right: 155px; padding-right: 40px;
&:hover { &:hover {
background-color: #f0f0f0; background-color: #f0f0f0;
@ -15,18 +16,10 @@
} }
} }
.mat-icon-button {
margin-top: -20px;
}
.action-row { .action-row {
position: absolute;
right: 0;
font-size: 0.8em; font-size: 0.8em;
height: 22px;
padding-top: 2px;
float: right;
width: 150px;
text-align: right;
margin-right: -150px;
opacity: 0.5; opacity: 0.5;
overflow: hidden; overflow: hidden;
@ -44,6 +37,7 @@
min-width: 68px; min-width: 68px;
} }
} }
.status-row { .status-row {
font-style: italic; font-style: italic;
color: gray; color: gray;

2
client/src/app/site/motions/modules/motion-detail/components/motion-detail/motion-detail.component.html
View File

@ -465,7 +465,7 @@
<form class="motion-content" [formGroup]="contentForm" (keydown)="onKeyDown($event)"> <form class="motion-content" [formGroup]="contentForm" (keydown)="onKeyDown($event)">
<!-- Toolbar with text controls and buttonf for managing the (modified) final version--> <!-- Toolbar with text controls and buttonf for managing the (modified) final version-->
<div <div
class="motion-text-toolbar-wrapper outline-border-bottom" class="motion-text-toolbar-wrapper"
*ngIf="!editMotion && !motion.isStatuteAmendment()" *ngIf="!editMotion && !motion.isStatuteAmendment()"
> >
<!-- Line Number and Diff buttons --> <!-- Line Number and Diff buttons -->

6
client/src/app/site/motions/modules/motion-detail/components/motion-detail/motion-detail.component.scss
View File

@ -29,12 +29,8 @@ span {
button { button {
font-weight: 400; font-weight: 400;
margin-top: 7px;
} }
margin-bottom: 16px;
height: 50px;
margin: -16px -16px 5px -16px;
padding: 0 16px;
> button { > button {
// Prevent moving the buttons when the "go to line"-input is shown // Prevent moving the buttons when the "go to line"-input is shown