Use same login layout between CE and EE versions

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

4 files changed, 44 insertions, 11 deletions

diff --git a/app/assets/images/brand_logo.png b/app/assets/images/brand_logo.png
new file mode 100644
index 00000000000..1abd7d68d65
--- /dev/null
+++ b/app/assets/images/brand_logo.png
diff --git a/app/assets/stylesheets/sections/login.scss b/app/assets/stylesheets/sections/login.scss
index a78a9cd4879..b3c21a8917d 100644
--- a/app/assets/stylesheets/sections/login.scss
+++ b/app/assets/stylesheets/sections/login.scss
@@ -6,11 +6,18 @@
   }
 
   .login-box{
-    max-width: 304px;
     position: relative;
-    @include border-radius(5px);
     margin: auto;
-    background: white;
+    padding: 20px;
+    background: #f5f5f5;
+    border: 1px solid #EEE;
+  }
+
+  .brand-image {
+    margin-bottom:  20px;
+    img {
+      max-width: 100%;
+    }
   }
 
   .login-logo{
@@ -19,7 +26,7 @@
   }
 
   .form-control {
-    background-color: #f1f1f1;
+    background-color: #FFF;
     font-size: 16px;
     padding: 14px 10px;
     width: 100%;
diff --git a/app/helpers/brand_helper.rb b/app/helpers/brand_helper.rb
new file mode 100644
index 00000000000..103468a8ce3
--- /dev/null
+++ b/app/helpers/brand_helper.rb
@@ -0,0 +1,23 @@
+module BrandHelper
+  def brand_title
+    'GitLab Community Edition'
+  end
+
+  def brand_image
+    image_tag 'brand_logo.png'
+  end
+
+  def brand_text
+    default_text =<<eos
+### GitLab is open source software to collaborate on code.
+
+Manage git repositories with fine grained access controls that keep your code secure.
+Perform code reviews and enhance collaboration with merge requests.
+Each project can also have an issue tracker and a wiki.
+
+Used by more than 50,000 organizations, GitLab is the most popular solution to manage git repositories on-premises.
+Read more about GitLab at #{link_to "www.gitlab.com", "https://www.gitlab.com/", target: "_blank"}.
+eos
+    markdown default_text
+  end
+end
diff --git a/app/views/layouts/devise.html.haml b/app/views/layouts/devise.html.haml
index 36c682c48a6..2ae27c4b797 100644
--- a/app/views/layouts/devise.html.haml
+++ b/app/views/layouts/devise.html.haml
@@ -5,13 +5,16 @@
     = render "layouts/flash"
     .container
       .content
-        .center
-          %h1 GitLab
-          %p.light
-            GitLab is open source software to collaborate on code.
-            %br
-            Sign in or browse for #{link_to "public projects", public_projects_path}.
+        .login-title
+          %h1= brand_title
     %hr
     .container
       .content
-        = yield
+        .row
+          .col-sm-7
+            .brand-image
+              = brand_image
+            .brand_text
+              = brand_text
+          .col-sm-5
+            = yield