aplus#6-rebase-conflict-solved

aplus/#9
Mahesh Sharma 2 years ago
parent 034e87d9d2
commit 979196dc2d
  1. 22
      public/frontend/css/style.css
  2. 20
      resources/views/contact.blade.php
  3. 42
      resources/views/welcome.blade.php

@ -473,6 +473,9 @@ Responsive Codes
.featured-news{
position: relative;
}
.featured-news a{
text-decoration: none;
}
.featured-content{
background: linear-gradient(180deg, rgba(0, 0, 0, 0) 0%, #020C1B 86.98%);
width: 100%;
@ -480,11 +483,19 @@ Responsive Codes
padding: 20px;
bottom: 0;
}
.featured-content p{
color: #FFFFFF;
.first-blog h5, .first-blog p{
-webkit-transition: color 1s;
transition: color 2s;
}
.featured-content h2{
.featured-news:hover p,
.featured-news:hover h2{
color: #F54C5F;
}
.featured-news p,
.featured-news h2{
color: #FFFFFF;
-webkit-transition: color 1s;
transition: color 2s;
}
.news-title h2{
display: inline-block;
@ -509,6 +520,7 @@ Responsive Codes
background: #FFFFFF;
box-shadow: 0px 4px 18px rgba(121, 121, 121, 0.05);
border-radius: 12px;
text-decoration: none;
}
.news-box-img img{
border-radius: 8px 8px 0 0;
@ -606,6 +618,10 @@ Responsive Codes
flex-direction: column;
gap: 20px;
}
.contact-icons{
width: 45px;
height: 45px;
}
.enquiry-header h2{
font-weight: 500;
font-size: 46px;

@ -30,21 +30,27 @@
one of our migration agents will be in touch.
</p>
<div class="contact-desc">
@if($phone !== null)
@if($phone !== null)
<a href="tel: {{$phone->value}}" class="contact-phone">
<img src="{{url('frontend/icons/contact-call-icon.svg')}}" alt="">
<h5>{{$phone->value}}</h5>
<div class="contact-icons">
<img src="{{url('frontend/icons/contact-call-icon.svg')}}" class="img-fluid" alt="">
</div>
<h5>{{$phone->value}}</h5>
</a>
@endif
@if($email !== null)
<a href="mailto: {{$email}}" class="contact-phone">
<img src="{{url('frontend/icons/contact-mail-icon.svg')}}" alt="">
<h5>{{$email->value}}</h5>
<a href="mailto: {{$email->value}}" class="contact-phone">
<div class="contact-icons">
<img src="{{url('frontend/icons/contact-mail-icon.svg')}}" class="img-fluid" alt="">
</div>
<h5>{{$email->value}}</h5>
</a>
@endif
@if($address !== null)
<a href="https://goo.gl/maps/P4Y2PYGMpGa83L2R8" target="_blank" class="contact-phone">
<img src="{{url('frontend/icons/contact-location-icon.svg')}}" alt="">
<div class="contact-icons">
<img src="{{url('frontend/icons/contact-location-icon.svg')}}" class="img-fluid" alt="">
</div>
<h5>{{$address->value}}</h5>
</a>
@endif

@ -153,23 +153,25 @@
</div>
<div class="row">
<div class="col-md-6">
<div class="featured-news">
<div class="featured-news-image">
<img src="{{url('frontend/images/featured-image.png')}}" class="w-100" alt="">
</div>
<div class="featured-content">
<p>4 Nov, 2022</p>
<h2>Recognition of Prior Learning (RPL)</h2>
<div class="featured-btn">
<a href="">Learn more</a>
<i class="fa-solid fa-arrow-right-long"></i>
</div>
<div class="featured-news">
<a href="/" href="">
<div class="featured-news-image">
<img src="{{url('frontend/images/featured-image.png')}}" class="w-100" alt="">
</div>
<div class="featured-content">
<p>4 Nov, 2022</p>
<h2>Recognition of Prior Learning (RPL)</h2>
<div class="featured-btn">
<p href="/">Learn more</p>
<i class="fa-solid fa-arrow-right-long"></i>
</div>
</div>
</a>
</div>
</div>
</div>
<div class="col-md-6">
<div class="more-news">
<div class="more-news-box">
<a href="/" class="more-news-box">
<div class="news-box-img">
<img src="{{url('frontend/images/baking.png')}}" class="w-100" alt="">
</div>
@ -177,8 +179,8 @@
<h4>Baking and Pastry Arts</h4>
<p>Aadvanced culinary training in baking fresh bread, cakes, pies ...</p>
</div>
</div>
<div class="more-news-box">
</a>
<a href="/" class="more-news-box">
<div class="news-box-img">
<img src="{{url('frontend/images/baking.png')}}" class="w-100" alt="">
</div>
@ -186,8 +188,8 @@
<h4>Baking and Pastry Arts</h4>
<p>Aadvanced culinary training in baking fresh bread, cakes, pies ...</p>
</div>
</div>
<div class="more-news-box">
</a>
<a href="/" class="more-news-box">
<div class="news-box-img">
<img src="{{url('frontend/images/baking.png')}}" class="w-100" alt="">
</div>
@ -195,8 +197,8 @@
<h4>Baking and Pastry Arts</h4>
<p>Aadvanced culinary training in baking fresh bread, cakes, pies ...</p>
</div>
</div>
<div class="more-news-box">
</a>
<a href="/" class="more-news-box">
<div class="news-box-img">
<img src="{{url('frontend/images/baking.png')}}" class="w-100" alt="">
</div>
@ -204,7 +206,7 @@
<h4>Baking and Pastry Arts</h4>
<p>Aadvanced culinary training in baking fresh bread, cakes, pies ...</p>
</div>
</div>
</a>
</div>
</div>
</div>

Loading…
Cancel
Save