Commit d8ac75a2 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

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
parents 8da8efb3 62d2aed0
app/assets/images/brand_logo.png

24.7 KB | W: | H:

app/assets/images/brand_logo.png

31.4 KB | W: | H:

app/assets/images/brand_logo.png
app/assets/images/brand_logo.png
app/assets/images/brand_logo.png
app/assets/images/brand_logo.png
  • 2-up
  • Swipe
  • Onion skin
...@@ -9,9 +9,9 @@ ...@@ -9,9 +9,9 @@
} }
.brand-image { .brand-image {
margin-bottom: 20px;
img { img {
width: 100%; max-width: 100%;
margin-bottom: 20px;
} }
} }
......
module AppearancesHelper module AppearancesHelper
def brand_item
nil
end
def brand_title def brand_title
'GitLab Community Edition' 'GitLab Community Edition'
end end
def brand_image def brand_image
image_tag 'brand_logo.png' nil
end end
def brand_text def brand_text
default_text =<<eos nil
### 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
end end
end end
...@@ -12,10 +12,22 @@ ...@@ -12,10 +12,22 @@
.content .content
.row .row
.col-md-7 .col-md-7
- if brand_item
.brand-image .brand-image
= brand_image = brand_image
.brand_text .brand_text
= 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 .col-md-5
= yield = yield
%hr %hr
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment