Skip to content

Commit

Permalink
Merge pull request #2 from joshua-neizer/build
Browse files Browse the repository at this point in the history 
Adjusted CSS to be more responsive
  • Loading branch information
@joshua-neizer
joshua-neizer authored Jan 5, 2021
2 parents 8184db7 + ef8e86a commit 08f45e5
Show file tree
Hide file tree
Showing 7 changed files with 99 additions and 54 deletions.
22 changes: 9 additions & 13 deletions CSS/about.css
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
div.about-container{
width: 100%;
padding: 75px 0px;
padding-top: var(--padding-height);
color: black;
margin: auto;
text-align: center;
Expand Down Expand Up @@ -62,30 +62,26 @@ h2{
color: var(--nav-colour);
}

@media screen and (max-width: 700px) {
div.about-information{
width: 400px;
}
}

@media screen and (max-width: 1029px) {
div.about-information{
margin-top: 50px;
}

div.about-information{
height: 600px;
height: auto;
width: 80%;
}

div.about-mvc{
width: 80%;
}

div.block {
margin-right: 0px;
}
}

@media screen and (max-width: 400px){
@media screen and (max-width: 450px){
div.about-information {
height: 900px;
width: 80%;
padding-bottom: 40px;
}

div.block {
Expand Down
6 changes: 5 additions & 1 deletion CSS/contact.css
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
div.email-form{
width: 70%;
margin: auto;
padding-top: 75px;
padding-top: var(--padding-height);
}

h1.contact-header{
Expand All @@ -22,6 +22,10 @@ div.spacing-left{
padding-left: 100px;
}

input {
padding-left: 10px;
}

input.contact-email{
height: 40px;
width: 200px;
Expand Down
2 changes: 1 addition & 1 deletion CSS/financial.css
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
div.financial-container{
width: 100%;
padding: 75px 0px;
padding-top: var(--padding-height);
background-color: var(--nav-colour);
color: white;
margin: auto;
Expand Down
4 changes: 3 additions & 1 deletion CSS/index.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
--main-colour: #A9A291;
--nav-colour: #b2ab9b;
--nav-text: #8a8170;
--padding-height: 90px;
}

::-webkit-scrollbar{
Expand Down Expand Up @@ -55,6 +56,7 @@ h1 {
font-size: 60px;
text-transform: uppercase;
letter-spacing: 10px;
/* padding-top: 15px; */
}

div.title-screen{
Expand Down Expand Up @@ -174,7 +176,7 @@ span.footer-copyright{
}
}

@media screen and (max-width: 1000px){
@media screen and (max-width: 1500px){
div.title-screen {
background-position: inherit;
background-size: 1800px;
Expand Down
2 changes: 1 addition & 1 deletion CSS/tools.css
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
div.tools-container{
width: 100%;
padding: 75px 0px;
padding-top: var(--padding-height);
color: var(--main-colour);
margin: auto;
text-align: center;
Expand Down
45 changes: 45 additions & 0 deletions JavaScript/contact.js
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,48 @@
const isNumericInput = (event) => {
const key = event.keyCode;
return ((key >= 48 && key <= 57) || // Allow number line
(key >= 96 && key <= 105) // Allow number pad
);
};

const isModifierKey = (event) => {
const key = event.keyCode;
return (event.shiftKey === true || key === 35 || key === 36) || // Allow Shift, Home, End
(key === 8 || key === 9 || key === 13 || key === 46) || // Allow Backspace, Tab, Enter, Delete
(key > 36 && key < 41) || // Allow left, up, right, down
(
// Allow Ctrl/Command + A,C,V,X,Z
(event.ctrlKey === true || event.metaKey === true) &&
(key === 65 || key === 67 || key === 86 || key === 88 || key === 90)
)
};

const enforceFormat = (event) => {
// Input must be of a valid number format or a modifier key, and not longer than ten digits
if(!isNumericInput(event) && !isModifierKey(event)){
event.preventDefault();
}
};

const formatToPhone = (event) => {
if(isModifierKey(event)) {return;}

// I am lazy and don't like to type things more than once
const target = event.target;
const input = event.target.value.replace(/\D/g,'').substring(0,10); // First ten digits of input only
const zip = input.substring(0,3);
const middle = input.substring(3,6);
const last = input.substring(6,10);

if(input.length > 6){target.value = `(${zip}) ${middle} - ${last}`;}
else if(input.length > 3){target.value = `(${zip}) ${middle}`;}
else if(input.length > 0){target.value = `(${zip}`;}
};

const inputElement = document.getElementById('telephone');
inputElement.addEventListener('keydown',enforceFormat);
inputElement.addEventListener('keyup',formatToPhone);

$('#submit').click(function () {
var first_name = $("#first-name").val(),
last_name = $("#last-name").val(),
Expand Down
72 changes: 35 additions & 37 deletions index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
<meta name="robots" content="index, follow" />
<meta name="viewport" content="width=device-width, initial-scale=1">
<link href="./CSS/index.css?v=1.0" rel="stylesheet">
<link href="./CSS/navbar.css?v=1.0" rel="stylesheet">
<link href="./CSS/financial.css?v=1.0" rel="stylesheet">
<link href="./CSS/tools.css?v=1.0" rel="stylesheet">
<link href="./CSS/contact.css?v=1.0" rel="stylesheet">
<link href="./CSS/about.css?v=1.0" rel="stylesheet">
<link href="./CSS/index.css?v=1.1" rel="stylesheet">
<link href="./CSS/navbar.css?v=1.1" rel="stylesheet">
<link href="./CSS/financial.css?v=1.1" rel="stylesheet">
<link href="./CSS/tools.css?v=1.1" rel="stylesheet">
<link href="./CSS/contact.css?v=1.1" rel="stylesheet">
<link href="./CSS/about.css?v=1.1" rel="stylesheet">
<link rel="icon" href="./assets/CLIPPEDLOGOS-04.png" />
<link href="https://fonts.googleapis.com/css2?family=Playfair+Display&display=swap" rel="stylesheet">
<title>JN Financial</title>
Expand Down Expand Up @@ -180,34 +180,32 @@ <h1 class="about-header">About Myself</h1>
<img alt="Joseph Neizer Headshot" class="headshot" src="./assets/headshot.jpg">
</div>
<div class="about-information">
<div class="about-bio">
<h2 style="margin-top: 0;">Joseph Neizer<span style="color: grey; font-weight: 100; padding-left: 10px;">- MBA, CFP, CIM<br/>President</span></h2>
<p>
I am passionate about financial literacy and helping Canadian individuals and families develop
financial strategies that enable them to achieve their financial goals and live purpose
filled lives.
</p>
<p>
I recently retired from the financial services sector after over 20 years in the industry. I
have an MBA from the University of Toronto, and I further hold complimentary
designations for Certified Financial Planner (CFP) and Canadian Investment Manager
(CIM).
</p>
<p>
I’ve worked across the Greater Toronto Area for TD Bank, holding positions from senior
financial analyst, financial advisor to branch manager. Outside of work, I volunteer with
my church as a money coach with Christians Against Poverty organization (CAP) and
as a tax preparer for low-income and new immigrants under CRA’s Community
Volunteer Income Tax Program (CVITP).
</p>
<p>
Throughout my career, I have enjoyed engaging with people from diverse cultural and
socio-economic backgrounds. My goal after retirement is to continue to provide financial
literacy advice to my community on a more personal level.
I am a proud husband and father to 4 lovely kids. In my spare time, I enjoy long walks,
playing golf, and spending time with my family.
</p>
</div>
<h2 style="margin-top: 0;">Joseph Neizer<span style="color: grey; font-weight: 100; padding-left: 10px;">- MBA, CFP, CIM<br/>President</span></h2>
<p>
I am passionate about financial literacy and helping Canadian individuals and families develop
financial strategies that enable them to achieve their financial goals and live purpose
filled lives.
</p>
<p>
I recently retired from the financial services sector after over 20 years in the industry. I
have an MBA from the University of Toronto, and I further hold complimentary
designations for Certified Financial Planner (CFP) and Canadian Investment Manager
(CIM).
</p>
<p>
I’ve worked across the Greater Toronto Area for TD Bank, holding positions from senior
financial analyst, financial advisor to branch manager. Outside of work, I volunteer with
my church as a money coach with Christians Against Poverty organization (CAP) and
as a tax preparer for low-income and new immigrants under CRA’s Community
Volunteer Income Tax Program (CVITP).
</p>
<p>
Throughout my career, I have enjoyed engaging with people from diverse cultural and
socio-economic backgrounds. My goal after retirement is to continue to provide financial
literacy advice to my community on a more personal level.
I am a proud husband and father to 4 lovely kids. In my spare time, I enjoy long walks,
playing golf, and spending time with my family.
</p>
</div>
<div class="about-mvc">
<div class="about-blurb">
Expand Down Expand Up @@ -286,8 +284,8 @@ <h2>Comment</h2>
<span class="footer-copyright">JN Consuslting & Financial Planning Services &copy;</span>
</div>
</div>
<script src="./JavaScript/index.js"></script>
<script src="./JavaScript/navbar.js"></script>
<script src="./JavaScript/contact.js"></script>
<script src="./JavaScript/index.js?v=1.0"></script>
<script src="./JavaScript/navbar.js?v=1.0"></script>
<script src="./JavaScript/contact.js?v=1.1"></script>
</body>
</html>

0 comments on commit 08f45e5

Please sign in to comment.