made some merge

css/style.css

@@ -411,7 +411,7 @@ h6,
 .h5,
 .h6 {
     margin-bottom: 0.5rem;
-    font-family: 'Merriweather', 'Times New Roman', Times, serif;
+    font-family: 'Helvetica Neue', sans-serif;
     font-weight: 700;
     line-height: 1.2;
     color: #293043;
@@ -17913,7 +17913,7 @@ html * + .offset-top-13 {
 }
 
 .text-secondary-2 {
-    color: #2f5f8e !important;
+    color: #2a537b !important;
 }
 
 .text-gray-600 {
@@ -18920,7 +18920,11 @@ html [class*='section-'].section-bottom-0 {
 }
 
 .bg-secondary {
+<<<<<<< HEAD
     background-color: #2f5f8e;
+=======
+    background-color: #2a537b;
+>>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
 }
 
 .bg-secondary:not([style*='background-'])
@@ -19694,7 +19698,7 @@ h5,
 h6,
 [class*='heading-'] {
     margin-bottom: 0;
-    font-family: 'Merriweather', 'Times New Roman', Times, serif;
+    font-family: 'Helvetica Neue', sans-serif;
     font-weight: 700;
     color: #293043;
 }
@@ -19839,7 +19843,11 @@ h6 a,
 
 h6 a:hover,
 .heading-6 a:hover {
+<<<<<<< HEAD
     color: #2f5f8e;
+=======
+    color: #2a537b;
+>>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
 }
 
 .heading-7 {
@@ -19879,7 +19887,11 @@ h6 a:hover,
 .heading-8 {
     font-size: 18px;
     line-height: 1.6;
+<<<<<<< HEAD
     color: #2f5f8e;
+=======
+    color: #2a537b;
+>>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
 }
 
 .heading-8 a:hover {
@@ -19973,7 +19985,11 @@ p [style*='max-width'] {
 }
 
 .title-3 {
+<<<<<<< HEAD
     color: #2f5f8e;
+=======
+    color: #2a537b;
+>>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
 }
 
 .context-dark .title-4,
@@ -19992,7 +20008,11 @@ p [style*='max-width'] {
 
 .title-5 {
     font-weight: 400;
+<<<<<<< HEAD
     color: #2f5f8e;
+=======
+    color: #2a537b;
+>>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
 }
 
 @media (min-width: 992px) {
@@ -20084,8 +20104,13 @@ a[href*='mailto'] {
 }
 
 .link-border:hover {
+<<<<<<< HEAD
     color: #2f5f8e;
     border-color: #2f5f8e;
+=======
+    color: #2a537b;
+    border-color: #2a537b;
+>>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
 }
 
 .link-border-2 {
@@ -20336,7 +20361,7 @@ a[href*='mailto'] {
     line-height: 1.4;
     font-style: italic;
     font-weight: 700;
-    font-family: 'Merriweather', 'Times New Roman', Times, serif;
+    font-family: 'Helvetica Neue', sans-serif;
     color: #d2d4d7;
     background: rgba(255, 255, 255, 0.95);
     pointer-events: none;
@@ -20377,7 +20402,7 @@ a[href*='mailto'] {
     border-radius: 50%;
     color: #ffffff;
     background: #01c9f5;
-    font-family: 'Merriweather', 'Times New Roman', Times, serif;
+    font-family: 'Helvetica Neue', sans-serif;
 }
 
 .box-modern-title {
@@ -20398,7 +20423,11 @@ a[href*='mailto'] {
 }
 
 .box-modern-item:nth-child(3n + 3) .box-modern-number {
+<<<<<<< HEAD
     background: #2f5f8e;
+=======
+    background: #2a537b;
+>>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
 }
 
 * + .box-modern-wrap {
@@ -20854,7 +20883,11 @@ html .group-custom > * {
     width: 8px;
     height: 8px;
     border-radius: 8px;
+<<<<<<< HEAD
     background-color: #2f5f8e;
+=======
+    background-color: #2a537b;
+>>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
 }
 
 .index-list {
@@ -21751,12 +21784,21 @@ hr {
 .button-gray-700:active,
 .button-gray-700.active {
     color: #ffffff;
+<<<<<<< HEAD
     background-color: #2f5f8e;
     border-color: #2f5f8e;
 }
 
 .button-gray-700.button-ujarak::before {
     background: #2f5f8e;
+=======
+    background-color: #2a537b;
+    border-color: #2a537b;
+}
+
+.button-gray-700.button-ujarak::before {
+    background: #2a537b;
+>>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
 }
 
 .button-gray-700.button-nuka:hover,
@@ -21766,7 +21808,11 @@ hr {
 }
 
 .button-gray-700.button-nuka .button-overlay {
+<<<<<<< HEAD
     background-color: #2f5f8e;
+=======
+    background-color: #2a537b;
+>>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
 }
 
 .button-primary,
@@ -21801,8 +21847,13 @@ hr {
 .button-secondary,
 .button-secondary:focus {
     color: #ffffff;
+<<<<<<< HEAD
     background-color: #2f5f8e;
     border-color: #2f5f8e;
+=======
+    background-color: #2a537b;
+    border-color: #2a537b;
+>>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
 }
 
 .button-secondary:hover,
@@ -21820,7 +21871,11 @@ hr {
 .button-secondary.button-nuka:hover,
 .button-secondary.button-nuka:active,
 .button-secondary.button-nuka.active {
+<<<<<<< HEAD
     background-color: #2f5f8e;
+=======
+    background-color: #2a537b;
+>>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
 }
 
 .button-secondary.button-nuka .button-overlay {
@@ -22971,12 +23026,16 @@ textarea.form-input {
 }
 
 .quote-classic-body q {
-    font-family: 'Merriweather', 'Times New Roman', Times, serif;
+    font-family: 'Helvetica Neue', sans-serif;
     font-size: 22px;
     font-weight: 700;
     font-style: italic;
     line-height: 1.4;
+<<<<<<< HEAD
     color: #2f5f8e;
+=======
+    color: #2a537b;
+>>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
 }
 
 * + .quote-classic-footer {
@@ -23034,7 +23093,11 @@ textarea.form-input {
 
 .quote-corporate-body q::before {
     font-size: 40px;
+<<<<<<< HEAD
     color: #2f5f8e;
+=======
+    color: #2a537b;
+>>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
     line-height: 0.8;
     padding-top: 8px;
     display: inline-block;
@@ -23088,7 +23151,11 @@ textarea.form-input {
 }
 
 .quote-corporate-4 .quote-corporate-name {
+<<<<<<< HEAD
     color: #2f5f8e;
+=======
+    color: #2a537b;
+>>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
 }
 
 @media (min-width: 768px) {
@@ -23146,7 +23213,7 @@ textarea.form-input {
     text-align: center;
     line-height: 69px;
     font-weight: 400;
-    font-family: 'Merriweather', 'Times New Roman', Times, serif;
+    font-family: 'Helvetica Neue', sans-serif;
     transition: all 0.3s ease-in-out;
 }
 
@@ -23180,7 +23247,7 @@ textarea.form-input {
     border-radius: 50%;
     color: #ffffff;
     font-weight: 400;
-    font-family: 'Merriweather', 'Times New Roman', Times, serif;
+    font-family: 'Helvetica Neue', sans-serif;
     transform: translate3d(-50%, -50%, 0);
     transition: 0.3s ease;
     will-change: transform;
@@ -23642,7 +23709,11 @@ textarea.form-input {
 
 .footer-default-list .heading-6 a:hover,
 .footer-default-contacts .heading-6 a:hover {
+<<<<<<< HEAD
     color: #2f5f8e;
+=======
+    color: #2a537b;
+>>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
 }
 
 * + .footer-default-contacts {
@@ -23746,7 +23817,11 @@ textarea.form-input {
 .footer-modern.bg-gradient-primary .list-social a:hover,
 .footer-modern.bg-gradient-primary-1 .list-social a:hover,
 .footer-modern.rd-navbar-corporate .list-social a:hover {
+<<<<<<< HEAD
     color: #2f5f8e;
+=======
+    color: #2a537b;
+>>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
 }
 
 /*
@@ -23863,7 +23938,11 @@ textarea.form-input {
 }
 
 .service-corporate-icon .path-secondary {
+<<<<<<< HEAD
     fill: #2f5f8e;
+=======
+    fill: #2a537b;
+>>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
 }
 
 .service-corporate-icon .path-gray-700 {
@@ -23898,7 +23977,11 @@ textarea.form-input {
 }
 
 .service-modern-icon .path-secondary {
+<<<<<<< HEAD
     fill: #2f5f8e;
+=======
+    fill: #2a537b;
+>>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
 }
 
 * + .service-modern-title {
@@ -23923,7 +24006,11 @@ textarea.form-input {
 }
 
 .program-day > * {
+<<<<<<< HEAD
     color: #2f5f8e;
+=======
+    color: #2a537b;
+>>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
 }
 
 .program-title {
@@ -24068,7 +24155,11 @@ textarea.form-input {
 }
 
 .service-ubby-title {
+<<<<<<< HEAD
     color: #2f5f8e;
+=======
+    color: #2a537b;
+>>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
     font-weight: 400;
 }
 
@@ -24095,7 +24186,11 @@ textarea.form-input {
 }
 
 .service-alba-title {
+<<<<<<< HEAD
     color: #2f5f8e;
+=======
+    color: #2a537b;
+>>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
 }
 
 @media (min-width: 992px) {
@@ -24339,7 +24434,11 @@ textarea.form-input {
 }
 
 .team-minimal-name {
+<<<<<<< HEAD
     color: #2f5f8e;
+=======
+    color: #2a537b;
+>>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
 }
 
 .team-minimal-text {
@@ -24420,7 +24519,11 @@ textarea.form-input {
 }
 
 .pricing-title {
+<<<<<<< HEAD
     color: #2f5f8e;
+=======
+    color: #2a537b;
+>>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
 }
 
 .pricing-title > * {
@@ -24600,7 +24703,11 @@ textarea.form-input {
 }
 
 .button-play-1::after {
+<<<<<<< HEAD
     background: #2f5f8e;
+=======
+    background: #2a537b;
+>>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
 }
 
 .button-play-1::before {
@@ -24971,7 +25078,11 @@ html:not(.lt-ie10) .not-animated {
     width: 64px;
     height: 64px;
     margin: 0 auto;
+<<<<<<< HEAD
     border: 3px solid #2f5f8e;
+=======
+    border: 3px solid #2a537b;
+>>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
     border-radius: 50%;
     border-left-color: transparent;
     border-bottom-color: transparent;
@@ -25006,7 +25117,11 @@ html:not(.lt-ie10) .not-animated {
 
 .ui-to-top:hover {
     color: #ffffff;
+<<<<<<< HEAD
     background: #2f5f8e;
+=======
+    background: #2a537b;
+>>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
     text-decoration: none;
 }
 
@@ -26001,7 +26116,11 @@ html.tablet .ui-to-top {
 
 .rd-navbar-1.rd-navbar-static .rd-nav-link,
 .rd-navbar-1.rd-navbar-static .rd-nav-link:not([href]) {
+<<<<<<< HEAD
     color: #2f5f8e;
+=======
+    color: #2a537b;
+>>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
 }
 
 .rd-navbar-1.rd-navbar-static .rd-nav-link:hover {
@@ -26742,7 +26861,7 @@ html.rd-navbar-fixed-linked .page {
     font-size: 50px;
     line-height: 1.1;
     font-weight: 700;
-    font-family: 'Merriweather', 'Times New Roman', Times, serif;
+    font-family: 'Helvetica Neue', sans-serif;
     color: #01c9f5;
 }
 
@@ -27225,7 +27344,11 @@ html.rd-navbar-fixed-linked .page {
 
 .owl-dots-2 .owl-dot:hover span,
 .owl-dots-2 .owl-dot.active span {
+<<<<<<< HEAD
     background: #2f5f8e;
+=======
+    background: #2a537b;
+>>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
 }
 
 * + .owl-dots-1 {

index.html

@@ -2,6 +2,7 @@
 <html class="wide wow-animation" lang="en">
   <head>
     <title>Code Abode</title>
+    <link rel="icon" href="/images/favicon.ico">
     <meta charset="utf-8" />
     <meta
       name="viewport"
@@ -1674,7 +1675,7 @@
         </svg>
         <div class="container">
           <div class="footer-corporate-main text-center wow fadeInUp">
-            <h6>We are ready do things</h6>
+            <h6>We are ready to do things</h6>
             <h2 class="heading-1">Let's get started.</h2>
             <p class="big">
               Whenever you're ready, we are too.