summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRene Ae <aehtyb@gmail.com>2015-11-21 21:47:42 -0600
committerRene Ae <aehtyb@gmail.com>2015-11-21 21:47:42 -0600
commitacb2ba68247ca6272513d6a27ec3f13f49558cb4 (patch)
tree328cdef41ad977683a4c10958746fbf7eac457a1
parentf62909aee15d596a1ca9fba9430e1c72b07d92e2 (diff)
flex stuff on signup
-rw-r--r--StoneIsland/www/css/account.css21
-rw-r--r--StoneIsland/www/css/products.css4
-rw-r--r--StoneIsland/www/index.html95
-rw-r--r--StoneIsland/www/js/lib/auth/LoginView.js2
-rw-r--r--StoneIsland/www/js/lib/auth/SignupView.js2
5 files changed, 72 insertions, 52 deletions
diff --git a/StoneIsland/www/css/account.css b/StoneIsland/www/css/account.css
index 9876b3c5..41f6b413 100644
--- a/StoneIsland/www/css/account.css
+++ b/StoneIsland/www/css/account.css
@@ -216,14 +216,24 @@ input.switch:checked + label:after {
}
.container-fill {
+ min-height:40px;
flex: 1;
align-items: center;
justify-content: center;
position:relative;
}
+.container-row .container-message {
+ color:#000;
+ text-align:center;
+ width:calc(100vw - 10px);
+ box-sizing:border-box;
+ margin:12px auto;
+ position:relative
+
+}
-.container-message {
+.container-fill .container-message {
font-size:12px;
letter-spacing:0.5px;
text-align:center;
@@ -233,8 +243,11 @@ input.switch:checked + label:after {
width:100%;
-webkit-transform: translateX(-50%) translateY(-50%);
transform: translateX(-50%) translateY(-50%);
+ color:#000;
}
+
+
.premessage {
top:calc(50% - 20px)!important;
}
@@ -252,7 +265,7 @@ input.switch:checked + label:after {
width:calc(100vw - 10px);
display:table;
box-sizing:border-box;
- margin:5px auto 0;
+ margin:0 auto 5px;
}
.checkbox-toggle {
@@ -278,6 +291,10 @@ input.switch:checked + label:after {
box-sizing:border-box;
}
+.checkbox-row:first-child {
+ margin:0;
+}
+
.checkbox-toggle label {
position:absolute;
diff --git a/StoneIsland/www/css/products.css b/StoneIsland/www/css/products.css
index 59218d33..6ab9d0bd 100644
--- a/StoneIsland/www/css/products.css
+++ b/StoneIsland/www/css/products.css
@@ -74,7 +74,7 @@
}
.product .product-header {
- font-size:13px;
+ font-size:14px;
margin:18px 0 0;
max-width:60%;
position:relative;
@@ -106,7 +106,7 @@
.product .type {
display:table-cell;
- font-size:13px;
+ font-size:14px;
}
.product .size {
diff --git a/StoneIsland/www/index.html b/StoneIsland/www/index.html
index 17b5c14d..1e2f47c8 100644
--- a/StoneIsland/www/index.html
+++ b/StoneIsland/www/index.html
@@ -318,58 +318,61 @@
<div class="scroll">
<h1>NEW USER</h1>
<form>
- <input type="text" name="Name" placeholder="FIRST NAME" required>
- <input type="text" name="Surname" placeholder="LAST NAME" required>
- <input type="email" name="Email" placeholder="EMAIL ADDRESS" required>
- <input type="email" name="ConfirmEmail" placeholder="CONFIRM EMAIL ADDRESS" required>
- <input type="date" name="Birthday" placeholder="BIRTHDAY" required>
-
- <div class="select-wrapper">
- <span>GENDER</span>
- <select name="Gender">
- <option value="NONE">Gender</option>
- <option value="M">Male</option>
- <option value="F">Female</option>
- </select>
- </div>
+ <div class="container">
+ <div class="container-row">
+ <input type="text" name="Name" placeholder="FIRST NAME" required>
+ <input type="text" name="Surname" placeholder="LAST NAME" required>
+ <input type="email" name="Email" placeholder="EMAIL ADDRESS" required>
+ <input type="email" name="ConfirmEmail" placeholder="CONFIRM EMAIL ADDRESS" required>
+ <input type="date" name="Birthday" placeholder="BIRTHDAY" required>
- <h2>PASSWORD</h2>
- <input type="password" name="Password" placeholder="PASSWORD (7 CHARACTERS OR MORE)" required>
- <input type="password" name="Password2" placeholder="CONFIRM PASSWORD" required>
-
- <div class="checkbox-container">
- <div class="checkbox-row">
- <div class="checkbox-toggle">
- <input id="checkbox-data-profiling" type="checkbox" name="DataProfiling" value="true" required>
- <label for="checkbox-data-profiling"></label>
- </div>
- <label class="checkbox-caption" for="checkbox-data-profiling">
- I agree that YOOX and SPORTSWEAR COMPANY may collect my personal information for marketing purposes (newsletters, news and promotions).
- </label>
+ <div class="select-wrapper">
+ <span>GENDER</span>
+ <select name="Gender">
+ <option value="NONE">Gender</option>
+ <option value="M">Male</option>
+ <option value="F">Female</option>
+ </select>
</div>
- <div class="checkbox-row">
- <div class="checkbox-toggle">
- <input type="checkbox" id="checkbox-shopping-data-profiling" name="DataProfiling2" value="true" required>
- <label for="checkbox-shopping-data-profiling"></label>
- </div>
- <label class="checkbox-caption" for="checkbox-shopping-data-profiling">
- I agree that YOOX NET-A-PORTER GROUP and SPORTSWEAR COMPANY may collect my personal information for creating a profile of my shopping habits.
- </label>
+ <h2>PASSWORD</h2>
+ <input type="password" name="Password" placeholder="PASSWORD (7 CHARACTERS OR MORE)" required>
+ <input type="password" name="Password2" placeholder="CONFIRM PASSWORD" required>
</div>
- <div class="privacy-msg">
- Consult our <u>PRIVACY POLICY</u> for further information.
+ <div class="container-row">
+ <div class="container-message">
+
+ <span class="msg">
+ * Your personal and payment<br>
+ information will always remain private
+ </span>
+ </div>
</div>
- </div>
-
- <div class="container-fill">
- <div class="container-message">
- <span class="msg">
- * Your personal and payment<br>
- information will always remain private
- </span>
+ <div class="container-row">
+ <div class="checkbox-container">
+ <div class="checkbox-row">
+ <div class="checkbox-toggle">
+ <input id="checkbox-data-profiling" type="checkbox" name="DataProfiling" value="true" required>
+ <label for="checkbox-data-profiling"></label>
+ </div>
+ <label class="checkbox-caption" for="checkbox-data-profiling">
+ I agree that YOOX and SPORTSWEAR COMPANY may collect my personal information for marketing purposes (newsletters, news and promotions).
+ </label>
+ </div>
+ <div class="checkbox-row">
+ <div class="checkbox-toggle">
+ <input type="checkbox" id="checkbox-shopping-data-profiling" name="DataProfiling2" value="true" required>
+ <label for="checkbox-shopping-data-profiling"></label>
+ </div>
+ <label class="checkbox-caption" for="checkbox-shopping-data-profiling">
+ I agree that YOOX NET-A-PORTER GROUP and SPORTSWEAR COMPANY may collect my personal information for creating a profile of my shopping habits.
+ </label>
+ </div>
+ <div class="privacy-msg">
+ Consult our <u>PRIVACY POLICY</u> for further information.
+ </div>
+ </div>
</div>
</div>
-
</form>
</div>
</div>
diff --git a/StoneIsland/www/js/lib/auth/LoginView.js b/StoneIsland/www/js/lib/auth/LoginView.js
index 1e0f3b7a..86cf7159 100644
--- a/StoneIsland/www/js/lib/auth/LoginView.js
+++ b/StoneIsland/www/js/lib/auth/LoginView.js
@@ -18,7 +18,7 @@ var LoginView = FormView.extend({
show: function(){
app.footer.show("SUBMIT", "CANCEL")
this.$form.get(0).reset()
- this.$msg.html("* Your personal and payment information will always remain private")
+ this.$msg.html("* Your personal and payment<br />information will always remain private")
document.body.className = "login"
},
diff --git a/StoneIsland/www/js/lib/auth/SignupView.js b/StoneIsland/www/js/lib/auth/SignupView.js
index b7095a98..71d3c8d0 100644
--- a/StoneIsland/www/js/lib/auth/SignupView.js
+++ b/StoneIsland/www/js/lib/auth/SignupView.js
@@ -18,7 +18,7 @@ var SignupView = FormView.extend({
show: function(){
app.footer.show("SUBMIT", "CANCEL")
this.$form.get(0).reset()
- this.$msg.html("* Your personal and payment information will always remain private")
+ this.$msg.html("* Your personal and payment<br />information will always remain private")
document.body.className = "signup"
},