Commit 05c6a103 authored by Jacob's avatar Jacob

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

# Conflicts:
#	src/app/search/search.component.css
#	src/app/search/search.component.html
#	src/styles.css
parents d83fa880 280662bf
.sidecontainerleft {
position:relative;
color:black;
width:445px;
}
.containerSearch {
width:405px;
box-shadow: 0px 0px 4px rgba(127,127,127,0.7);
background-color:rgba(255,255,255,0.85);
}
.tabContent {
padding:10px;
}
#freesearchtab {
background-color:#e6e6e6;
border-radius: 0px;
}
.sidecontainerright {
/*margin-right:25%;*/
position:relative;
right:0px;
margin:80px 0px;
}
.ausgeblendet{
left:-405px;
}
.searchdetails {
width:400px;
float:right;
background-color:rgba(255,255,255,0.85);
color:black;
box-shadow: 0px 0px 4px rgba(127,127,127,0.7);
}
.searcheditPrepend {
float:left;
width:50px;
height:39px;
line-height: 1.5;
border-radius: 20px;
border-top-right-radius: 0;
border-bottom-right-radius: 0;
line-height: 10px;
padding: 0 0 .75rem 0.25rem;
}
.searchetogglePrepend {
float:left;
width:50px;
height:39px;
line-height: 1.5;
border-radius: 20px;
border-top-left-radius: 0;
border-bottom-left-radius: 0;
line-height: 10px;
padding: 0 0 .75rem 0.25rem;
}
.elementdetails div.form-group.row {
border-bottom:1px solid grey;
}
.searchetogglePrepend {
background-color:rgba(255,255,255,0.85);
font-weight:bold;
color:#0d0d0d;
}
.elementdetails > .name, #elementName, .searcheditPrepend {
background-color:#5b90dc;
font-weight:bold;
color:#fff;
}
.elementdiscription {
padding:0px;
}
.btn-outline-secondary {
color: #6c757d;
background-color: transparent;
background-image: none;
border-color: #ccc;
}
.elementpartner .fa-map-marker {
margin-right:8px;
}
.ToggleSearch {
width:40px;
}
.selected-item{
border:1px solid;
}
.sidecontainerleft {
position:relative;
color:black;
width:445px;
}
.containerSearch {
width:405px;
box-shadow: 0px 0px 4px rgba(127,127,127,0.7);
background-color:rgba(255,255,255,0.85);
}
.tabContent {
padding:10px;
}
#freesearchtab {
background-color:#e6e6e6;
border-radius: 0px;
form.searchForm div.form-check {
margin-left:10px;
}
form.searchForm div.form-check label {
color:#9b9b9b;
}
.sidecontainerright {
/*margin-right:25%;*/
position:relative;
right:0px;
margin:80px 0px;
}
.ausgeblendet{
left:-405px;
}
.searchdetails {
width:400px;
float:right;
background-color:rgba(255,255,255,0.85);
color:black;
box-shadow: 0px 0px 4px rgba(127,127,127,0.7);
}
.searcheditPrepend {
float:left;
width:50px;
height:39px;
line-height: 1.5;
border-radius: 20px;
border-top-right-radius: 0;
border-bottom-right-radius: 0;
line-height: 10px;
padding: 0 0 .75rem 0.25rem;
}
.searchetogglePrepend {
float:left;
width:50px;
height:39px;
line-height: 1.5;
border-radius: 20px;
border-top-left-radius: 0;
border-bottom-left-radius: 0;
line-height: 10px;
padding: 0 0 .75rem 0.25rem;
}
.elementdetails div.form-group.row {
border-bottom:1px solid grey;
}
.searchetogglePrepend {
background-color:#9b9b9b;
font-weight:bold;
color:#fff;
}
.elementdetails > .name, #elementName, .searcheditPrepend {
background-color:#5b90dc;
font-weight:bold;
color:#fff;
}
.elementdiscription {
padding:0px;
}
.btn-outline-secondary {
color: #6c757d;
background-color: transparent;
background-image: none;
border-color: #ccc;
}
.elementpartner .fa-map-marker {
margin-right:8px;
}
.ToggleSearch {
width:40px;
}
.selected-item{
border:1px solid;
}
This diff is collapsed.
/* You can add global styles to this file, and also import other style files */
body {
font-family: 'Source Sans Pro', sans-serif;
font-size: 0.9rem;
}
div.widget-wrap{
......@@ -193,7 +194,29 @@ input:checked + .slider:before {
border-radius: 50%;
}
a#freesearchtab {
}
div.containerSearch.float-left ngb-tabset ul.nav.nav-pills.justify-content-start li.nav-item {
width:50%;
}
.nav-pills .nav-link.active {
color: #fff;
background-color: #5b90dc;
border-radius: 0;
}
.nav-pills .nav-link {
color: #a1a1a1;
background-color: #e6e6e6;
border-radius: 0;
}
.form-control, .btn {
font-size: 0.9rem;
}
<!-- temp -->
/*list-group style for searchlist*/
......@@ -225,3 +248,4 @@ input:checked + .slider:before {
outline: 0;
box-shadow: none;
}
Markdown is supported
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