Merge branch 'improve-login-page' into 'master'

Improve login page

* use max-width for brand logo to prevent stretch of small images
* improve default brand logo to be centred on any kind of screen
* hide logo for small screens
* hide text for xs screens
* reduce amount of text on sign-in page

Fixes #1423

See merge request !966

4 files changed, 24 insertions, 18 deletions

diff --git a/app/assets/images/brand_logo.png b/app/assets/images/brand_logo.png
index da459c1ec8a..09b1689ca45 100644
--- a/app/assets/images/brand_logo.png
+++ b/app/assets/images/brand_logo.png
diff --git a/app/assets/stylesheets/sections/login.scss b/app/assets/stylesheets/sections/login.scss
index 0763c682a92..54887b7c401 100644
--- a/app/assets/stylesheets/sections/login.scss
+++ b/app/assets/stylesheets/sections/login.scss
@@ -9,9 +9,9 @@
   }
 
   .brand-image {
-    margin-bottom:  20px;
     img {
-      width: 100%;
+      max-width: 100%;
+      margin-bottom:  20px;
     }
   }
 
diff --git a/app/helpers/appearances_helper.rb b/app/helpers/appearances_helper.rb
index b6a76f9aa65..96e5d43a369 100644
--- a/app/helpers/appearances_helper.rb
+++ b/app/helpers/appearances_helper.rb
@@ -1,23 +1,17 @@
 module AppearancesHelper
+  def brand_item
+    nil
+  end
+
   def brand_title
     'GitLab Community Edition'
   end
 
   def brand_image
-    image_tag 'brand_logo.png'
+    nil
   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 100,000 organizations, GitLab is the most popular solution to manage git repositories on-premises.
-Read more about GitLab at [about.gitlab.com](https://about.gitlab.com/).
-eos
-    markdown default_text
+    nil
   end
 end
diff --git a/app/views/layouts/devise.html.haml b/app/views/layouts/devise.html.haml
index 43ee4bbbb4b..ff27fcc0f40 100644
--- a/app/views/layouts/devise.html.haml
+++ b/app/views/layouts/devise.html.haml
@@ -12,10 +12,22 @@
       .content
         .row
           .col-md-7
-            .brand-image
-              = brand_image
-            .brand_text
-              = brand_text
+            - if brand_item
+              .brand-image
+                = brand_image
+              .brand_text
+                = brand_text
+            - else
+              .brand-image.hidden-sm.hidden-xs
+                = image_tag 'brand_logo.png'
+              .brand_text.hidden-xs
+                %h2 Open source software to collaborate on code
+
+                %p.lead
+                  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.
+
           .col-md-5
             = yield
     %hr