Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump elliptic from 6.5.2 to 6.5.3 #2

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
+352 −61
Open

Bump elliptic from 6.5.2 to 6.5.3 #2

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4ddffff
testing change
alfredrafael Sep 2, 2020
1ee3527
Removes exclamation marks added for testing purposes
alfredrafael Sep 2, 2020
18ee02a
WebRequest: Staff photos black and whtie, then become color with hove…
alfredrafael Sep 2, 2020
7795391
Bump elliptic from 6.5.2 to 6.5.3
dependabot[bot] Sep 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion public/index.html
View file
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@
<link href="https://fonts.googleapis.com/css2?family=Roboto+Mono:wght@300;400&family=Titillium+Web&display=swap" rel="stylesheet"> <!-- DevIcons CDN Follows -->
<link rel="stylesheet"
href="https://cdn.rawgit.com/konpa/devicon/df6431e323547add1b4cf45992913f15286456d3/devicon.min.css">
<link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/konpa/devicon@master/devicon.min.css">
<link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/konpa/devicon@master/devicon.min.css">

<!--
manifest.json provides metadata used when your web app is installed on a
17 changes: 7 additions & 10 deletions src/App.css
View file
Original file line number Diff line number Diff line change
@@ -2,12 +2,6 @@
@import url(/wp-content/themes/luminate/js/grayscale/css/grayscale.css);



.carousel-control-next-icon,
.carousel-control-prev-icon {
background-color: #cda84b;
}

