From ee0ca8ea1d93d9bf4a3f3d70f92ff0cefe014136 Mon Sep 17 00:00:00 2001 From: Mahesh Sharma Date: Wed, 14 Dec 2022 16:56:24 +0545 Subject: [PATCH] aplus#22-conflict --- public/frontend/css/style.css | 37 ++++++++++++++++++-------- resources/views/insurance.blade.php | 2 +- resources/views/news.blade.php | 10 +++++-- resources/views/recruitment.blade.php | 6 +++++ resources/views/service_view.blade.php | 6 +++++ 5 files changed, 47 insertions(+), 14 deletions(-) diff --git a/public/frontend/css/style.css b/public/frontend/css/style.css index 9dd7155..e83ce22 100644 --- a/public/frontend/css/style.css +++ b/public/frontend/css/style.css @@ -119,7 +119,6 @@ h4{ display: none; } .dropdown-menu a{ - font-weight: 600; font-size: 14px; } .service-dropdown{ @@ -134,7 +133,7 @@ h4{ padding-left: 0; } .service-drop-card h5{ - color: #F54C5F; + color: #000000; font-size: 18px; margin-bottom: 0; padding: 0 1rem; @@ -144,8 +143,8 @@ h4{ list-style: none; } .dropdown-item:focus, .dropdown-item:hover { - color: #fff !important; - background-color: #F54C5F !important; + color: #F54C5F !important; + background: none !important; transition: all 300ms ease-in-out; } @@ -256,6 +255,8 @@ Responsive Codes } .banner-section video { display:block; + margin: 0 auto; + width: 100%; } .banner-section .banner-shadow { position: absolute; @@ -456,9 +457,14 @@ Responsive Codes width: 100px; height: 100px; margin: 0 auto; + display: flex; + align-items: center; border-radius: 50%; background: #1B3D69; } +.services-icon img{ + margin: 0 auto; +} .services-card-content{ align-items: center; margin: 20px auto; @@ -909,14 +915,20 @@ Responsive Codes .contact-us-section .breadcrumb, .need-chef-banner .breadcrumb, .insurance-banner .breadcrumb, -.labor-agreement-banner .breadcrumb{ +.labor-agreement-banner .breadcrumb, +.service-detail-banner .breadcrumb, +.recruitment-banner .breadcrumb, +.news-banner-section .breadcrumb{ float: right; } .about-banner-section .breadcrumb a, .contact-us-section .breadcrumb a, .need-chef-banner .breadcrumb a, .insurance-banner .breadcrumb a, -.labor-agreement-banner .breadcrumb a{ +.labor-agreement-banner .breadcrumb a, +.service-detail-banner .breadcrumb a, +.recruitment-banner .breadcrumb a, +.news-banner-section .breadcrumb a{ text-decoration: none; color: #FFFFFF; } @@ -1294,7 +1306,8 @@ Responsive Codes } .service-detail-second .row, .service-detail-third .row, -.news-update-section .row{ +.news-update-section .featured-block, +.who-we-section .row{ display: flex; align-items: center; } @@ -1644,7 +1657,10 @@ Responsive Codes .about-banner-section .breadcrumb, .contact-us-section .breadcrumb, .need-chef-banner .breadcrumb, - .insurance-banner .breadcrumb { + .insurance-banner .breadcrumb, + .service-detail-banner .breadcrumb, + .recruitment-banner .breadcrumb, + .news-banner-section .breadcrumb{ display: none; } .banner-section .banner-description { @@ -1654,9 +1670,8 @@ Responsive Codes } .banner-description h2{ font-weight: 800; - font-size: 22px; - text-align: center; - line-height: 36px; + font-size: 18px; + line-height: 28px; color: #FFFFFF; } .header .logo { diff --git a/resources/views/insurance.blade.php b/resources/views/insurance.blade.php index f5fd47b..5324d0e 100644 --- a/resources/views/insurance.blade.php +++ b/resources/views/insurance.blade.php @@ -7,7 +7,7 @@
diff --git a/resources/views/news.blade.php b/resources/views/news.blade.php index f2dc206..4e3e4c0 100644 --- a/resources/views/news.blade.php +++ b/resources/views/news.blade.php @@ -4,6 +4,12 @@ @endsection @section('content')
+

News & Updates

@@ -16,10 +22,10 @@ @php $news_and_update = $news_and_updates->where('blog_type',1)->first(); @endphp -
+