From 66fb953591d5fc0c23c3d66c52503885afaf47c2 Mon Sep 17 00:00:00 2001
From: Steffen van Bergerem <svbergerem@online.de>
Date: Mon, 5 Oct 2015 13:21:53 +0200
Subject: [PATCH] Move registration.scss

---
 app/assets/stylesheets/_application.scss      |  2 +-
 .../stylesheets/new_styles/_registration.scss | 52 -------------------
 app/assets/stylesheets/registration.scss      | 52 +++++++++++++++++++
 app/views/registrations/_form.haml            |  7 ++-
 app/views/simple_captcha/_simple_captcha.haml |  2 +-
 5 files changed, 59 insertions(+), 56 deletions(-)
 delete mode 100644 app/assets/stylesheets/new_styles/_registration.scss
 create mode 100644 app/assets/stylesheets/registration.scss

diff --git a/app/assets/stylesheets/_application.scss b/app/assets/stylesheets/_application.scss
index bcfe25d13..5e9fc9575 100644
--- a/app/assets/stylesheets/_application.scss
+++ b/app/assets/stylesheets/_application.scss
@@ -27,7 +27,7 @@
 
 /* login */
 @import 'login';
-@import 'new_styles/registration';
+@import 'registration';
 @import 'forms';
 
 /* terms */
diff --git a/app/assets/stylesheets/new_styles/_registration.scss b/app/assets/stylesheets/new_styles/_registration.scss
deleted file mode 100644
index 170bab40d..000000000
--- a/app/assets/stylesheets/new_styles/_registration.scss
+++ /dev/null
@@ -1,52 +0,0 @@
-#registration {
-  .ball {
-    height: 633px;
-    max-width: 100%;
-    background: image-url("branding/ball.png") no-repeat;
-    background-size: contain;
-  }
-
-  .v-center {
-    display: table;
-    height: 633px;
-
-    .content {
-      display: table-cell;
-      vertical-align: middle;
-
-      #pod-name {
-        text-align: center;
-        margin: 12px;
-        font-size : 35px;
-      }
-    }
-  }
-
-  form {
-    max-width: 400px;
-
-    .captcha_img {
-      position: absolute;
-      left: 10px;
-      width: 120px;
-      top: 169px;
-    }
-
-    #user_captcha {
-      font-size: 16px;
-      height: 40px;
-      padding: 10px 10px 10px 130px;
-      line-height: $line-height-base;
-      box-sizing: border-box;
-      width: 100%;
-      border-bottom: 1px solid $border-grey;
-      border-bottom-left-radius: 5px;
-      border-bottom-right-radius: 5px;
-    }
-
-    #terms > a {
-      color: inherit;
-      text-decoration: underline;
-    }
-  }
-}
diff --git a/app/assets/stylesheets/registration.scss b/app/assets/stylesheets/registration.scss
new file mode 100644
index 000000000..6a98cbc8b
--- /dev/null
+++ b/app/assets/stylesheets/registration.scss
@@ -0,0 +1,52 @@
+.page-registrations.action-new {
+  .ball {
+    background: image-url('branding/ball.png') no-repeat;
+    background-size: contain;
+    height: 633px;
+    max-width: 100%;
+  }
+
+  .v-center {
+    display: table;
+    height: 633px;
+  }
+
+  .content {
+    display: table-cell;
+    vertical-align: middle;
+
+    h2 {
+      font-size: 35px;
+      margin: 12px;
+      text-align: center;
+    }
+  }
+
+  form {
+    max-width: 400px;
+  }
+
+  .captcha-img {
+    left: 10px;
+    position: absolute;
+    top: 169px;
+    width: 120px;
+  }
+
+  .captcha-input {
+    border-bottom: 1px solid $border-grey;
+    border-bottom-left-radius: 5px;
+    border-bottom-right-radius: 5px;
+    box-sizing: border-box;
+    font-size: 16px;
+    height: 40px;
+    line-height: $line-height-base;
+    padding: 10px 10px 10px 130px;
+    width: 100%;
+  }
+
+  .terms > a {
+    color: inherit;
+    text-decoration: underline;
+  }
+}
diff --git a/app/views/registrations/_form.haml b/app/views/registrations/_form.haml
index 407ccb1fe..06c9b9099 100644
--- a/app/views/registrations/_form.haml
+++ b/app/views/registrations/_form.haml
@@ -46,12 +46,15 @@
                        aria:        {labelledby: "passwordConfirmationLabel"}
 
     - if AppConfig.settings.captcha.enable?
-      = show_simple_captcha object: 'user', :code_type => 'numeric', input_html: {class: "form-control"}
+      = show_simple_captcha object: "user",
+                            code_type: "numeric",
+                            class: "simple-captcha-image",
+                            input_html: {class: "form-control captcha-input"}
 
     = invite_hidden_tag(invite)
 
   - if AppConfig.settings.terms.enable?
-    %p#terms.text-center
+    %p.terms.text-center#terms
       = t('registrations.new.terms', terms_link: link_to(t('registrations.new.terms_link'), terms_path, target: "_blank")).html_safe
 
   = f.submit t('registrations.new.sign_up'), class: "btn btn-block btn-large btn-default", data: {disable_with: t('registrations.new.submitting')}
diff --git a/app/views/simple_captcha/_simple_captcha.haml b/app/views/simple_captcha/_simple_captcha.haml
index f8adfb468..e0ff398bf 100644
--- a/app/views/simple_captcha/_simple_captcha.haml
+++ b/app/views/simple_captcha/_simple_captcha.haml
@@ -1,3 +1,3 @@
-.captcha_img
+.captcha-img
   = simple_captcha_options[:image]
 = simple_captcha_options[:field]