conflict

public/css/layout.css

@@ -33,8 +33,7 @@ a:hover {
 nav.navbar {
   position: relative;
   width: 100%;
-  background-color: #fff;
-  z-index: 100;
+  /* background-color: #fff; */
   padding: 0;
 }
 .logo, .small {
@@ -258,19 +257,8 @@ p {
 }
 .list {
   list-style:none;
-  padding: 0;
-  margin-left: 0 !important;
-}
-.list li::before{
-  font-family: "Font Awesome 5 Free";
-  font-weight: 900;
-  content: "\f105";
-  font-size: 18px;
-  margin-left: 10px;
-  padding-right: 10px !important;
-  color:var(--pry-color);
-  border-radius: 100%;
 }
+
 .plus a::before{
   font-family: "Font Awesome 5 Free";
   font-weight: 900;
@@ -396,7 +384,7 @@ p {
   opacity: 1;
 }
 footer small {
-  font-size: 12px;
+  font-size: 11px;
 }
 .content-flex {
   display: flex;

resources/views/layouts/login.blade.php

@@ -65,6 +65,7 @@
 </div>
 <div id="moe-form-mask" style="background: rgba(0, 0, 0, .1) no-repeat scroll center center; position: fixed; top: 0px; left: 0px; z-index: 97; width: 100%; height: 100%; display: none;">
 </div>
+<<<<<<< HEAD
 <nav class="navbar navbar-expand-lg py-1">
     <div class="container main-nav position-relative">
         <a href="https://leadershiphealth.org"><img class="logo" src="{{asset('img/logo.svg')}}"></a>
@@ -96,37 +97,138 @@
             <ul class="navbar-nav ml-auto">
                 <li class="nav-item web">
                     <a class="d-flex align-items-center nav-link" href="tel:{{config('app.phone')}}"><img class="mr-1" height="20" src="{{asset('img/phone.svg')}}">{{config('app.phone')}}</a>
+=======
+
+<nav class="navbar navbar-expand-lg top-links">
+    <div class="container justify-content-end">
+        <div>
+            <ul class="navbar-nav align-items-center">
+                <li class="nav-item ps-2">
+                    <a class="d-flex align-items-center" href="{{ config('app.backToLeadershipHealthUrl') }}"><i class="mr-2 fas fa-home"></i> Back to LeadershipHealth.org</a>
+>>>>>>> 85dea5764fc069ceb6740c4bd6d8496c9ced810a
                 </li>
                 <li class="nav-item">
-                    <a class="d-flex align-items-center nav-link" href="{{ config('app.backToLeadershipHealthUrl') }}">
-                        <img class="mr-1" height="20" src="{{asset('img/chart.svg')}}">Back to LeadershipHealth.org
-                    </a>
+                    <a class="d-flex align-items-center" href="tel:{{config('app.phone')}}"><i class="mr-2 fas fa-mobile-alt"></i> {{config('app.phone')}}</a>
                 </li>
             </ul>
         </div>
     </div>
 </nav>
-<nav class="navbar navbar-expand-lg navBarWeb">
-    <div class="container">
-        <div>
-            <ul class="navbar-nav ml-0 mr-auto" id="navBarWeb">
-              <li class="nav-item">
-                  <a class="nav-link" href="https://leadershiphealth.org/programs">For Patients</a>
+<nav class="navbar navbar-expand-lg shadow-sm" id="mainNav">
+  <div class="container position-relative p-0">
+      <a href="{{route('login')}}"><img class="logo" src="{{asset('img/logo.svg')}}"></a>
+      <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navBar" aria-controls="navBar" aria-expanded="false" aria-label="Toggle navigation">
+          <img src="https://leadershiphealth.org/img/menu.svg" alt="">
+      </button>
+        <div class="collapse navbar-collapse" id="navBar">
+            <ul class="navbar-nav ml-auto">
+              <li class="nav-item d-lg-none d-inline">
+                <a class="nav-link" href="https://leadershiphealth.org/services">Our Services</a>
               </li>
-              <li class="nav-item">
-                  <a class="nav-link" href="https://leadershiphealth.org/health-plans">Health Plans</a>
+              <li class="nav-item dropdown d-lg-inline d-none">
+                <a class="nav-link dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown" aria-expanded="false">
+                  Our Services
+                </a>
+                <div class="dropdown-menu wide">
+                  <div class="d-flex align-items-start">
+                    <ul class="nav nav-tabs" id="myTab" role="tablist">
+                      <li class="nav-item" role="presentation">
+                        <button class="nav-link" id="one-tab" data-bs-toggle="tab" data-bs-target="#one" type="button" role="tab" aria-controls="one" aria-selected="true">Comprehensive Practice Management <i class="ms-1 fas fa-caret-right"></i></button>
+                      </li>
+                      <li class="nav-item" role="presentation">
+                        <button class="nav-link" id="two-tab" data-bs-toggle="tab" data-bs-target="#two" type="button" role="tab" aria-controls="two" aria-selected="false" tabindex="-1">Tech-Enabled Healthcare <i class="ms-1 fas fa-caret-right"></i></button>
+                      </li>
+                      <li class="nav-item" role="presentation">
+                        <button class="nav-link" id="three-tab" data-bs-toggle="tab" data-bs-target="#three" type="button" role="tab" aria-controls="three" aria-selected="false" tabindex="-1">Provider Services <i class="ms-1 fas fa-caret-right"></i></button>
+                      </li>
+                      <li class="nav-item" role="presentation">
+                        <button class="nav-link active" id="four-tab" data-bs-toggle="tab" data-bs-target="#four" type="button" role="tab" aria-controls="four" aria-selected="false" tabindex="-1">HR &amp; Staff Development <i class="ms-1 fas fa-caret-right"></i></button>
+                      </li>
+                      <li class="nav-item" role="presentation">
+                        <button class="nav-link" id="five-tab" data-bs-toggle="tab" data-bs-target="#five" type="button" role="tab" aria-controls="five" aria-selected="false" tabindex="-1">Strategic Business Services <i class="ms-1 fas fa-caret-right"></i></button>
+                      </li>
+                    </ul>
+                    <div class="tab-content" id="specialtiesTab">
+                      <div class="tab-pane fade" id="one" role="tabpanel" aria-labelledby="one-tab" tabindex="0">
+                        <div class="container">
+                          <div class="row">
+                            <div class="col-lg-12">
+                              <ul class="mb-4 ps-0">
+                                <li><a href="https://leadershiphealth.org/services/medical-coding-chart-audits">Medical Coding &amp; Chart Audits</a></li>
+                                <li><a href="https://leadershiphealth.org/services/practice-formation-startup-support">Practice Formation &amp; Startup Support</a></li>
+                                <li><a href="https://leadershiphealth.org/services/revenue-cycle-management">Revenue Cycle Management</a></li>
+                                <li><a href="https://leadershiphealth.org/services/supply-chain-optimization">Supply Chain Optimization</a></li>
+                                <li><a href="https://leadershiphealth.org/services/comprehensive-care-coordination">Comprehensive Care Coordination</a></li>
+                              </ul>
+                            </div>
+                          </div>
+                        </div>
+                      </div>
+                      <div class="tab-pane fade" id="two" role="tabpanel" aria-labelledby="two-tab" tabindex="0">
+                        <div class="container">
+                          <div class="row">
+                            <div class="col-lg-12">
+                              <ul class="mb-4 ps-0">
+                                <li><a href="https://leadershiphealth.org/services/ehr-installation-maintenance">EHR Installation &amp; Maintenance</a></li>
+                                <li><a href="https://leadershiphealth.org/services/voip-setup-support">VoIP Setup &amp; Support</a></li>
+                                <li><a href="https://leadershiphealth.org/services/remote-patient-monitoring">Remote Patient Monitoring</a></li>
+                              </ul>
+                            </div>
+                          </div>
+                        </div>
+                      </div>
+                      <div class="tab-pane fade" id="three" role="tabpanel" aria-labelledby="three-tab" tabindex="0">
+                        <div class="container">
+                          <div class="row">
+                            <div class="col-lg-12">
+                              <ul class="mb-4 ps-0">
+                                <li><a href="https://leadershiphealth.org/services/credentialing-enrollment-services">Credentialing &amp; Enrollment Services</a></li>
+                                <li><a href="https://leadershiphealth.org/services/professional-state-licensing">Professional State Licensing</a></li>
+                              </ul>
+                            </div>
+                          </div>
+                        </div>
+                      </div>
+                      <div class="tab-pane fade show active" id="four" role="tabpanel" aria-labelledby="four-tab" tabindex="0">
+                        <div class="container">
+                          <div class="row">
+                            <div class="col-lg-12">
+                              <ul class="mb-4 ps-0">
+                                <li><a href="https://leadershiphealth.org/services/human-resources-management">Human Resources Management</a></li>
+                                <li><a href="https://leadershiphealth.org/services/professional-development-clinical-training">Professional Development &amp; Clinical Training</a></li>
+                              </ul>
+                            </div>
+                          </div>
+                        </div>
+                      </div>
+                      <div class="tab-pane fade" id="five" role="tabpanel" aria-labelledby="five-tab" tabindex="0">
+                        <div class="container">
+                          <div class="row">
+                            <div class="col-lg-12">
+                              <ul class="mb-4 ps-0">
+                                <li><a href="https://leadershiphealth.org/services/contract-negotiation-management">Contract Negotiation &amp; Management</a></li>
+                                <li><a href="https://leadershiphealth.org/services/accounting-financial-management">Accounting &amp; Financial Management</a></li>
+                              </ul>
+                            </div>
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                </div>
               </li>
               <li class="nav-item">
-                  <a class="nav-link" href="https://leadershiphealth.org/employers">Employers</a>
+                <a class="nav-link" href="https://leadershiphealth.org/about">About Us</a>
               </li>
               <li class="nav-item">
-                  <a class="nav-link" href="https://leadershiphealth.org/providers">For Providers</a>
+                <a class="nav-link" href="https://leadershiphealth.org/health-plans">Health Plans</a>
               </li>
               <li class="nav-item">
-                  <a class="nav-link" href="https://leadershiphealth.org/about">About Us</a>
+                <a class="nav-link" href="https://leadershiphealth.org/careers">Careers</a>
               </li>
               <li class="nav-item">
-                  <a class="nav-link" href="https://leadershiphealth.org/careers">Careers</a>
+                <a class="nav-link d-lg-none d-block" href="https://leadershiphealth.org/contact">Contact Us</a>
+                <a class="btn btn-pry d-lg-block d-none px-4" href="https://leadershiphealth.org/contact">Contact Us <i class="ms-1 fas fa-caret-right"></i></a>
               </li>
             </ul>
         </div>
@@ -137,51 +239,73 @@
     @yield('content')
   </div>
 </div>
-<footer class="pt-4 pt-md-5 text-white">
-    <div class="container">
-        <div class="flex-footer">
-            <div class="">
-                <img src="{{asset('img/logo-white.svg')}}">
-            </div>
-            <div class="text-center">
-                <a href="tel:{{config('app.phone')}}" class="text-white">
-                    <h5 class="mt-2">{{config('app.phone')}}</h5>
-                </a>
-                <a style="display: none;" href="https://leadershiphealth.org/covid" class="text-white">
-                    COVID Resources
-                </a>
-            </div>
-            <div>
-                <h5 class="mt-2">Important Links</h5>
-                <ul class="m-0">
-                    <li><a href="https://leadershiphealth.org/programs">For Patients</a></li>
-                    <li><a href="https://leadershiphealth.org/health-plans">Health Plans</a></li>
-                    <li><a href="https://leadershiphealth.org/employers">Employers</a></li>
-                    <li><a href="https://leadershiphealth.org/providers">For Providers</a></li>
-                    <li><a href="https://leadershiphealth.org/about">About Us</a></li>
-                    <li><a href="https://leadershiphealth.org/careers">Careers</a></li>
-                </ul>
-            </div>
-            <div>
-                <h5 class="mt-2">Contact Us</h5>
-                <ul class="m-0">
-                    <li><a href="https://leadershiphealth.org/contact">Get in touch</a></li>
-                    <li><a href="https://leadershiphealth.org/privacy-policy">Privacy Policy</a></li>
-                    <li><a href="https://leadershiphealth.org/terms-of-use">Terms of Service</a></li>
-                </ul>
-            </div>
+<footer class="pt-4 pt-md-5">
+    <div class="container pt-md-4">
+      <div class="row">
+        <div class="col-md-6 col-lg-3 mb-lg-5 mb-4">
+          <img class="logo" src="https://leadershiphealth.org/img/logo.svg" alt="Leadership Health">
+          <div class="mt-4">
+            <p>Your trusted partner for seamless administrative solutions. Enhancing care, enabling success.</p>
+          </div>
+          <div class="mt-4">
+            <a href="https://leadershiphealth.org/contact" class="btn btn-pry btn-sm px-5">Contact Us</a>
+          </div>
+        </div>
+        <div class="col-md-6 col-lg-2 ps-lg-5 mb-lg-5 mb-4">
+          <div>
+            <h6 class="mb-4"><b>Info</b></h6>
+            <ul>
+              <li><a href="/services">Our Services</a></li>
+              <li><a href="/about">About Us</a></li>
+              <li><a href="/health-plans">Health Plans</a></li>
+              <li><a href="/careers">Careers</a></li>
+              <li><a href="">Privacy Policy</a></li>
+              <li><a href="">Terms Of Service</a></li>
+            </ul>
+          </div>
+        </div>
+        <div class="col-md-6 col-lg-3 ps-lg-4">
+          <h6 class="mb-4"><b>Services</b></h6>
+          <ul>
+            <li><a href="https://leadershiphealth.org/services/medical-coding-chart-audits">Medical Coding &amp; Chart Audits</a></li>
+            <li><a href="https://leadershiphealth.org/services/practice-formation-startup-support">Practice Formation &amp; Startup Support</a></li>
+            <li><a href="https://leadershiphealth.org/services/revenue-cycle-management">Revenue Cycle Management</a></li>
+            <li><a href="https://leadershiphealth.org/services/supply-chain-optimization">Supply Chain Optimization</a></li>
+            <li><a href="https://leadershiphealth.org/services/comprehensive-care-coordination">Comprehensive Care Coordination</a></li>
+            <li><a href="https://leadershiphealth.org/services/ehr-installation-maintenance">EHR Installation &amp; Maintenance</a></li>
+            <li><a href="https://leadershiphealth.org/services/voip-setup-support">VoIP Setup &amp; Support</a></li>
+            <li><a href="https://leadershiphealth.org/services/remote-patient-monitoring">Remote Patient Monitoring</a></li>
+            <li><a href="https://leadershiphealth.org/services/credentialing-enrollment-services">Credentialing &amp; Enrollment Services</a></li>
+            <li><a href="https://leadershiphealth.org/services/professional-state-licensing">Professional State Licensing</a></li>
+            <li><a href="https://leadershiphealth.org/services/human-resources-management">Human Resources Management</a></li>
+            <li><a href="https://leadershiphealth.org/services/professional-development-clinical-training">Professional Development &amp; Clinical Training</a></li>
+            <li><a href="https://leadershiphealth.org/services/contract-negotiation-management">Contract Negotiation &amp; Management</a></li>
+            <li><a href="https://leadershiphealth.org/services/accounting-financial-management">Accounting &amp; Financial Management</a></li>
+          </ul>
+        </div>
+        <div class="col-md-6 col-lg-4 ps-lg-5">
+          <div class="mb-lg-5 mb-4">
+            <h6 class="mb-4"><b>Stay Connected</b></h6>
+            <p>Sign up for our free health newsletter</p>
+            <form class="" action="" method="post">
+              <input type="email" class="form-control py-3" placeholder="Enter your email" required="" name="email" value="">
+              <button type="submit" class="btn btn-pry px-4 mt-4">Stay in Touch</button>
+            <div data-lastpass-icon-root="true" style="position: relative !important; height: 0px !important; width: 0px !important; float: left !important;"></div></form>
+          </div>
         </div>
+      </div>
+      <p class="text-sm m-0">At Leadership Health, we bridge the gap between healthcare and management. We understand the challenges that come with managing a medical practice, and our mission is to alleviate those burdens, allowing healthcare professionals to focus on patient care.</p>
     </div>
-    <div class="bg-light-grey mt-0 mt-md-5 py-2">
+    <div class="bg-sec mt-0 mt-md-4 py-2">
         <div class="container">
-            <p class="text-dark-pry text-center m-0"><small>Copyright © {{getdate()["year"]}} Leadership Health LLC. All Rights Reserved.</small></p>
+            <p class="text-white m-0"><small>Copyright © 2023 Leadership Health LLC. All Rights Reserved.</small></p>
         </div>
     </div>
 </footer>
 </body>
 <script>
     $(document).ready(function() {
-        $('.phone').mask('000-000-0000');
+        $('.phone').mask('(000) 000-0000');
         // $('.pass').strengthify({
         //     zxcvbn: '/js/zxcvbn.js'
         // })

resources/views/layouts/login_with_content.blade.php

@@ -44,16 +44,27 @@
 </head>
 
 <body>
-  <nav class="navbar navbar-expand-lg py-1">
-        <div class="container-fluid position-relative">
-            <a href="{{ route('login') }}"><img class="logo" src="{{asset('img/logo.svg')}}"></a>
-            <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navBar" aria-controls="navBar" aria-expanded="false" aria-label="Toggle navigation">
-                <i class="fas fa-bars"></i>
-            </button>
-            <div class="collapse navbar-collapse mobile" id="navBar">
+  <nav class="navbar navbar-expand-lg top-links">
+      <div class="container justify-content-end">
+          <div>
+              <ul class="navbar-nav align-items-center">
+                  <li class="nav-item">
+                      <a class="d-flex align-items-center" href="tel:{{config('app.phone')}}"><i class="mr-2 fas fa-mobile-alt"></i> {{config('app.phone')}}</a>
+                  </li>
+              </ul>
+          </div>
+      </div>
+  </nav>
+    <nav class="navbar navbar-expand-lg shadow-sm" id="mainNav">
+      <div class="container position-relative p-0">
+          <a href="{{route('login')}}"><img class="logo" src="{{asset('img/logo.svg')}}"></a>
+          <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navBar" aria-controls="navBar" aria-expanded="false" aria-label="Toggle navigation">
+              <img src="https://leadershiphealth.org/img/menu.svg" alt="">
+          </button>
+            <div class="collapse navbar-collapse" id="navBar">
                 <ul class="navbar-nav ml-auto">
                   <li class="nav-item">
-                    <a class="d-flex align-items-center text-dark" href="{{ config('app.backToLeadershipHealthUrl') }}">
+                    <a class="nav-link" href="{{ config('app.backToLeadershipHealthUrl') }}">
                       <img class="mr-1" height="20" src="{{asset('img/chart.svg')}}">Back to LeadershipHealth.org
                     </a>
                   </li>
@@ -83,17 +94,19 @@
     </div>
     @include('landing')
   </div>
-  <footer class="bg-light-grey d-flex align-items-center flex-column border-top">
-    <div class="py-3">
-      <p class="mb-0 text-center"><small>Copyright &copy; {{getdate()["year"]}} LeadershipHealth LLC. All rights reserved.</small> </p>
-    </div>
+  <footer class="pt-4">
+      <div class="bg-sec py-2">
+          <div class="container">
+              <p class="text-white m-0"><small>Copyright © 2023 Leadership Health LLC. All Rights Reserved.</small></p>
+          </div>
+      </div>
   </footer>
 </body>
 <script src="/vendor/bootstrap/popper.min.js"></script>
 <script src="/vendor/bootstrap/bootstrap.min.js"></script>
 <script>
   $(document).ready(function() {
-      $('.phone').mask('000-000-0000');
+      $('.phone').mask('(000) 000-0000');
       $('.pass').strengthify({
           zxcvbn:'/js/zxcvbn.js'
         })