diff options
author | Bryce Johnson <bryce@gitlab.com> | 2016-10-19 14:40:58 +0200 |
---|---|---|
committer | Bryce Johnson <bryce@gitlab.com> | 2016-10-20 21:57:34 +0200 |
commit | 57046eb0abf280594d6625db3429f13d45499c83 (patch) | |
tree | 7e56d94e0d0a37b4c04e06cd17cf4351cfd3d3d1 /app/assets/stylesheets/pages/login.scss | |
parent | 60eca5f7b5e38c09c8170682852c497c410a96ac (diff) | |
download | gitlab-ce-57046eb0abf280594d6625db3429f13d45499c83.tar.gz |
Ensure custom provider tab labels don't break layout.ldap-login-styles
(Also fix some issues for session views on small screens.)
Diffstat (limited to 'app/assets/stylesheets/pages/login.scss')
-rw-r--r-- | app/assets/stylesheets/pages/login.scss | 34 |
1 files changed, 33 insertions, 1 deletions
diff --git a/app/assets/stylesheets/pages/login.scss b/app/assets/stylesheets/pages/login.scss index bdb13bee178..9496234c773 100644 --- a/app/assets/stylesheets/pages/login.scss +++ b/app/assets/stylesheets/pages/login.scss @@ -143,6 +143,7 @@ &:not(.active) { background-color: $gray-light; + border-left: 1px solid $border-color; } a { @@ -170,6 +171,31 @@ } } + // Ldap configurations may need more tabs & the tab labels are user generated (arbitrarily long). + // These styles prevent this from breaking the layout, and only applied when providers are configured. + + .new-session-tabs.custom-provider-tabs { + flex-wrap: wrap; + + li { + min-width: 85px; + flex-basis: auto; + + // This styles tab elements that have wrapped to a second line. We cannot easily predict when this will happen. + // We are making somewhat of an assumption about the configuration here: that users do not have more than + // 3 LDAP servers configured (in addition to standard login) and they are not using especially long names for any + // of them. If either condition is false, this will work as expected. If both are true, there may be a missing border + // above one of the bottom row elements. If you know a better way, please implement it! + &:nth-child(n+5) { + border-top: 1px solid $border-color; + } + } + + a { + font-size: 16px; + } + } + .form-control { &:active, &:focus { @@ -203,6 +229,7 @@ .login-page { .col-sm-5.pull-right { float: none !important; + margin-bottom: 45px; } } } @@ -244,7 +271,11 @@ } .navless-container { - padding: 65px; // height of footer + bottom padding of email confirmation link + padding: 65px 15px; // height of footer + bottom padding of email confirmation link + + @media (max-width: $screen-xs-max) { + padding: 0 15px 65px; + } } } @@ -263,3 +294,4 @@ bottom: 0; } } + |