diff options
Diffstat (limited to 'web/sass-files/sass')
-rw-r--r-- | web/sass-files/sass/partials/_activity-log.scss | 3 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_signup.scss | 78 |
2 files changed, 72 insertions, 9 deletions
diff --git a/web/sass-files/sass/partials/_activity-log.scss b/web/sass-files/sass/partials/_activity-log.scss index 36eb48750..3f0c3090d 100644 --- a/web/sass-files/sass/partials/_activity-log.scss +++ b/web/sass-files/sass/partials/_activity-log.scss @@ -28,4 +28,7 @@ .report__info { color: #999; } +} +.session-help-text { + padding: 20px 20px 5px 20px; }
\ No newline at end of file diff --git a/web/sass-files/sass/partials/_signup.scss b/web/sass-files/sass/partials/_signup.scss index db22718d2..5996306d2 100644 --- a/web/sass-files/sass/partials/_signup.scss +++ b/web/sass-files/sass/partials/_signup.scss @@ -8,7 +8,6 @@ padding: 100px 0px 50px 0px; max-width: 380px; margin: 0 auto; - font-size: 1.1em; position: relative; h1, h2, h3, h4, h5, h6, p { line-height: 1.3; @@ -17,15 +16,18 @@ font-weight: 600; margin-bottom: 0.5em; letter-spacing: -0.5px; - font-size: em(28px); + font-size: em(30px); } h3 { font-weight: 600; margin: 0 0 1.3em 0; - font-size: 1.4em; + font-size: 1.5em; + &.extra-margin { + margin-bottom: 2.5em; + } } h4 { - font-size: em(18px); + font-size: em(20px); font-weight: 600; margin-bottom: 1em; &.text--light { @@ -44,6 +46,11 @@ form { margin-bottom: 0.8em; } + .form__hint { + font-size: 0.95em; + color: #999; + margin: 10px 0; + } .external-link { position: absolute; bottom: 0; @@ -61,10 +68,54 @@ .form-control { height: em(38px); } + .or__container { + height: 1px; + background: #dddddd; + text-align: center; + margin: 2em 0; + span { + width: 33px; + top: -10px; + position: relative; + font-size: em(16px); + line-height: 20px; + font-weight: 600; + background: #fff; + display: inline-block; + } + } .btn { padding: em(7px) em(15px); font-weight: 600; - font-size: em(13px); + margin-right: 5px; + &.btn-custom-login { + display: block; + min-width: 200px; + width: 200px; + padding: 0 1em; + margin: 1em auto; + height: 40px; + line-height: 35px; + color: #fff; + @include border-radius(2px); + &.gitlab { + background: #554488; + &:hover { + background: darken(#554488, 10%); + } + span { + vertical-align: middle; + } + .icon { + background: url("../images/gitlabLogo.png"); + width: 18px; + height: 18px; + margin-right: 8px; + @include background-size(100% 100%); + display: inline-block; + } + } + } &.btn-default { color: #444; } @@ -75,13 +126,11 @@ font-size: 0.9em; } &.glyphicon-chevron-right { - margin-left: 0.3em; font-size: 0.8em; right: -2px; top: 0px; } &.glyphicon-chevron-left { - margin-right: 0.3em; font-size: 0.8em; left: -2px; top: 0px; @@ -90,9 +139,20 @@ } .has-error { .control-label { - margin-top: 5px; + background: #f2f2f2; + padding: 0.7em 1em; + @include border-radius(3px); + margin: 1em 0 0; font-size: 14px; - font-weight: 600; + font-weight: normal; + color: #999; + width: 100%; + &:before { + @extend .fa; + content: "\f071"; + margin-right: 4px; + color: #aaa; + } } } .reset-form { |