Merge branch 'master' of git.rslp.org:PuukoMonk/CodeAbode

resolved merge conflict
This commit is contained in:
Sid Alapati 2024-06-04 18:27:24 -04:00
commit f61aa2991b
2 changed files with 126 additions and 1 deletions

View File

@ -424,6 +424,7 @@ h1,
h2, h2,
.h2 { .h2 {
font-family: sans-serif;
font-size: 36px; font-size: 36px;
} }
@ -18919,7 +18920,11 @@ html [class*='section-'].section-bottom-0 {
} }
.bg-secondary { .bg-secondary {
<<<<<<< HEAD
background-color: #2f5f8e;
=======
background-color: #2a537b; background-color: #2a537b;
>>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
} }
.bg-secondary:not([style*='background-']) .bg-secondary:not([style*='background-'])
@ -19838,7 +19843,11 @@ h6 a,
h6 a:hover, h6 a:hover,
.heading-6 a:hover { .heading-6 a:hover {
<<<<<<< HEAD
color: #2f5f8e;
=======
color: #2a537b; color: #2a537b;
>>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
} }
.heading-7 { .heading-7 {
@ -19878,7 +19887,11 @@ h6 a:hover,
.heading-8 { .heading-8 {
font-size: 18px; font-size: 18px;
line-height: 1.6; line-height: 1.6;
<<<<<<< HEAD
color: #2f5f8e;
=======
color: #2a537b; color: #2a537b;
>>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
} }
.heading-8 a:hover { .heading-8 a:hover {
@ -19972,7 +19985,11 @@ p [style*='max-width'] {
} }
.title-3 { .title-3 {
<<<<<<< HEAD
color: #2f5f8e;
=======
color: #2a537b; color: #2a537b;
>>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
} }
.context-dark .title-4, .context-dark .title-4,
@ -19991,7 +20008,11 @@ p [style*='max-width'] {
.title-5 { .title-5 {
font-weight: 400; font-weight: 400;
<<<<<<< HEAD
color: #2f5f8e;
=======
color: #2a537b; color: #2a537b;
>>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
} }
@media (min-width: 992px) { @media (min-width: 992px) {
@ -20083,8 +20104,13 @@ a[href*='mailto'] {
} }
.link-border:hover { .link-border:hover {
<<<<<<< HEAD
color: #2f5f8e;
border-color: #2f5f8e;
=======
color: #2a537b; color: #2a537b;
border-color: #2a537b; border-color: #2a537b;
>>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
} }
.link-border-2 { .link-border-2 {
@ -20397,7 +20423,11 @@ a[href*='mailto'] {
} }
.box-modern-item:nth-child(3n + 3) .box-modern-number { .box-modern-item:nth-child(3n + 3) .box-modern-number {
<<<<<<< HEAD
background: #2f5f8e;
=======
background: #2a537b; background: #2a537b;
>>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
} }
* + .box-modern-wrap { * + .box-modern-wrap {
@ -20853,7 +20883,11 @@ html .group-custom > * {
width: 8px; width: 8px;
height: 8px; height: 8px;
border-radius: 8px; border-radius: 8px;
<<<<<<< HEAD
background-color: #2f5f8e;
=======
background-color: #2a537b; background-color: #2a537b;
>>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
} }
.index-list { .index-list {
@ -21750,12 +21784,21 @@ hr {
.button-gray-700:active, .button-gray-700:active,
.button-gray-700.active { .button-gray-700.active {
color: #ffffff; color: #ffffff;
<<<<<<< HEAD
background-color: #2f5f8e;
border-color: #2f5f8e;
}
.button-gray-700.button-ujarak::before {
background: #2f5f8e;
=======
background-color: #2a537b; background-color: #2a537b;
border-color: #2a537b; border-color: #2a537b;
} }
.button-gray-700.button-ujarak::before { .button-gray-700.button-ujarak::before {
background: #2a537b; background: #2a537b;
>>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
} }
.button-gray-700.button-nuka:hover, .button-gray-700.button-nuka:hover,
@ -21765,7 +21808,11 @@ hr {
} }
.button-gray-700.button-nuka .button-overlay { .button-gray-700.button-nuka .button-overlay {
<<<<<<< HEAD
background-color: #2f5f8e;
=======
background-color: #2a537b; background-color: #2a537b;
>>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
} }
.button-primary, .button-primary,
@ -21800,8 +21847,13 @@ hr {
.button-secondary, .button-secondary,
.button-secondary:focus { .button-secondary:focus {
color: #ffffff; color: #ffffff;
<<<<<<< HEAD
background-color: #2f5f8e;
border-color: #2f5f8e;
=======
background-color: #2a537b; background-color: #2a537b;
border-color: #2a537b; border-color: #2a537b;
>>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
} }
.button-secondary:hover, .button-secondary:hover,
@ -21819,7 +21871,11 @@ hr {
.button-secondary.button-nuka:hover, .button-secondary.button-nuka:hover,
.button-secondary.button-nuka:active, .button-secondary.button-nuka:active,
.button-secondary.button-nuka.active { .button-secondary.button-nuka.active {
<<<<<<< HEAD
background-color: #2f5f8e;
=======
background-color: #2a537b; background-color: #2a537b;
>>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
} }
.button-secondary.button-nuka .button-overlay { .button-secondary.button-nuka .button-overlay {
@ -22975,7 +23031,11 @@ textarea.form-input {
font-weight: 700; font-weight: 700;
font-style: italic; font-style: italic;
line-height: 1.4; line-height: 1.4;
<<<<<<< HEAD
color: #2f5f8e;
=======
color: #2a537b; color: #2a537b;
>>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
} }
* + .quote-classic-footer { * + .quote-classic-footer {
@ -23033,7 +23093,11 @@ textarea.form-input {
.quote-corporate-body q::before { .quote-corporate-body q::before {
font-size: 40px; font-size: 40px;
<<<<<<< HEAD
color: #2f5f8e;
=======
color: #2a537b; color: #2a537b;
>>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
line-height: 0.8; line-height: 0.8;
padding-top: 8px; padding-top: 8px;
display: inline-block; display: inline-block;
@ -23087,7 +23151,11 @@ textarea.form-input {
} }
.quote-corporate-4 .quote-corporate-name { .quote-corporate-4 .quote-corporate-name {
<<<<<<< HEAD
color: #2f5f8e;
=======
color: #2a537b; color: #2a537b;
>>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
} }
@media (min-width: 768px) { @media (min-width: 768px) {
@ -23641,7 +23709,11 @@ textarea.form-input {
.footer-default-list .heading-6 a:hover, .footer-default-list .heading-6 a:hover,
.footer-default-contacts .heading-6 a:hover { .footer-default-contacts .heading-6 a:hover {
<<<<<<< HEAD
color: #2f5f8e;
=======
color: #2a537b; color: #2a537b;
>>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
} }
* + .footer-default-contacts { * + .footer-default-contacts {
@ -23745,7 +23817,11 @@ textarea.form-input {
.footer-modern.bg-gradient-primary .list-social a:hover, .footer-modern.bg-gradient-primary .list-social a:hover,
.footer-modern.bg-gradient-primary-1 .list-social a:hover, .footer-modern.bg-gradient-primary-1 .list-social a:hover,
.footer-modern.rd-navbar-corporate .list-social a:hover { .footer-modern.rd-navbar-corporate .list-social a:hover {
<<<<<<< HEAD
color: #2f5f8e;
=======
color: #2a537b; color: #2a537b;
>>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
} }
/* /*
@ -23862,7 +23938,11 @@ textarea.form-input {
} }
.service-corporate-icon .path-secondary { .service-corporate-icon .path-secondary {
<<<<<<< HEAD
fill: #2f5f8e;
=======
fill: #2a537b; fill: #2a537b;
>>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
} }
.service-corporate-icon .path-gray-700 { .service-corporate-icon .path-gray-700 {
@ -23897,7 +23977,11 @@ textarea.form-input {
} }
.service-modern-icon .path-secondary { .service-modern-icon .path-secondary {
<<<<<<< HEAD
fill: #2f5f8e;
=======
fill: #2a537b; fill: #2a537b;
>>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
} }
* + .service-modern-title { * + .service-modern-title {
@ -23922,7 +24006,11 @@ textarea.form-input {
} }
.program-day > * { .program-day > * {
<<<<<<< HEAD
color: #2f5f8e;
=======
color: #2a537b; color: #2a537b;
>>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
} }
.program-title { .program-title {
@ -24067,7 +24155,11 @@ textarea.form-input {
} }
.service-ubby-title { .service-ubby-title {
<<<<<<< HEAD
color: #2f5f8e;
=======
color: #2a537b; color: #2a537b;
>>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
font-weight: 400; font-weight: 400;
} }
@ -24094,7 +24186,11 @@ textarea.form-input {
} }
.service-alba-title { .service-alba-title {
<<<<<<< HEAD
color: #2f5f8e;
=======
color: #2a537b; color: #2a537b;
>>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
} }
@media (min-width: 992px) { @media (min-width: 992px) {
@ -24338,7 +24434,11 @@ textarea.form-input {
} }
.team-minimal-name { .team-minimal-name {
<<<<<<< HEAD
color: #2f5f8e;
=======
color: #2a537b; color: #2a537b;
>>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
} }
.team-minimal-text { .team-minimal-text {
@ -24419,7 +24519,11 @@ textarea.form-input {
} }
.pricing-title { .pricing-title {
<<<<<<< HEAD
color: #2f5f8e;
=======
color: #2a537b; color: #2a537b;
>>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
} }
.pricing-title > * { .pricing-title > * {
@ -24599,7 +24703,11 @@ textarea.form-input {
} }
.button-play-1::after { .button-play-1::after {
<<<<<<< HEAD
background: #2f5f8e;
=======
background: #2a537b; background: #2a537b;
>>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
} }
.button-play-1::before { .button-play-1::before {
@ -24812,6 +24920,7 @@ html:not(.lt-ie10) .not-animated {
.fadeInUp { .fadeInUp {
animation-name: fadeInUp; animation-name: fadeInUp;
font-family: sans-serif;
} }
@keyframes fadeInDown { @keyframes fadeInDown {
@ -24969,7 +25078,11 @@ html:not(.lt-ie10) .not-animated {
width: 64px; width: 64px;
height: 64px; height: 64px;
margin: 0 auto; margin: 0 auto;
<<<<<<< HEAD
border: 3px solid #2f5f8e;
=======
border: 3px solid #2a537b; border: 3px solid #2a537b;
>>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
border-radius: 50%; border-radius: 50%;
border-left-color: transparent; border-left-color: transparent;
border-bottom-color: transparent; border-bottom-color: transparent;
@ -25004,7 +25117,11 @@ html:not(.lt-ie10) .not-animated {
.ui-to-top:hover { .ui-to-top:hover {
color: #ffffff; color: #ffffff;
<<<<<<< HEAD
background: #2f5f8e;
=======
background: #2a537b; background: #2a537b;
>>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
text-decoration: none; text-decoration: none;
} }
@ -25999,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,
.rd-navbar-1.rd-navbar-static .rd-nav-link:not([href]) { .rd-navbar-1.rd-navbar-static .rd-nav-link:not([href]) {
<<<<<<< HEAD
color: #2f5f8e;
=======
color: #2a537b; color: #2a537b;
>>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
} }
.rd-navbar-1.rd-navbar-static .rd-nav-link:hover { .rd-navbar-1.rd-navbar-static .rd-nav-link:hover {
@ -27223,7 +27344,11 @@ html.rd-navbar-fixed-linked .page {
.owl-dots-2 .owl-dot:hover span, .owl-dots-2 .owl-dot:hover span,
.owl-dots-2 .owl-dot.active span { .owl-dots-2 .owl-dot.active span {
<<<<<<< HEAD
background: #2f5f8e;
=======
background: #2a537b; background: #2a537b;
>>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
} }
* + .owl-dots-1 { * + .owl-dots-1 {

View File

@ -172,7 +172,7 @@
<li class="list-terms-item"> <li class="list-terms-item">
<h4 class="list-terms-title">How much does it cost?</h4> <h4 class="list-terms-title">How much does it cost?</h4>
<p class="list-terms-text"> <p class="list-terms-text">
The program cost varies from individual to individual and the gap between where they are right now and where they want to be. For example, the price of teaching a kid with python skills will be lower than if they had no prior experience. However, we welcome your child regardless of how much experience they have and we are flexible with the program fees. The program cost varies from individual to individual and the gap between where they are right now and where they want to be. For example, the price of teaching a kid with Python skills will be lower than if they had no prior experience. However, we welcome your child regardless of how much experience they have and we are flexible with the program fees.
</p> </p>
</li> </li>
</ul> </ul>