Skip to content
Snippets Groups Projects
Commit d7093011 authored by Julian Matschinske's avatar Julian Matschinske
Browse files

Merge branch 'fix-margin-issues' into 'master'

Fix margin and scrolling issues

See merge request covid-19/frontend!103
parents 3cf31f81 e545f19d
No related branches found
No related tags found
No related merge requests found
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<div class="covex left-window"> <div class="covex left-window">
<div> <div>
<div class="covex bar-left"> <div class="covex sidebar bar-left">
<div class="card bar-large"> <div class="card bar-large">
<header class="card-header"> <header class="card-header">
...@@ -182,8 +182,7 @@ ...@@ -182,8 +182,7 @@
</div> </div>
</div> </div>
<div class="covex bar-right"> <div class="covex sidebar bar-right">
<div class="card bar-large"> <div class="card bar-large">
<header class="card-header"> <header class="card-header">
<p class="card-header-title"> <p class="card-header-title">
...@@ -387,7 +386,7 @@ ...@@ -387,7 +386,7 @@
</header> </header>
<div *ngIf="collapseSelection"> <div *ngIf="collapseSelection">
<div class="card-content overflow"> <div class="card-content overflow">
<table class="table" *ngIf="analysis.getCount() > 0"> <table class="table selection-table" *ngIf="analysis.getCount() > 0">
<thead> <thead>
<tr> <tr>
<td>Type</td> <td>Type</td>
...@@ -451,7 +450,5 @@ ...@@ -451,7 +450,5 @@
</footer> </footer>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
...@@ -74,18 +74,19 @@ input.checkbox { ...@@ -74,18 +74,19 @@ input.checkbox {
margin-left: 15px; margin-left: 15px;
} }
div.covex.sidebar {
height: calc(100vh - 70px);
overflow-y: auto;
overflow-x: hidden;
width: 350px;
}
div.covex.bar-left { div.covex.bar-left {
float: left; float: left;
width: 350px;
height: calc(100vh - 102px);
overflow: auto;
} }
div.covex.bar-right { div.covex.bar-right {
float: right; float: right;
width: 350px;
height: calc(100vh - 102px);
overflow: auto;
} }
div.card.bar-small { div.card.bar-small {
...@@ -107,7 +108,7 @@ div.card.bar-large { ...@@ -107,7 +108,7 @@ div.card.bar-large {
div.card-content.overflow { div.card-content.overflow {
overflow: auto; overflow: auto;
max-height: 500px; max-height: 350px;
} }
div.covex.left-window { div.covex.left-window {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment