fixed more merging confliction
This commit is contained in:
Sid Alapati
parent
f61aa2991b
commit
36ee71cc4b
123
css/style.css
123
css/style.css
|
|
@ -18920,11 +18920,7 @@ html [class*='section-'].section-bottom-0 {
|
|||
}
|
||||
|
||||
.bg-secondary {
|
||||
<<<<<<< HEAD
|
||||
background-color: #2f5f8e;
|
||||
=======
|
||||
background-color: #2a537b;
|
||||
>>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
|
||||
}
|
||||
|
||||
.bg-secondary:not([style*='background-'])
|
||||
|
|
@ -19843,11 +19839,7 @@ h6 a,
|
|||
|
||||
h6 a:hover,
|
||||
.heading-6 a:hover {
|
||||
<<<<<<< HEAD
|
||||
color: #2f5f8e;
|
||||
=======
|
||||
color: #2a537b;
|
||||
>>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
|
||||
}
|
||||
|
||||
.heading-7 {
|
||||
|
|
@ -19887,11 +19879,7 @@ h6 a:hover,
|
|||
.heading-8 {
|
||||
font-size: 18px;
|
||||
line-height: 1.6;
|
||||
<<<<<<< HEAD
|
||||
color: #2f5f8e;
|
||||
=======
|
||||
color: #2a537b;
|
||||
>>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
|
||||
}
|
||||
|
||||
.heading-8 a:hover {
|
||||
|
|
@ -19985,11 +19973,7 @@ p [style*='max-width'] {
|
|||
}
|
||||
|
||||
.title-3 {
|
||||
<<<<<<< HEAD
|
||||
color: #2f5f8e;
|
||||
=======
|
||||
color: #2a537b;
|
||||
>>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
|
||||
}
|
||||
|
||||
.context-dark .title-4,
|
||||
|
|
@ -20008,11 +19992,7 @@ p [style*='max-width'] {
|
|||
|
||||
.title-5 {
|
||||
font-weight: 400;
|
||||
<<<<<<< HEAD
|
||||
color: #2f5f8e;
|
||||
=======
|
||||
color: #2a537b;
|
||||
>>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
|
||||
}
|
||||
|
||||
@media (min-width: 992px) {
|
||||
|
|
@ -20104,13 +20084,8 @@ a[href*='mailto'] {
|
|||
}
|
||||
|
||||
.link-border:hover {
|
||||
<<<<<<< HEAD
|
||||
color: #2f5f8e;
|
||||
border-color: #2f5f8e;
|
||||
=======
|
||||
color: #2a537b;
|
||||
border-color: #2a537b;
|
||||
>>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
|
||||
}
|
||||
|
||||
.link-border-2 {
|
||||
|
|
@ -20423,11 +20398,7 @@ a[href*='mailto'] {
|
|||
}
|
||||
|
||||
.box-modern-item:nth-child(3n + 3) .box-modern-number {
|
||||
<<<<<<< HEAD
|
||||
background: #2f5f8e;
|
||||
=======
|
||||
background: #2a537b;
|
||||
>>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
|
||||
}
|
||||
|
||||
* + .box-modern-wrap {
|
||||
|
|
@ -20883,11 +20854,7 @@ html .group-custom > * {
|
|||
width: 8px;
|
||||
height: 8px;
|
||||
border-radius: 8px;
|
||||
<<<<<<< HEAD
|
||||
background-color: #2f5f8e;
|
||||
=======
|
||||
background-color: #2a537b;
|
||||
>>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
|
||||
}
|
||||
|
||||
.index-list {
|
||||
|
|
@ -21784,21 +21751,12 @@ 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,
|
||||
|
|
@ -21808,11 +21766,7 @@ hr {
|
|||
}
|
||||
|
||||
.button-gray-700.button-nuka .button-overlay {
|
||||
<<<<<<< HEAD
|
||||
background-color: #2f5f8e;
|
||||
=======
|
||||
background-color: #2a537b;
|
||||
>>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
|
||||
}
|
||||
|
||||
.button-primary,
|
||||
|
|
@ -21847,13 +21801,8 @@ 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,
|
||||
|
|
@ -21871,11 +21820,7 @@ 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 {
|
||||
|
|
@ -23031,11 +22976,7 @@ textarea.form-input {
|
|||
font-weight: 700;
|
||||
font-style: italic;
|
||||
line-height: 1.4;
|
||||
<<<<<<< HEAD
|
||||
color: #2f5f8e;
|
||||
=======
|
||||
color: #2a537b;
|
||||
>>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
|
||||
}
|
||||
|
||||
* + .quote-classic-footer {
|
||||
|
|
@ -23093,11 +23034,7 @@ 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;
|
||||
|
|
@ -23151,11 +23088,7 @@ textarea.form-input {
|
|||
}
|
||||
|
||||
.quote-corporate-4 .quote-corporate-name {
|
||||
<<<<<<< HEAD
|
||||
color: #2f5f8e;
|
||||
=======
|
||||
color: #2a537b;
|
||||
>>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
|
||||
}
|
||||
|
||||
@media (min-width: 768px) {
|
||||
|
|
@ -23709,11 +23642,7 @@ 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 {
|
||||
|
|
@ -23817,11 +23746,7 @@ 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
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -23938,11 +23863,7 @@ textarea.form-input {
|
|||
}
|
||||
|
||||
.service-corporate-icon .path-secondary {
|
||||
<<<<<<< HEAD
|
||||
fill: #2f5f8e;
|
||||
=======
|
||||
fill: #2a537b;
|
||||
>>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
|
||||
}
|
||||
|
||||
.service-corporate-icon .path-gray-700 {
|
||||
|
|
@ -23977,11 +23898,7 @@ textarea.form-input {
|
|||
}
|
||||
|
||||
.service-modern-icon .path-secondary {
|
||||
<<<<<<< HEAD
|
||||
fill: #2f5f8e;
|
||||
=======
|
||||
fill: #2a537b;
|
||||
>>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
|
||||
}
|
||||
|
||||
* + .service-modern-title {
|
||||
|
|
@ -24006,11 +23923,7 @@ textarea.form-input {
|
|||
}
|
||||
|
||||
.program-day > * {
|
||||
<<<<<<< HEAD
|
||||
color: #2f5f8e;
|
||||
=======
|
||||
color: #2a537b;
|
||||
>>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
|
||||
}
|
||||
|
||||
.program-title {
|
||||
|
|
@ -24155,11 +24068,7 @@ textarea.form-input {
|
|||
}
|
||||
|
||||
.service-ubby-title {
|
||||
<<<<<<< HEAD
|
||||
color: #2f5f8e;
|
||||
=======
|
||||
color: #2a537b;
|
||||
>>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
|
||||
font-weight: 400;
|
||||
}
|
||||
|
||||
|
|
@ -24186,11 +24095,7 @@ textarea.form-input {
|
|||
}
|
||||
|
||||
.service-alba-title {
|
||||
<<<<<<< HEAD
|
||||
color: #2f5f8e;
|
||||
=======
|
||||
color: #2a537b;
|
||||
>>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
|
||||
}
|
||||
|
||||
@media (min-width: 992px) {
|
||||
|
|
@ -24434,11 +24339,7 @@ textarea.form-input {
|
|||
}
|
||||
|
||||
.team-minimal-name {
|
||||
<<<<<<< HEAD
|
||||
color: #2f5f8e;
|
||||
=======
|
||||
color: #2a537b;
|
||||
>>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
|
||||
}
|
||||
|
||||
.team-minimal-text {
|
||||
|
|
@ -24519,11 +24420,7 @@ textarea.form-input {
|
|||
}
|
||||
|
||||
.pricing-title {
|
||||
<<<<<<< HEAD
|
||||
color: #2f5f8e;
|
||||
=======
|
||||
color: #2a537b;
|
||||
>>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
|
||||
}
|
||||
|
||||
.pricing-title > * {
|
||||
|
|
@ -24703,11 +24600,7 @@ textarea.form-input {
|
|||
}
|
||||
|
||||
.button-play-1::after {
|
||||
<<<<<<< HEAD
|
||||
background: #2f5f8e;
|
||||
=======
|
||||
background: #2a537b;
|
||||
>>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
|
||||
}
|
||||
|
||||
.button-play-1::before {
|
||||
|
|
@ -25078,11 +24971,7 @@ 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;
|
||||
|
|
@ -25117,11 +25006,7 @@ html:not(.lt-ie10) .not-animated {
|
|||
|
||||
.ui-to-top:hover {
|
||||
color: #ffffff;
|
||||
<<<<<<< HEAD
|
||||
background: #2f5f8e;
|
||||
=======
|
||||
background: #2a537b;
|
||||
>>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
|
|
@ -26116,11 +26001,7 @@ 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 {
|
||||
|
|
@ -27344,11 +27225,7 @@ 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 {
|
||||
|
|
|
|||
Loading…
Reference in New Issue