.carousel-caption h3 {
color: red;
margin-bottom: 40%;
@@ -34,7 +28,8 @@



/*/////////////////////////////////////////////////////////////////////////*/

/*//From original///////////////////////////////////////////////////////////////////////*/


.alignright {
@@ -998,14 +993,14 @@ input[type=submit]:hover,
.overlay-item:hover .o-hover:hover + img {
border-color: #cda84b
}
.overlay-item:hover img {
.overlay-item:hover img { /*team member*/
filter: none;
-webkit-filter: none;
-webkit-transition: all .6s ease;
-webkit-backface-visibility: hidden;
z-index: 9999
}
.overlay-item:hover img:hover {
.overlay-item:hover img:hover { /*team member*/
border-color: #cda84b
}
a.small-btn {
@@ -4925,7 +4920,9 @@ img {
.responsive-img {
max-width: 100%;
height: auto;
vertical-align: bottom
vertical-align: bottom;
filter: grayscale(100%); /*team member*/
-webkit-filter: grayscale(100%);
}
.circle-img {
-webkit-border-radius: 50%;
2 changes: 1 addition & 1 deletion src/App.js
View file
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@ const App = () => {
<Switch>
<Route path="/" component={Home} exact />
<Route path="/services" component={ServicesSection} />
<Route path="/contact-us" component={ContactUs} />
<Route path="/contact" component={ContactUs} />
<Route path="/about" component={About} />

<Route render={() => <h2 style={{ paddingTop: '15%' }}>404 Page not found</h2>} />
110 changes: 104 additions & 6 deletions src/components/About/About.jsx
View file
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@ const About = () => {
<div class="headline-no-image">
<div class="row">
<div class="twelve col">
<h1>About</h1>
<h1 style={{fontWeight: '500'}}>About</h1>
</div>
</div>
</div>
@@ -38,7 +38,7 @@ const About = () => {
<h2>Who We <span className="gold">Are</span> &amp; What We <span className="gold">Do</span></h2>
</div>

<button onClick={message}>Click me</button>
{/* <button onClick={message}>Click me</button> */}

<p>&nbsp;</p>
<div className="row">
@@ -59,7 +59,7 @@ const About = () => {
</section>



{/*

<section className="padding-top-none padding-bottom-normal section-type-column" style={{backgroundColor: '#fff'}} id="section-10"><div className="container">
<div className="row"><div className="twelve columns col">
@@ -97,12 +97,110 @@ const About = () => {
</p></div>
</div>
<div className="at-below-post-page addthis_tool" data-url="https://www.luminatemarketing.com/about/" />
</div></div></div></section><section className="padding-top-none padding-bottom-none section-type-column" style={{backgroundColor: '#fff'}} id="section-founder"><div className="container"><div className="row"><div className="twelve columns col"><div className="at-above-post-page addthis_tool" data-url="https://www.luminatemarketing.com/about/" /><p>
</div></div></div></section>

*/}









</p>
<div className="at-below-post-page addthis_tool" data-url="https://www.luminatemarketing.com/about/" /></div></div></div></section>




<div className="title" style={{textAlign: 'center'}}>
<h2>Meet the <span className="gold">Team</span></h2>
</div>
<Fade>
<div className="grid-mt twelve col">
<div className="grid-ms">
<div className="overlay-item">
<span>
</span>
<img src="https://alfredorafael.com/wp-content/uploads/2019/03/circlePicture.png" alt="Alfredo R. Pabon" className="lazyload responsive-img" />
</div>
<div className="e-info">
<h3>Alfredo</h3>
<p>Web Developer</p>
</div>
</div>
<div className="grid-ms">
<div className="overlay-item">
<span>
</span>
<img src="https://relatacomm.files.wordpress.com/2020/08/erica-digital-specialist.png" alt="Erica" className="lazyload responsive-img" />
</div>
<div className="e-info">
<h3>Erica</h3>
<p>Digital Specialist</p>
</div>
</div>
<div className="grid-ms">
<div className="overlay-item">
<span>
</span>
<img src="https://relatacomm.files.wordpress.com/2020/08/tala-account-manager.png" alt="Tala" className="lazyload responsive-img" />
</div>
<div className="e-info">
<h3>Tala</h3>
<p>Account Manager</p>
</div>
</div>



</div>

</Fade>
</div>




<Fade>
<div className='row-2'>

<div className="grid-mt twelve col">

<div className="grid-ms">
<div className="overlay-item">
<span>
</span>
<img src="https://relatacomm.files.wordpress.com/2020/08/david-smith-cfo.jpg" alt="David" className="lazyload responsive-img" />
</div>
<div className="e-info">
<h3>David</h3>
<p>Chief Develoment Officer</p>
</div>
</div>
<div className="grid-ms">
<div className="overlay-item">
<span>
</span>
<img src="https://relatacomm.files.wordpress.com/2020/08/myles.jpg" alt="Myles" className="lazyload responsive-img" />
</div>
<div className="e-info">
<h3>Myles</h3>
<p>Principal</p>
</div>
</div>



</div>

</div> {/* Row 1 ends */}

<div className="col center text-center" style={{marginBottom: '3%'}}>
<a href="/about" className="btn team">More about us</a>
</div>

</Fade>



2 changes: 1 addition & 1 deletion src/components/ContactUs/ContactUs.jsx
View file
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@ export default function ContactUs() {
<div class="headline-no-image">
<div class="row">
<div class="twelve col">
<h1>Contact Us</h1>
<h1 style={{fontWeight: '500'}}>Contact Us</h1>
</div>
</div>
</div>
6 changes: 2 additions & 4 deletions src/components/Footer/footer.css
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
.myFooter {
background: black;
background: rgba(0, 0, 0, .9) !important;
color: white;
width: 100%;
margin-top: 5%;
}

.myFooter .col {
padding: 5%
padding: 3%
}


53 changes: 25 additions & 28 deletions src/components/NavigationBar/NavigationBar.jsx
View file
Original file line number Diff line number Diff line change
@@ -6,33 +6,30 @@ import $ from 'jquery';

const NavigationBar = () => {

window.onscroll = function() {scrollFunction()};

function scrollFunction() {
if (document.body.scrollTop > 80 || document.documentElement.scrollTop > 80) {
document.querySelector(".top-bar").style.paddingRight = "15px";
document.querySelector(".top-bar").style.paddingLeft = "15px";
document.querySelector(".top-bar").style.minHeigth = "30px";
document.querySelector(".top-bar").style.paddingBottom = "1px";
document.querySelector(".menu-item-contact").style.fontSize = "16px";
document.querySelector(".menu-item-about").style.fontSize = "16px";
document.querySelector(".menu-item-services").style.fontSize = "16px";
document.querySelector(".top-bar").style.maxHeigth = "50px";


} else {
document.querySelector(".top-bar").style.paddingRight = "25px";
document.querySelector(".top-bar").style.paddingLeft = "25px";
document.querySelector(".top-bar").style.minHeigth = "65px";
document.querySelector(".menu-item-contact").style.fontSize = "16px";
document.querySelector(".menu-item-about").style.fontSize = "16px";
document.querySelector(".menu-item-services").style.fontSize = "16px";
document.querySelector("#logo").style.maxHeigth = "80px";



}
}
// window.onscroll = function() {scrollFunction()};

// function scrollFunction() {
// if (document.body.scrollTop > 80 || document.documentElement.scrollTop > 80) {
// document.querySelector(".top-bar").style.paddingRight = "15px";
// document.querySelector(".top-bar").style.paddingLeft = "15px";
// document.querySelector(".top-bar").style.minHeigth = "30px";
// document.querySelector(".top-bar").style.paddingBottom = "1px";
// document.querySelector(".menu-item-contact").style.fontSize = "16px";
// document.querySelector(".menu-item-about").style.fontSize = "16px";
// document.querySelector(".menu-item-services").style.fontSize = "16px";
// document.querySelector(".top-bar").style.maxHeigth = "50px";


// } else {
// document.querySelector(".top-bar").style.paddingRight = "25px";
// document.querySelector(".top-bar").style.paddingLeft = "25px";
// document.querySelector(".top-bar").style.minHeigth = "65px";
// document.querySelector(".menu-item-contact").style.fontSize = "16px";
// document.querySelector(".menu-item-about").style.fontSize = "16px";
// document.querySelector(".menu-item-services").style.fontSize = "16px";
// document.querySelector("#logo").style.maxHeigth = "80px";
// }
// }

return (
<React.Fragment>
@@ -57,7 +54,7 @@ function scrollFunction() {
<li><a className="menu-item-contact" href="/">Home</a></li>
<li><a className="menu-item-about" href="/about">About</a></li>
<li><a className="menu-item-services" href="/services">Services</a></li>
<li><a className="menu-item-contact" href="/contact-us">Contact</a></li>
<li><a className="menu-item-contact" href="/contact">Contact</a></li>
</ul>
</nav>
<div className="header-social">
10 changes: 6 additions & 4 deletions src/components/ServicesSection/ServicesSection.jsx
View file
Original file line number Diff line number Diff line change
@@ -16,13 +16,15 @@ const ServicesSection = () => {

<div id="servicesPage">

<div class="headline-no-image">
<div class="headline-no-image" style={{marginBottom: '5%'}}>
<div class="row">
<div class="twelve col">
<h1>Services</h1>
<h1 style={{fontWeight: '500'}}>Services</h1>
</div>
</div>
</div>





@@ -40,7 +42,7 @@ const ServicesSection = () => {

<div className="row services-listing">

<div className="service" data-toggle="modal" data-target="#exampleModal">
<div className="service"> {/* data-toggle="modal" data-target="#exampleModal" */}

<i class="fas fa-comments"></i><p />
<h3 className="service-head">Social Media Marketing</h3>
@@ -146,7 +148,7 @@ const ServicesSection = () => {
<a className="small-btn btn" href="/work/">See Our Work</a>
</p>
*/}</div>
<div className="service">
<div className="service" style={{marginBottom: '12%'}}>
<i class="fas fa-video"></i><p />
<h3 className="service-head">Video & Motion Graphics</h3>
<hr />
211 changes: 205 additions & 6 deletions yarn.lock
View file

Large diffs are not rendered by default.