Merge branch 'master' of https://github.com/ramwohlig/trip-task

Author: sarasnmsp21

src/assets/imagesR/fb.png

@@ -12,4 +12,5 @@ $priceColor:#f13745;
 $mmtAssuredbg:#1d5089;
 $mmtAssuredTick:#eb3237;
 $footerbgcolor:#134697;
+$cardfont: 10px;
 

src/assets/imagesR/rss.png

@@ -98,7 +98,30 @@
             <li><a href="#">Hotels in Macau</a></li>
           </ul></b-col
         >
-        <b-col md="2" class="px-1 footer-text">Follow Us</b-col>
+        <b-col md="2" class="px-1 footer-text">
+          <div>
+            <img
+              class="social-icons mr-1"
+              src="../../assets/imagesR/fb.png"
+              alt=""
+            />
+            <img
+              class="social-icons mr-1"
+              src="../../assets/imagesR/tt.png"
+              alt=""
+            />
+            <img
+              class="social-icons mr-1"
+              src="../../assets/imagesR/yt.png"
+              alt=""
+            />
+            <img
+              class="social-icons mr-1"
+              src="../../assets/imagesR/rss.png"
+              alt=""
+            />
+          </div>
+        </b-col>
       </b-row>
     </b-container>
   </div>
@@ -144,4 +167,10 @@ export default {
     }
   }
 }
+
+.social-icons {
+  background-color: white;
+  border-radius: 50%;
+  height: 30px;
+}
 </style>

src/assets/imagesR/tt.png

@@ -55,6 +55,5 @@ export default {
   color: $dimfont;
   height: 162px;
   padding: 0px;
-  overflow-y: hidden !important;
 }
 </style>

src/assets/imagesR/yt.png

@@ -3,14 +3,6 @@
     <div class="ListSelectortitleText mt-3 mb-2">{{ filtertoptitle }}</div>
     <div class="border checkboxfilter px-2">
       <slot name="checkboxLoopData"></slot>
-      <!-- <div class="border-bottom">
-        <div class="checkbox-heading">
-          Apart-Hotel
-          <span class="float-right">
-            <input class="checkbox-edit" type="checkbox" />
-          </span>
-        </div>
-      </div> -->
     </div>
   </div>
 </template>

src/assets/scss/_rvariables.scss

@@ -129,6 +129,9 @@
               />MMT ASSURED
             </span>
           </div>
+          <div class="hotel-cut-price mt-3 text-right">
+            <span class="red-price">{{ card.cutPrice }}</span>
+          </div>
           <div class="hotel-price mt-3 text-right">
             <span class="red-price">Rs. 3,009</span>
           </div>
@@ -221,7 +224,8 @@ export default {
           price: "Rs. 3,009",
           pricetime: "per room/night",
           breakfast: true,
-          freeCancellation: true
+          freeCancellation: true,
+          cutPrice: "Rs. 4,000"
         },
         {
           hotelName: "Ibis One Central Hotel",
@@ -242,7 +246,8 @@ export default {
           price: "Rs. 3,009",
           pricetime: "per room/night",
           breakfast: true,
-          freeCancellation: true
+          freeCancellation: true,
+          cutPrice: "Rs. 4,000"
         },
         {
           hotelName: "Ibis One Central Hotel",
@@ -305,7 +310,8 @@ export default {
           price: "Rs. 3,009",
           pricetime: "per room/night",
           breakfast: true,
-          freeCancellation: true
+          freeCancellation: true,
+          cutPrice: "Rs. 4,000"
         },
         {
           hotelName: "Ibis One Central Hotel",
@@ -563,6 +569,12 @@ export default {
     }
   }
 
+  .hotel-cut-price {
+    text-decoration: line-through;
+    font-size: 13px;
+    color: $dimfont;
+  }
+
   .hotel-price {
     .red-price {
       color: red;

src/components/listcomponents/BottomFooter.vue

@@ -20,7 +20,7 @@
         <div class="mt-5 mx-4">
           <b-row class="mx-1 searchbox">
             <b-col md="3" class="search-hotel">
-              <div class="searchbox-title">CITY, HOTEL OR ARE</div>
+              <div class="searchbox-title">CITY, HOTEL OR AREA</div>
               <div><input type="text" class="searchbox-input-hotel" /></div>
             </b-col>
             <b-col md="2" class="checkin-date">
@@ -86,7 +86,7 @@ export default {
   color: #fff;
 
   .links {
-    font-size: 10px;
+    font-size: $cardfont;
     transform: scale(0.95, 1.2);
     a {
       text-decoration: none;
@@ -117,7 +117,7 @@ export default {
       border-right: 1px solid #d2d2d2;
 
       .searchbox-title {
-        font-size: 10px;
+        font-size: $cardfont;
         color: $dimfont;
       }
 
@@ -137,7 +137,7 @@ export default {
 
     .checkin-date {
       .datebox-title {
-        font-size: 10px;
+        font-size: $cardfont;
         color: $dimfont;
       }
 
@@ -157,7 +157,7 @@ export default {
 
     .checkout-date {
       .datebox-title {
-        font-size: 10px;
+        font-size: $cardfont;
         color: $dimfont;
       }
 
@@ -179,7 +179,7 @@ export default {
       border-right: 1px solid #d2d2d2;
 
       .night-title {
-        font-size: 10px;
+        font-size: $cardfont;
         color: $dimfont;
       }
 
@@ -199,7 +199,7 @@ export default {
 
     .rooms-select {
       .rooms-title {
-        font-size: 10px;
+        font-size: $cardfont;
         color: $dimfont;
       }