resolved merge conflict
This commit is contained in:
Sid Alapati
commit
8104cdb1ca
@ -58,6 +58,7 @@
|
||||
* 4.18 Material Parallax
|
||||
* 4.19 Bootstrap Modal
|
||||
*/
|
||||
|
||||
*,
|
||||
*::before,
|
||||
*::after {
|
||||
@ -21751,12 +21752,12 @@ hr {
|
||||
.button-gray-700:active,
|
||||
.button-gray-700.active {
|
||||
color: #ffffff;
|
||||
background-color: #2a537b;
|
||||
border-color: #2a537b;
|
||||
background-color: #2f5f8e;
|
||||
border-color: #2f5f8e;
|
||||
}
|
||||
|
||||
.button-gray-700.button-ujarak::before {
|
||||
background: #2a537b;
|
||||
background: #2f5f8e;
|
||||
}
|
||||
|
||||
.button-gray-700.button-nuka:hover,
|
||||
@ -21766,7 +21767,7 @@ hr {
|
||||
}
|
||||
|
||||
.button-gray-700.button-nuka .button-overlay {
|
||||
background-color: #2a537b;
|
||||
background-color: #2f5f8e;
|
||||
}
|
||||
|
||||
.button-primary,
|
||||
|
||||
@ -115,39 +115,21 @@
|
||||
/></a>
|
||||
</div>
|
||||
</div>
|
||||
<div class="rd-navbar-main-element">
|
||||
<div class="rd-navbar-nav-wrap"></div>
|
||||
<a class="button button-secondary button-nuka" href="curriculum.html"
|
||||
>Curriculum
|
||||
</a>
|
||||
</div>
|
||||
<div class="rd-navbar-main-element">
|
||||
<div class="rd-navbar-nav-wrap"></div>
|
||||
<a class="button button-secondary button-nuka" href="location.html"
|
||||
>In Person/Virtual
|
||||
</a>
|
||||
</div>
|
||||
<div class="rd-navbar-main-element">
|
||||
<div class="rd-navbar-nav-wrap"></div>
|
||||
<a class="button button-secondary button-nuka" href="faq.html"
|
||||
>FAQ
|
||||
</a>
|
||||
</div>
|
||||
<div class="rd-navbar-main-element">
|
||||
<div class="rd-navbar-nav-wrap"></div>
|
||||
<a class="button button-secondary button-nuka" href="intern.html"
|
||||
>Intern with Us
|
||||
</a>
|
||||
</div>
|
||||
<div class="rd-navbar-main-element">
|
||||
<div class="rd-navbar-nav-wrap"></div>
|
||||
<div class="rd-navbar-collapse">
|
||||
<a class="button button-secondary button-nuka" href="https://forms.gle/2pVQAMPTLsPnY3228"
|
||||
>Apply Now<span class="button-overlay"></span
|
||||
<a class="button button-secondary button-nuka" href="https://forms.gle/YdHM9EYzvVwzRheg9"
|
||||
>Apply Now<span class="button-overlay" id="applybutton"></span
|
||||
></a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</nav>
|
||||
</div>
|
||||
|
||||
22
faq.html
22
faq.html
@ -115,39 +115,21 @@
|
||||
/></a>
|
||||
</div>
|
||||
</div>
|
||||
<div class="rd-navbar-main-element">
|
||||
<div class="rd-navbar-nav-wrap"></div>
|
||||
<a class="button button-secondary button-nuka" href="curriculum.html"
|
||||
>Curriculum
|
||||
</a>
|
||||
</div>
|
||||
<div class="rd-navbar-main-element">
|
||||
<div class="rd-navbar-nav-wrap"></div>
|
||||
<a class="button button-secondary button-nuka" href="location.html"
|
||||
>In Person/Virtual
|
||||
</a>
|
||||
</div>
|
||||
<div class="rd-navbar-main-element">
|
||||
<div class="rd-navbar-nav-wrap"></div>
|
||||
<a class="button button-secondary button-nuka" href="faq.html"
|
||||
>FAQ
|
||||
</a>
|
||||
</div>
|
||||
<div class="rd-navbar-main-element">
|
||||
<div class="rd-navbar-nav-wrap"></div>
|
||||
<a class="button button-secondary button-nuka" href="intern.html"
|
||||
>Intern with Us
|
||||
</a>
|
||||
</div>
|
||||
<div class="rd-navbar-main-element">
|
||||
<div class="rd-navbar-nav-wrap"></div>
|
||||
<div class="rd-navbar-collapse">
|
||||
<a class="button button-secondary button-nuka" href="https://forms.gle/2pVQAMPTLsPnY3228"
|
||||
>Apply Now<span class="button-overlay"></span
|
||||
<a class="button button-secondary button-nuka" href="https://forms.gle/YdHM9EYzvVwzRheg9"
|
||||
>Apply Now<span class="button-overlay" id="applybutton"></span
|
||||
></a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</nav>
|
||||
</div>
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 1.0 MiB After Width: | Height: | Size: 209 KiB |
BIN
images/thumbvid.png
Normal file
BIN
images/thumbvid.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 3.0 MiB |
31
index.html
31
index.html
@ -89,15 +89,10 @@
|
||||
class="rd-navbar-collapse-toggle rd-navbar-fixed-element-1"
|
||||
data-rd-navbar-toggle=".rd-navbar-collapse"
|
||||
>
|
||||
<span></span>
|
||||
</div>
|
||||
<div class="rd-navbar-main-outer">
|
||||
<div class="rd-navbar-main">
|
||||
<div class="rd-navbar-panel">
|
||||
<button
|
||||
class="rd-navbar-toggle"
|
||||
data-rd-navbar-toggle=".rd-navbar-nav-wrap"
|
||||
>
|
||||
<span></span>
|
||||
</button>
|
||||
<div class="rd-navbar-brand">
|
||||
@ -116,43 +111,21 @@
|
||||
/></a>
|
||||
</div>
|
||||
</div>
|
||||
<div class="rd-navbar-main-element">
|
||||
<div class="rd-navbar-nav-wrap"></div>
|
||||
<div class="rd-navbar-collapse">
|
||||
<a class="button button-secondary button-nuka" href="curriculum.html"
|
||||
>Curriculum
|
||||
</a>
|
||||
</div>
|
||||
<div class="rd-navbar-main-element">
|
||||
<div class="rd-navbar-nav-wrap"></div>
|
||||
<div class="rd-navbar-collapse">
|
||||
<a class="button button-secondary button-nuka" href="location.html"
|
||||
>In Person/Virtual
|
||||
</a>
|
||||
</div>
|
||||
<div class="rd-navbar-main-element">
|
||||
<div class="rd-navbar-nav-wrap"></div>
|
||||
<div class="rd-navbar-collapse">
|
||||
<a class="button button-secondary button-nuka" href="faq.html"
|
||||
>FAQ
|
||||
</a>
|
||||
</div>
|
||||
<div class="rd-navbar-main-element">
|
||||
<div class="rd-navbar-nav-wrap"></div>
|
||||
<div class="rd-navbar-collapse">
|
||||
<a class="button button-secondary button-nuka" href="intern.html"
|
||||
>Intern with Us
|
||||
</a>
|
||||
</div>
|
||||
<div class="rd-navbar-main-element">
|
||||
<div class="rd-navbar-nav-wrap"></div>
|
||||
<div class="rd-navbar-collapse">
|
||||
<a class="button button-secondary button-nuka" href="https://forms.gle/YdHM9EYzvVwzRheg9"
|
||||
>Apply Now<span class="button-overlay"></span
|
||||
>Apply Now<span class="button-overlay" id="applybutton"></span
|
||||
></a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</nav>
|
||||
</div>
|
||||
@ -283,7 +256,7 @@
|
||||
</a>
|
||||
<img
|
||||
class="box-shadow"
|
||||
src="images/baby.jpg"
|
||||
src="images/thumbvid.png"
|
||||
alt=""
|
||||
width="660"
|
||||
height="406"
|
||||
|
||||
48
intern.html
48
intern.html
@ -115,45 +115,27 @@
|
||||
/></a>
|
||||
</div>
|
||||
</div>
|
||||
<div class="rd-navbar-main-element">
|
||||
<div class="rd-navbar-nav-wrap"></div>
|
||||
<a class="button button-secondary button-nuka" href="curriculum.html"
|
||||
>Curriculum
|
||||
</a>
|
||||
</div>
|
||||
<div class="rd-navbar-main-element">
|
||||
<div class="rd-navbar-nav-wrap"></div>
|
||||
<a class="button button-secondary button-nuka" href="location.html"
|
||||
>In Person/Virtual
|
||||
</a>
|
||||
</div>
|
||||
<div class="rd-navbar-main-element">
|
||||
<div class="rd-navbar-nav-wrap"></div>
|
||||
<a class="button button-secondary button-nuka" href="faq.html"
|
||||
>FAQ
|
||||
</a>
|
||||
</div>
|
||||
<div class="rd-navbar-main-element">
|
||||
<div class="rd-navbar-nav-wrap"></div>
|
||||
<a class="button button-secondary button-nuka" href="intern.html"
|
||||
>Intern with Us
|
||||
</a>
|
||||
</div>
|
||||
<div class="rd-navbar-main-element">
|
||||
<div class="rd-navbar-nav-wrap"></div>
|
||||
<div class="rd-navbar-collapse">
|
||||
<a class="button button-secondary button-nuka" href="https://forms.gle/2pVQAMPTLsPnY3228"
|
||||
>Apply Now<span class="button-overlay"></span
|
||||
<a class="button button-secondary button-nuka" href="https://forms.gle/YdHM9EYzvVwzRheg9"
|
||||
>Apply Now<span class="button-overlay" id="applybutton"></span
|
||||
></a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</nav>
|
||||
</div>
|
||||
</header>
|
||||
|
||||
<section class="section section-md bg-default" id="advantages">
|
||||
<section class="section section-md bg-default" >
|
||||
<div class="container">
|
||||
<div class="row row-30 align-items-center wow fadeInUp">
|
||||
<div class="col-xl-7 col-lg-6">
|
||||
@ -172,6 +154,29 @@
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<footer class="section footer-corporate bg-gray-800 position-relative">
|
||||
<svg
|
||||
class="wave-dark"
|
||||
width="1920"
|
||||
height="713"
|
||||
viewBox="0 0 1920 713"
|
||||
>
|
||||
<path
|
||||
class="wave-path wave-path-1"
|
||||
d="M1920 463.314V713H0V414.325C0.0515862 414.316 0.103105 414.308 0.154556 414.299C59.8232 467.769 270.664 573.445 636.676 568.392C873.316 565.126 1040.4 505.514 1188.57 452.65C1326.86 403.309 1448.68 359.846 1595.21 373.565C1727.41 385.944 1837.94 423.471 1920 463.314Z"
|
||||
fill="white"
|
||||
></path>
|
||||
<path
|
||||
class="wave-path wave-path-2"
|
||||
d="M1920 463.988V713H0V234.66C102.275 199.182 221.353 170.486 354.422 158.026C584.381 136.494 775.567 204.707 992.611 282.146C1225.15 365.113 1373 457.092 1858.75 463.796C1879.49 464.082 1899.9 464.142 1920 463.988Z"
|
||||
fill="white"
|
||||
></path>
|
||||
<path
|
||||
class="wave-path wave-path-3"
|
||||
d="M1920 85.9538V713H0V310.063C15.2357 310.099 30.6508 310.012 46.2454 309.796C417.632 304.67 679.852 211.113 912.389 128.146C1129.43 50.7068 1320.62 -17.5061 1550.58 4.02629C1690.21 17.1004 1814.43 48.0502 1920 85.9538Z"
|
||||
fill="white"
|
||||
></path>
|
||||
</svg>
|
||||
<div
|
||||
class="footer-corporate-aside text-center text-xl-left wow fadeInUp"
|
||||
>
|
||||
@ -195,3 +200,4 @@
|
||||
<script src="js/script.js"></script>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
|
||||
@ -115,43 +115,21 @@
|
||||
/></a>
|
||||
</div>
|
||||
</div>
|
||||
<div class="rd-navbar-main-element">
|
||||
<div class="rd-navbar-nav-wrap"></div>
|
||||
<div class="rd-navbar-collapse">
|
||||
<a class="button button-secondary button-nuka" href="curriculum.html"
|
||||
>Curriculum
|
||||
</a>
|
||||
</div>
|
||||
<div class="rd-navbar-main-element">
|
||||
<div class="rd-navbar-nav-wrap"></div>
|
||||
<div class="rd-navbar-collapse">
|
||||
<a class="button button-secondary button-nuka" href="location.html"
|
||||
>In Person/Virtual
|
||||
</a>
|
||||
</div>
|
||||
<div class="rd-navbar-main-element">
|
||||
<div class="rd-navbar-nav-wrap"></div>
|
||||
<div class="rd-navbar-collapse">
|
||||
<a class="button button-secondary button-nuka" href="faq.html"
|
||||
>FAQ
|
||||
</a>
|
||||
</div>
|
||||
<div class="rd-navbar-main-element">
|
||||
<div class="rd-navbar-nav-wrap"></div>
|
||||
<div class="rd-navbar-collapse">
|
||||
<a class="button button-secondary button-nuka" href="intern.html"
|
||||
>Intern with Us
|
||||
</a>
|
||||
</div>
|
||||
<div class="rd-navbar-main-element">
|
||||
<div class="rd-navbar-nav-wrap"></div>
|
||||
<div class="rd-navbar-collapse">
|
||||
<a class="button button-secondary button-nuka" href="https://forms.gle/2pVQAMPTLsPnY3228"
|
||||
>Apply Now<span class="button-overlay"></span
|
||||
<a class="button button-secondary button-nuka" href="https://forms.gle/YdHM9EYzvVwzRheg9"
|
||||
>Apply Now<span class="button-overlay" id="applybutton"></span
|
||||
></a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</nav>
|
||||
</div>
|
||||
@ -234,7 +212,6 @@
|
||||
width="1920"
|
||||
height="713"
|
||||
viewBox="0 0 1920 713"
|
||||
fill="none"
|
||||
>
|
||||
<path
|
||||
class="wave-path wave-path-1"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user