From 747541908e909576a6ac58f1a110a8d6520eafd1 Mon Sep 17 00:00:00 2001
From: Carlos Coêlho <carlos@pencillabs.com>
Date: Wed, 27 Apr 2016 12:08:27 -0300
Subject: [PATCH] Refactored login modal

---
 src/app/login/login.html | 12 +++++++++---
 src/app/login/login.scss | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/languages/en.json    |  8 ++++++--
 src/languages/pt.json    |  8 ++++++--
 4 files changed, 76 insertions(+), 7 deletions(-)
 create mode 100644 src/app/login/login.scss

diff --git a/src/app/login/login.html b/src/app/login/login.html
index 672d9b4..d5debe0 100644
--- a/src/app/login/login.html
+++ b/src/app/login/login.html
@@ -18,11 +18,16 @@
         </label>
       </div>
       <div class="pull-right">
-        <a href="">{{"auth.form.forgotPasswd" | translate}}</a>
+        <a data-dismiss="modal-dialog">{{"auth.form.forgotPasswd" | translate}}</a>
       </div>
     </div>
     <button type="submit" class="btn btn-default btn-block" ng-click="vm.login()">{{"auth.form.login_button" | translate}}</button>
   </form>
+  <div class="strike">
+    <span>
+      {{"auth.social.alternative" | translate}}
+    </span>
+  </div>
   <div class="text-center">
     <span>{{"auth.social.connectWith" | translate}}</span>
 
@@ -40,7 +45,8 @@
         <i class="fa fa-google-plus fa-stack-1x fa-inverse"></i>
       </span>
     </div>
-
-    <a href="">{{"auth.createAccount" | translate}}</a>
+    <div id="create-account">
+      <a href="">{{"auth.createAccount" | translate}}</a>
+    </div>
   </div>
 </div>
diff --git a/src/app/login/login.scss b/src/app/login/login.scss
new file mode 100644
index 0000000..d526c1c
--- /dev/null
+++ b/src/app/login/login.scss
@@ -0,0 +1,55 @@
+.modal-content{
+  padding: 40px;
+}
+.modal-header {
+  border-bottom: 0;
+  text-align: center;
+}
+form {
+  margin-bottom: 30px;
+}
+form button {
+  margin-top: 20px;
+  text-transform: uppercase;
+}
+.strike {
+  display: block;
+  text-align: center;
+  overflow: hidden;
+  white-space: nowrap;
+  padding: 25px 0;
+}
+
+.strike > span {
+  position: relative;
+  display: inline-block;
+}
+
+.strike > span:before,
+.strike > span:after {
+  content: "";
+  position: absolute;
+  top: 50%;
+  width: 9999px;
+  height: 1px;
+  background: black;
+}
+
+.strike > span:before {
+  right: 100%;
+  margin-right: 15px;
+}
+
+.strike > span:after {
+  left: 100%;
+  margin-left: 15px;
+}
+.strike span {
+  text-transform: uppercase;
+}
+#oauth-block span {
+  margin: 5px;
+}
+#create-account {
+  padding: 30px 0 0;
+}
diff --git a/src/languages/en.json b/src/languages/en.json
index 00071c2..0b7344a 100644
--- a/src/languages/en.json
+++ b/src/languages/en.json
@@ -20,14 +20,18 @@
   "activities.create_article.description": "has published on",
   "activities.add_member_in_community.description": "has joined the community",
   "activities.new_friendship.description": "has made {friends, plural, one{one new friend} other{# new friends}}:",
-  "auth.title": "Login",
-  "auth.form.login": "Login / Email address",
+  "auth.title": "Great to have you back!",
+  "auth.form.login": "Username or Email address",
   "auth.form.password": "Password",
   "auth.form.keepLoggedIn": "Keep me logged in",
   "auth.form.forgotPasswd": "Forgot your password?",
   "auth.form.login_button": "Login",
+  "auth.social.alternative": "Or",
   "auth.social.connectWith": "Connect with:",
   "auth.createAccount": "Create account",
+  "forgotPwd.title": "Forgot your password?",
+  "forgotPwd.sendInstructions": "Send Instructions",
+  "forgotPwd.info": "Upon clicking on the button above, you'll receive an email with instructions on how to create a new password.",
   "navbar.content_viewer_actions.new_item": "New Item",
   "navbar.profile_actions.new_item": "New Item",
   "navbar.content_viewer_actions.new_post": "New Post",
diff --git a/src/languages/pt.json b/src/languages/pt.json
index 8710759..923e6a7 100644
--- a/src/languages/pt.json
+++ b/src/languages/pt.json
@@ -20,14 +20,18 @@
   "activities.create_article.description": "publicou em",
   "activities.add_member_in_community.description": "entrou na comunidade",
   "activities.new_friendship.description": "fez {friends, plural, one{um novo amigo} other{# novos amigos}}:",
-  "auth.title": "Login",
-  "auth.form.login": "Login / Email",
+  "auth.title": "Legal ter você de volta!",
+  "auth.form.login": "Nome de usuário ou Email",
   "auth.form.password": "Senha",
   "auth.form.keepLoggedIn": "Continuar logado",
   "auth.form.forgotPasswd": "Esqueceu sua senha?",
   "auth.form.login_button": "Login",
+  "auth.social.alternative": "Ou",
   "auth.social.connectWith": "Conectar com:",
   "auth.createAccount": "Criar conta",
+  "forgotPwd.title": "Esqueceu sua senha?",
+  "forgotPwd.sendInstructions": "Enviar Instruções",
+  "forgotPwd.info": "Ao clicar no botão acima, você receberá um email com instruções para criar uma nova senha.",
   "navbar.content_viewer_actions.new_item": "Novo Item",
   "navbar.profile_actions.new_item": "Novo Item",
   "navbar.content_viewer_actions.new_post": "Novo Artigo",
--
libgit2 0.21.2