diff --git a/css/appstyling-v2.css b/css/appstyling-v2.css
index 5291d73..fd829d0 100644
--- a/css/appstyling-v2.css
+++ b/css/appstyling-v2.css
@@ -40,6 +40,9 @@ a {
text-decoration: none;
}
+.b-container {
+ overflow: hidden;
+}
.b-header{
height: 24vh;
@@ -211,6 +214,30 @@ p.subheading {
}
+input.input-needed45{
+ border: 2px solid #0000FF;
+}
+
+input.input-needed35{
+ border: 2px solid #FFFF00;
+}
+
+input.input-needed25{
+ border: 2px solid #008000;
+}
+
+input.input-needed10{
+ border: 2px solid #FFFFFF;
+}
+
+input.input-needed5{
+ border: 2px solid #0000FF;
+}
+
+input.input-needed2{
+ border: 2px solid #008000;
+}
+
.b-calulatorinputs__weightinput{
display: inline-block;
text-align: center;
@@ -307,8 +334,8 @@ input.input-calculate:focus{
position: absolute;
top: 50%;
right: 25%;
- transform: translate(50%, -32%);
- -webkit-transform: translate(50%, -32%);
+ transform: translate(50%, -44%);
+ -webkit-transform: translate(50%, -44%);
color: #808285;
font-family: "Zilla Slab";
font-size: 14px;
@@ -319,6 +346,7 @@ input.input-calculate:focus{
background:none;
border:none;
margin:0;
+ padding: 5px 5px;
}
diff --git a/images/.DS_Store b/images/.DS_Store
index 5008ddf..8c15376 100644
Binary files a/images/.DS_Store and b/images/.DS_Store differ
diff --git a/images/10lbs-Plate.svg b/images/10lbs-Plate.svg
index ab89558..e05511d 100644
--- a/images/10lbs-Plate.svg
+++ b/images/10lbs-Plate.svg
@@ -3,12 +3,17 @@
10lbs-Plate
Created with Sketch.
-
+
+
+
-
+
-
-
+
+
+
+
+
diff --git a/images/25lbs-Plate.svg b/images/25lbs-Plate.svg
index be7b8bf..66a8045 100644
--- a/images/25lbs-Plate.svg
+++ b/images/25lbs-Plate.svg
@@ -5,9 +5,9 @@
Created with Sketch.
-
+
-
+
diff --git a/images/2halflbs-Plate.svg b/images/2halflbs-Plate.svg
index 703435a..7f2ab65 100644
--- a/images/2halflbs-Plate.svg
+++ b/images/2halflbs-Plate.svg
@@ -5,19 +5,13 @@
Created with Sketch.
-
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
diff --git a/images/35lbs-Plate.svg b/images/35lbs-Plate.svg
index bb5dc49..9ea65df 100644
--- a/images/35lbs-Plate.svg
+++ b/images/35lbs-Plate.svg
@@ -5,10 +5,10 @@
Created with Sketch.
-
+
-
-
+
+
diff --git a/images/45lbs-Plate.svg b/images/45lbs-Plate.svg
index 7deabc0..764adfe 100644
--- a/images/45lbs-Plate.svg
+++ b/images/45lbs-Plate.svg
@@ -5,9 +5,9 @@
Created with Sketch.
-
+
-
+
diff --git a/images/5lbs-Plate.svg b/images/5lbs-Plate.svg
index 0a420b5..c814059 100644
--- a/images/5lbs-Plate.svg
+++ b/images/5lbs-Plate.svg
@@ -5,11 +5,11 @@
Created with Sketch.
-
+
-
-
-
+
+
+
diff --git a/images/black-weights/10lbs-Plate.svg b/images/black-weights/10lbs-Plate.svg
new file mode 100644
index 0000000..ab89558
--- /dev/null
+++ b/images/black-weights/10lbs-Plate.svg
@@ -0,0 +1,18 @@
+
+
\ No newline at end of file
diff --git a/images/black-weights/25lbs-Plate.svg b/images/black-weights/25lbs-Plate.svg
new file mode 100644
index 0000000..be7b8bf
--- /dev/null
+++ b/images/black-weights/25lbs-Plate.svg
@@ -0,0 +1,18 @@
+
+
\ No newline at end of file
diff --git a/images/black-weights/2halflbs-Plate.svg b/images/black-weights/2halflbs-Plate.svg
new file mode 100644
index 0000000..703435a
--- /dev/null
+++ b/images/black-weights/2halflbs-Plate.svg
@@ -0,0 +1,25 @@
+
+
\ No newline at end of file
diff --git a/images/black-weights/35lbs-Plate.svg b/images/black-weights/35lbs-Plate.svg
new file mode 100644
index 0000000..bb5dc49
--- /dev/null
+++ b/images/black-weights/35lbs-Plate.svg
@@ -0,0 +1,18 @@
+
+
\ No newline at end of file
diff --git a/images/black-weights/45lbs-Plate.svg b/images/black-weights/45lbs-Plate.svg
new file mode 100644
index 0000000..7deabc0
--- /dev/null
+++ b/images/black-weights/45lbs-Plate.svg
@@ -0,0 +1,18 @@
+
+
\ No newline at end of file
diff --git a/images/black-weights/5lbs-Plate.svg b/images/black-weights/5lbs-Plate.svg
new file mode 100644
index 0000000..0a420b5
--- /dev/null
+++ b/images/black-weights/5lbs-Plate.svg
@@ -0,0 +1,17 @@
+
+
\ No newline at end of file
diff --git a/js/Weight Calculation Script-Edited-Jquery-V4.js b/js/Weight Calculation Script-Edited-Jquery-V4.js
index 2fe665f..73a2318 100644
--- a/js/Weight Calculation Script-Edited-Jquery-V4.js
+++ b/js/Weight Calculation Script-Edited-Jquery-V4.js
@@ -112,7 +112,11 @@
//animates plates off
animatePlatesOut();
//updates plates
- jQuery(".b-platevisual__plates").html(weighthtml);
+ // jQuery(".b-platevisual__plates").html(weighthtml);
+ //updates plates - v2
+ setTimeout(function(){
+ jQuery(".b-platevisual__plates").html(weighthtml);
+ }, 500);
//animates plates back on
setTimeout(animatePlatesIn, 500);
} else {
@@ -141,7 +145,7 @@
// The optional number (800) specifies the number of milliseconds it takes to scroll to the specified area
$('html, body').animate({
scrollTop: $(hash).offset().top
- }, 500, function(){
+ }, 800, function(){
// Add hash (#) to URL when done scrolling (default click behavior)
window.location.hash = hash;
@@ -185,7 +189,7 @@
function restoreScroll(){
jQuery("html, body").animate({
scrollTop: savedScrollTop
- }, 250).offset().top;
+ }, 500).offset().top;
}
//jQuery event watching