Skip to content

D
dcarfixers_angular
Commit 88c9bd6e by Jansa Jose
Options

Merge branch 'master' of https://gitlab.techware.co.in/tobin/dcarfixers_angular into jensa

# Conflicts: # src/app/home/dashboard/dashboard.component.html
parents fe36e173 77c9b877
Showing with 30 additions and 12 deletions
src/app/home/dashboard/dashboard.component.html
...@@ -701,7 +701,7 @@ ...@@ -701,7 +701,7 @@
<h5>{{mechanic.shop_name}}</h5> <h5>{{mechanic.shop_name}}</h5>
<p>{{mechanic.shop_address}}</p> <p>{{mechanic.shop_address}}</p>
<h6>{{mechanic.shop_phone}}</h6> <h6>{{mechanic.shop_phone}}</h6>
<p>{{mechanic.distance | number:'1.2-2'}}</p> <p>{{mechanic.distance | number:'1.2-2'}} Away from you</p>
</div> </div>
<ng-template #mechanicDetails> <ng-template #mechanicDetails>
<p>{{mechanic.address}}<br>{{mechanic.city+' , '+mechanic.state}}</p> <p>{{mechanic.address}}<br>{{mechanic.city+' , '+mechanic.state}}</p>
...@@ -795,9 +795,12 @@ ...@@ -795,9 +795,12 @@
(mouseOut)="onMouseOut(gm)" [agmFitBounds]="true"> (mouseOut)="onMouseOut(gm)" [agmFitBounds]="true">
<agm-info-window [disableAutoPan]="false" #infoWindow> <agm-info-window [disableAutoPan]="false" #infoWindow>
<div style="width:130px;"> <div style="width:130px;">
<img src="{{imageServer + mechanicLoc.profile_image}}" width="30px" height="30px" style="float: left;margin-right: 5px" onerror="this.src='assets/images/user_avatar.jpg'"> <img src="{{imageServer + mechanicLoc.profile_image}}" width="30px" height="30px" style="float: left;" onerror="this.src='assets/images/user_avatar.jpg'">
<div style="float: left">{{mechanicLoc.display_name}}</div> <div style="float:right;width:calc(100% - 30px); white-space: nowrap;
<div>{{mechanicLoc.estimate}}</div> overflow: hidden;
text-overflow: ellipsis;padding-left: 5px;">{{mechanicLoc.display_name}}<br>
{{mechanicLoc.estimate}}
</div>
</div> </div>
</agm-info-window> </agm-info-window>
......
src/app/home/dashboard/dashboard.component.scss
...@@ -574,6 +574,9 @@ ...@@ -574,6 +574,9 @@
background-repeat: no-repeat; background-repeat: no-repeat;
position: relative; position: relative;
overflow: scroll; overflow: scroll;
&::-webkit-scrollbar {
display: none;
}
.modal_close { .modal_close {
width: 50px; width: 50px;
height: 50px; height: 50px;
...@@ -728,7 +731,7 @@ ...@@ -728,7 +731,7 @@
list-style: none; list-style: none;
display: inline-block; display: inline-block;
position: relative; position: relative;
min-width:300px; min-width:100%;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
...@@ -847,7 +850,7 @@ ...@@ -847,7 +850,7 @@
.log_btn { .log_btn {
height: 40px; height: 40px;
width: 160px; width: 160px;
border-radius: 25px; border-radius:10px;
color: #fff; color: #fff;
background-color: #2655bf; background-color: #2655bf;
border: none; border: none;
...@@ -1181,6 +1184,9 @@ ...@@ -1181,6 +1184,9 @@
padding: 0px; padding: 0px;
max-height: 500px; max-height: 500px;
overflow: scroll; overflow: scroll;
&::-webkit-scrollbar {
display: none;
}
li { li {
list-style: none; list-style: none;
padding: 10px; padding: 10px;
...@@ -1370,6 +1376,9 @@ ...@@ -1370,6 +1376,9 @@
overflow: scroll; overflow: scroll;
display: inline-block; display: inline-block;
position: relative; position: relative;
&::-webkit-scrollbar {
display: none;
}
#custom_check_button { #custom_check_button {
border-radius: 0px !important; border-radius: 0px !important;
overflow: auto; overflow: auto;
......
src/app/home/index/index.component.html
...@@ -518,8 +518,8 @@ ...@@ -518,8 +518,8 @@
<img src="{{imageServer + mechanic.profile_image}}" onerror="this.src='assets/images/user_avatar.jpg'"> <img src="{{imageServer + mechanic.profile_image}}" onerror="this.src='assets/images/user_avatar.jpg'">
</div> </div>
<div class="mechanic_ratting"> <div class="mechanic_ratting">
<p>4 Ratings</p> <p>4/5 Ratings</p>
<h6>6 Reviews</h6>
</div> </div>
</div> </div>
<div class="mechanic_detail"> <div class="mechanic_detail">
...@@ -616,10 +616,14 @@ ...@@ -616,10 +616,14 @@
<agm-map #gm [latitude]="lat" [longitude]="lng" [fitBounds]="true"> <agm-map #gm [latitude]="lat" [longitude]="lng" [fitBounds]="true">
<agm-marker *ngFor="let mechanicLoc of mechanicData" [agmFitBounds]="true" [latitude]="mechanicLoc.location_lat" [longitude]="mechanicLoc.location_lat" (mouseOver)="onMouseOver(infoWindow,gm)" (mouseOut)="onMouseOut(gm)"> <agm-marker *ngFor="let mechanicLoc of mechanicData" [agmFitBounds]="true" [latitude]="mechanicLoc.location_lat" [longitude]="mechanicLoc.location_lat" (mouseOver)="onMouseOver(infoWindow,gm)" (mouseOut)="onMouseOut(gm)">
<agm-info-window [disableAutoPan]="false" #infoWindow> <agm-info-window [disableAutoPan]="false" #infoWindow>
<div style="width:130px;"> <div style="width:130px;">
<img src="{{imageServer + mechanicLoc.profile_image}}" width="30px" height="30px" style="float: left;margin-right: 5px" onerror="this.src='assets/images/user_avatar.jpg'"> <img src="{{imageServer + mechanicLoc.profile_image}}" width="30px" height="30px" style="float: left;" onerror="this.src='assets/images/user_avatar.jpg'">
<div style="float: left">{{mechanicLoc.display_name}}</div><br> <div style="float:right;width:calc(100% - 30px); white-space: nowrap;
<div style="float: left">{{mechanicLoc.estimate}}</div> overflow: hidden;
text-overflow: ellipsis;padding-left: 5px;">{{mechanicLoc.display_name}}<br>
{{mechanicLoc.estimate}}
</div>
</div> </div>
</agm-info-window> </agm-info-window>
</agm-marker> </agm-marker>
......
src/app/home/index/index.component.scss
...@@ -521,7 +521,7 @@ ...@@ -521,7 +521,7 @@
list-style: none; list-style: none;
display: inline-block; display: inline-block;
position: relative; position: relative;
min-width:300px; min-width:100%;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
......
src/styles.scss
...@@ -80,6 +80,8 @@ body { ...@@ -80,6 +80,8 @@ body {
font-family: 'Lato', sans-serif !important; font-family: 'Lato', sans-serif !important;
} }
.modal-full { .modal-full {
min-width: 100%; min-width: 100%;
margin: 0 !important; margin: 0 !important;
......
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