Commit 5d04cfcb authored by Mauritz, Falk Marius's avatar Mauritz, Falk Marius
Browse files

Merge remote-tracking branch 'origin/AqueductBranch' into AqueductBranch

parents 3f60c87f 2cc9a9f2
Pipeline #7654 passed with stage
in 5 minutes and 11 seconds
......@@ -51,4 +51,8 @@ button {
button:hover {
background-color: #cfd8dc;
}
li > .middle{
position: relative;
bottom: 50%;
}
......@@ -5,7 +5,7 @@
<ul class="appointments">
<li *ngFor="let appointment of appointments"
(click)="gotoDetail(appointment)">
<span class="badge">{{appointment.date}}</span>
<span>{{appointment.name}}</span>
<span class="badge middle">{{appointment.date}}</span>
<span class="middle">{{appointment.name}}</span>
</li>
</ul>
......@@ -68,7 +68,7 @@
<textarea type="text" class="form-control" id="note" placeholder="note"
[(ngModel)]="appointment.note" name="note" rows="4"></textarea>
<div id="stern">
fields with a <b>*</b> are required
fields with an <b>*</b> are required
</div>
</div>
......
......@@ -52,8 +52,9 @@ h4:nth-child(2n){
}
td > div {
text-align: right;
font-size: small;
font-size: medium;
position: absolute;
margin-left: 12%;
}
th{
text-align: center;
......
.search-result {
border-bottom: 1px solid gray;
border-left: 1px solid gray;
border-right: 1px solid gray;
width:195px;
height: 20px;
padding: 5px;
background-color: white;
cursor: pointer;
}
#search-box {
width: 200px;
height: 20px;
}
\ No newline at end of file
<div id="search-component">
<input #searchBox id="search-box"
<input #searchBox id="search"
placeholder="Search"
(change)="search(searchBox.value)"
(keyup)="search(searchBox.value)" />
<div>
<div id="resultWrapper">
<div *ngFor="let contact of contacts | async"
(click)="contact.delete()" class="search-result" >
{{contact.username}}
......
......@@ -4,4 +4,20 @@ html, body{
height: 100vh;
margin: 0;
background: #04202C;
}
#search-component > #search-box {
width: 200px;
height: 30px;
}
#search-component > div {
position: absolute;
}
.search-result.search-result.search-result.search-result{
position: relative;
z-index: 90000;
cursor: pointer;
width: 200px;
height: 30px;
}
\ No newline at end of file
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment