Skip to content

Commit

Permalink
CSS Fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
Jakub41 committed Jan 6, 2017
1 parent d65e146 commit 0124a53
Show file tree
Hide file tree
Showing 3 changed files with 70 additions and 40 deletions.
65 changes: 38 additions & 27 deletions Angular2-FrontEnd/src/app/home/home.component.css
Original file line number Diff line number Diff line change
@@ -1,56 +1,67 @@
header {
z-index: 1;
width: 100%;
height: 50px;
background-color: #123081;
z-index: 1;
width: 100%;
height: 50px;
background-color: #123081;
}

header h1 {
text-align: center!important;
color: #ffd500;
font-size: 18px;
text-align: center!important;
color: #ffd500;
font-size: 18px;
}

.container {
padding-top: 10px;
padding-top: 10px;
}

.row.top-margin-space {
margin-top:20px;
margin-top: 20px;
}

.btn-group {
text-align: center!important;
display: block!important;
text-align: center!important;
display: block!important;
}

#arrivals,#departures{
background-color: rgba(255, 213, 0, 1.0000);
#arrivals, #departures {
background-color: rgba(255, 213, 0, 1.0000);
}

#arrivals {
width: 100px;
height: 100px;
background-image: url("/assets/arrivals.png")!important;
background-size: 50px;
background-position: center;
background-repeat: no-repeat;
width: 100px;
height: 100px;
background-image: url("/assets/arrivals.png")!important;
background-size: 50px;
background-position: center;
background-repeat: no-repeat;
}

#departures {
width: 100px;
height: 100px;
background-image: url("/assets/departures.png")!important;
background-size: 50px;
background-position: center;
background-repeat: no-repeat;
width: 100px;
height: 100px;
background-image: url("/assets/departures.png")!important;
background-size: 50px;
background-position: center;
background-repeat: no-repeat;
}

.updateTimeClass {
float: right;
margin-top: 20px;
float: right;
margin-top: 20px;
}

.table>thead>tr>th {
padding-left: 5px!important;
}

@media screen and (max-width: 768px) {
.updateTimeClass {
float: left;
margin-top: 20px;
margin-left: 27px;
}
.table-3 {
overflow-x: scroll;
}
}
2 changes: 1 addition & 1 deletion Angular2-FrontEnd/src/app/home/home.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export class HomeComponent implements OnInit {
private updatedTime;
private arrivalColor;
private departureColor;

constructor(
private http: HttpService,
private Loading: LoadingService
Expand Down
Original file line number Diff line number Diff line change
@@ -1,55 +1,74 @@
#adv-search{
z-index: 0;
width: 100%;
text-align: left;
#adv-search {
z-index: 0;
width: 100%;
text-align: left;
}

.dropdown.dropdown-lg .dropdown-menu {
margin-top: -1px;
padding: 6px 20px;
}

.input-group-btn .btn-group {
display: flex !important;
}

.btn-group .btn {
border-radius: 0;
margin-left: -1px;
}

.btn-group .btn:last-child {
border-top-right-radius: 4px;
border-bottom-right-radius: 4px;
}

.btn-group .form-horizontal .btn[type="submit"] {
border-top-left-radius: 4px;
border-bottom-left-radius: 4px;
border-top-left-radius: 4px;
border-bottom-left-radius: 4px;
}

.form-horizontal .form-group {
margin-left: 0;
margin-right: 0;
}

.form-group .form-control:last-child {
border-top-left-radius: 4px;
border-bottom-left-radius: 4px;
}

.marginForSearch {
margin: 10px 10px 0 0;
float:left;
float: left;
width: 30%;
min-width:200px;
min-width: 200px;
}

.marginForSearchButton {
margin: 10px 10px 0 0;
float:left;
float: left;
}

@media screen and (max-width: 768px) {
#adv-search{
margin: 0 auto;
}
#adv-search {
margin: 0 auto;
}
.dropdown.dropdown-lg {
position: static !important;
}
.dropdown.dropdown-lg .dropdown-menu {
min-width: 500px;
}
.marginForSearch {
margin: 10px 10px 0 11px;
float: left;
width: 80%;
min-width: 200px;
}
.input-group-btn:last-child>.btn,
.input-group-btn:last-child>.btn-group {
z-index: 2;
margin-left: 0;
}
}

0 comments on commit 0124a53

Please sign in to comment.