Merge pull request #68 from nomasi/master

Lotsa small changes here and there. Mostly text.
SizeMeCom · Aug 17, 2017 · 7e89e08 · 7e89e08
2 parents e0838f3 + f3b31a9
commit 7e89e08
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 28 deletions.
diff --git a/kookenka.html b/kookenka.html
@@ -74,7 +74,7 @@
             itemLayer: 1,
             itemThickness: 1,
             itemStretch:	0,
-            fitRecommendation: 1028,
+            fitRecommendation: 1031,
             measurements: {
                 "17": {
                     "chest": 0,
@@ -94,7 +94,7 @@
                     "knee_width": 0,
                     "calf_width": 0,
                     "pant_sleeve_width": 0,
-                    "shoe_inside_length": 256,
+                    "shoe_inside_length": 250,
                     "shoe_inside_width": 0,
                     "hat_width": 0,
                     "hood_height": 0,
@@ -117,7 +117,7 @@
                     "knee_width": 0,
                     "calf_width": 0,
                     "pant_sleeve_width": 0,
-                    "shoe_inside_length": 266,
+                    "shoe_inside_length": 257,
                     "shoe_inside_width": 0,
                     "hat_width": 0,
                     "hood_height": 0,
@@ -140,7 +140,7 @@
                     "knee_width": 0,
                     "calf_width": 0,
                     "pant_sleeve_width": 0,
-                    "shoe_inside_length": 276,
+                    "shoe_inside_length": 263,
                     "shoe_inside_width": 0,
                     "hat_width": 0,
                     "hood_height": 0,
@@ -163,7 +163,7 @@
                     "knee_width": 0,
                     "calf_width": 0,
                     "pant_sleeve_width": 0,
-                    "shoe_inside_length": 286,
+                    "shoe_inside_length": 270,
                     "shoe_inside_width": 0,
                     "hat_width": 0,
                     "hood_height": 0,
@@ -186,7 +186,7 @@
                     "knee_width": 0,
                     "calf_width": 0,
                     "pant_sleeve_width": 0,
-                    "shoe_inside_length": 296,
+                    "shoe_inside_length": 276,
                     "shoe_inside_width": 0,
                     "hat_width": 0,
                     "hood_height": 0,
@@ -209,7 +209,7 @@
                     "knee_width": 0,
                     "calf_width": 0,
                     "pant_sleeve_width": 0,
-                    "shoe_inside_length": 306,
+                    "shoe_inside_length": 283,
                     "shoe_inside_width": 0,
                     "hat_width": 0,
                     "hood_height": 0,
@@ -220,6 +220,22 @@
 
 </script>
 
+<style>
+.sizeme-signup-box {
+	background-color: #f4f4f4 !important;
+	border: 1px solid #e3e3e3 !important;
+}
+.sizeme-signup-box .signup-email {
+	border: 1px solid #e3e3e3 !important;
+}
+
+.sizeme-signup-box .signup-email a[disabled] {
+	background-color: #e3e3e3 !important;
+	color: #1b1a19 !important;
+}
+
+</style>
+
 <script type="text/javascript">
 //<![CDATA[
 Mage.Cookies.path     = '/';

diff --git a/src/SizeMeApp.jsx b/src/SizeMeApp.jsx
@@ -12,7 +12,6 @@ import "./SizeMeApp.scss";
 import uiOptions from "./api/uiOptions";
 import ProfileMenu from "./common/ProfileMenu";
 import { trackEvent } from "./api/ga";
-import FitTooltip from "./common/FitTooltip";
 
 class SizeMeApp extends React.Component {
     constructor (props) {
@@ -96,7 +95,6 @@ class SizeMeApp extends React.Component {
                                                         onSignup={onSignup}
                                                         signupStatus={signupStatus}/>}
                     {resolved && !uiOptions.disableSizeGuide && <SizeGuide/>}
-                    <FitTooltip/>
                 </div>
             );
         } else {

diff --git a/src/common/SizeForm.scss b/src/common/SizeForm.scss
@@ -172,7 +172,7 @@
     }
 
     .instruction-content {
-      font-size: smaller;
+      font-size: 90%;
     }
 
     .gender-male .female {

diff --git a/src/common/SizingBar.jsx b/src/common/SizingBar.jsx
@@ -83,7 +83,7 @@ class SizingBar extends React.Component {
         this.calculatePlaceholderSize();
         if (this.state.newSize) {
             if (!this.timeout) {
-                this.timeout = setTimeout(() => this.setState({ newSize: false }), 2000);
+                this.timeout = setTimeout(() => this.setState({ newSize: false }), 3000);
             }
         }
     }
@@ -107,7 +107,7 @@ class SizingBar extends React.Component {
             const containerWidth = this.placeholder.parentNode.offsetWidth - 10;
             this.placeholder.style.transform = "scale(1)";
             const placeholderWidth = this.placeholder.offsetWidth;
-            this.placeholder.style.transform = `scale(${Math.min(1.5, containerWidth / placeholderWidth)})`;
+            this.placeholder.style.transform = `scale(${Math.min(1, containerWidth / placeholderWidth)})`;
         }
     }
 

diff --git a/src/common/SizingBar.scss b/src/common/SizingBar.scss
@@ -8,10 +8,10 @@
   align-items: flex-end;
   background: url(../images/slider_bg_black_grid.svg) no-repeat bottom center;
   background-size: 100% 100%;
-  font-size: smaller;
+  font-size: 90%;
   margin: 5px 0 20px 0;
   position: relative;
-  top: 5px; 
+  top: 5px;
 
   .slider-placeholder {
     position: absolute;
@@ -76,7 +76,7 @@
 
   svg.recommendation {
 	bottom: 0;
-    width: 36px;	
+    width: 36px;
     path {
       fill: $recommendation_color;
       fill-opacity: 0.75;
@@ -102,7 +102,7 @@
     }
 
     .fit-area {
-      opacity: 0.3;
+      opacity: 0;
     }
   }
 

diff --git a/src/i18n/en.json b/src/i18n/en.json
@@ -6,7 +6,7 @@
     "shoppingFor": "Shopping for",
 	"sizingBarSplashNoFit": "Enter your measurements to find your size",
     "sizingBarSplashNoSize": "No size was found based on your measurement",
-    "sizingBarSplashMatch": "We selected size {{sizeName}} for you",
+    "sizingBarSplashMatch": "We recommend size {{sizeName}} for you",
     "sizingBarFitTooltip": "This indicates how size <strong>{{selectedSize}}</strong> will fit you",
     "sizingBarRecommendationTooltip": "We recommend that your fit is close to this area"
   },
@@ -109,7 +109,7 @@
     "sleeve": "Measure from your shoulder (where your shirt's seam usually is) down to your wrist (to the end of the radius bone to be exact). Keep your arm straight and pointing down while measuring.",
     "pant_waist": "Measure around your body from where you normally keep your pants, about 6 cm down from belly-button height.<br/><br/><b>Pull your stomach in</b> like you are fitting on a pair of tight pants.",
     "outseam": "Measure the outside of your leg starting from the top of your waistband (where you normally keep your pants) and measure down to your ankle bone (lateral malleolus to be exact).",
-    "shoe_inside_length": "Place a measuring tape next to a wall and stand on the tape.  Use thin socks or no socks at all.",
+    "shoe_inside_length": "Place a measuring tape next to a wall and stand on the tape with bare feet",
     "calf_width": "Measure around widest part of calf.",
     "hat_width": "Measure the biggest circumference of head at just above top of ears."
   },
@@ -142,8 +142,7 @@
       "Measure down to your ankle bone"
     ],
     "shoe_inside_length": [
-      "Place a measuring tape next to a wall and stand on the tape",
-      "Use thin socks or no socks at all"
+      "Place a measuring tape next to a wall and stand on the tape with bare feet"
     ],
     "calf_width": [
       "Measure around widest part of calf"
@@ -163,7 +162,7 @@
   "signupBox": {
     "duplicateUser": "An account with this email already exists. Try to log in?",  
 	"emailPlaceholder": "[email protected]",
-    "message": "Save your measurements, so you don't have to remember them ever again.",
+    "message": "Save your measurements using the SizeMe service",
 	"save": "Save",
     "signupPrompt": "Save with email"
   },

diff --git a/src/i18n/fi.json b/src/i18n/fi.json
@@ -6,7 +6,7 @@
     "shoppingFor": "Aktiivinen profiili",
 	"sizingBarSplashNoFit": "Syötä mittasi, niin suosittelemme sinulle oikean koon",
     "sizingBarSplashNoSize": "Valitse koko, niin näytämme miten se sopii sinulle",
-    "sizingBarSplashMatch": "Valitsimme sinulle koon {{sizeName}}",
+    "sizingBarSplashMatch": "Suosittelemme sinulle kokoa {{sizeName}}",
     "sizingBarFitTooltip": "Tämä näyttää miten koko <strong>{{selectedSize}}</strong> sopii sinulle",
     "sizingBarRecommendationTooltip": "Tämän tuotteen kohdalla suosittelemme tätä sopivuutta"
   },
