diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-07-13 19:46:13 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-07-13 19:46:13 +0000 |
| commit | d8ac75a28f003dcb769b036eff255bef6541fa55 (patch) | |
| tree | ce6b5b38481e31724c32595617ebe890d09c6732 /app/views | |
| parent | 8da8efb387cc62dd85fcb4abcb5a6197521303a5 (diff) | |
| parent | 62d2aed036ce0699eb494fb629983a5809f746a5 (diff) | |
| download | gitlab-ce-d8ac75a28f003dcb769b036eff255bef6541fa55.tar.gz | |
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
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/layouts/devise.html.haml | 20 |
1 files changed, 16 insertions, 4 deletions
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 |