@@ -72,8 +72,8 @@
     "kneeCircumference": "Polven ympärys",
     "ankleCircumference": "Nilkan ympärys",
     "calfCircumference": "Pohkeen ympärys",
-    "footLength": "Jalan pituus",
-    "footWidth": "Jalan leveys",
+    "footLength": "Jalkateräsi pituus",
+    "footWidth": "Jalkateräsi leveys",
     "headCircumference": "Pään ympärys"
   },  
   "measurement": {
@@ -109,7 +109,7 @@
     "sleeve": "Measure from your shoulder (where your shirt's seam usually is) down to your wrist (to the end of the radius bone to be exact). Keep your arm straight and pointing down while measuring.",
     "pant_waist": "Measure around your body from where you normally keep your pants, about 6 cm down from belly-button height.<br/><br/><b>Pull your stomach in</b> like you are fitting on a pair of tight pants.",
     "outseam": "Measure the outside of your leg starting from the top of your waistband (where you normally keep your pants) and measure down to your ankle bone (lateral malleolus to be exact).",
-    "shoe_inside_length": "Aseta mittanauha lattialle seinän viereen ja astu nauhan päälle.  Käytä ohuita sukkia tai ei sukkia ollenkaan.",
+    "shoe_inside_length": "Aseta mittanauha lattialle seinän viereen ja astu nauhan päälle paljain jaloin kantapää seinässä kiinni",
     "calf_width": "Measure around widest part of calf.",
     "hat_width": "Measure the biggest circumference of head at just above top of ears."
   },
@@ -142,8 +142,7 @@
       "Measure down to your ankle bone"
     ],
     "shoe_inside_length": [
-      "Aseta mittanauha lattialle seinän viereen ja astu nauhan päälle",
-      "Käytä ohuita sukkia tai ei sukkia ollenkaan"
+      "Aseta mittanauha lattialle seinän viereen ja astu nauhan päälle paljain jaloin kantapää seinässä kiinni"
     ],
     "calf_width": [
       "Measure around widest part of calf"
@@ -163,7 +162,7 @@
   "signupBox": {
     "duplicateUser": "Tili tällä sähköpostiosoitteella on jo olemassa.  Kirjaudu sisään siis!",  
 	"emailPlaceholder": "[email protected]",  
-    "message": "Tallenna mittasi niin sinun ei tarvitse muistaa niitä enää.",
+    "message": "Tallenna mittasi SizeMe-palveluun",
 	"save": "Tallenna",	
     "signupPrompt": "Tallenna sähköpostiosoitteella"
   },