diff options
Diffstat (limited to 'web/sass-files/sass/partials')
| -rw-r--r-- | web/sass-files/sass/partials/_headers.scss | 6 | ||||
| -rw-r--r-- | web/sass-files/sass/partials/_navbar.scss | 3 | ||||
| -rw-r--r-- | web/sass-files/sass/partials/_responsive.scss | 7 | ||||
| -rw-r--r-- | web/sass-files/sass/partials/_search.scss | 3 | ||||
| -rw-r--r-- | web/sass-files/sass/partials/_signup.scss | 66 |
5 files changed, 77 insertions, 8 deletions
diff --git a/web/sass-files/sass/partials/_headers.scss b/web/sass-files/sass/partials/_headers.scss index 4351e167b..687e330a6 100644 --- a/web/sass-files/sass/partials/_headers.scss +++ b/web/sass-files/sass/partials/_headers.scss @@ -96,6 +96,10 @@ right: 22px; .dropdown-toggle { padding: 10px; + @include opacity(0.8); + &:hover { + @include opacity(1); + } } .dropdown-menu { li a { @@ -119,7 +123,7 @@ } .header__info { color: #fff; - padding-left: 3px + padding-left: 4px; } .team__name, .user__name { display: block; diff --git a/web/sass-files/sass/partials/_navbar.scss b/web/sass-files/sass/partials/_navbar.scss index 6d8f11ce3..e5e67a9e0 100644 --- a/web/sass-files/sass/partials/_navbar.scss +++ b/web/sass-files/sass/partials/_navbar.scss @@ -24,9 +24,10 @@ border-radius: 0; margin: 0; padding: 0 10px; - line-height: 50px; + line-height: 53px; height: 50px; z-index: 5; + fill: #fff; .icon-bar { background: #fff; width: 21px; diff --git a/web/sass-files/sass/partials/_responsive.scss b/web/sass-files/sass/partials/_responsive.scss index 3a2768a47..2d78cf242 100644 --- a/web/sass-files/sass/partials/_responsive.scss +++ b/web/sass-files/sass/partials/_responsive.scss @@ -459,14 +459,15 @@ border-radius: 0; padding: 0; border-bottom: 1px solid #FFF; - border-bottom: 1px solid rgba(#fff, 0.6); - @include input-placeholder { - color: rgba(#fff, 0.6); + border-bottom: 1px solid rgba(#fff, 0.4); + &:focus { + border-bottom: 1px solid rgba(#fff, 0.8); } } input[type=text] { @include input-placeholder { color: #fff; + color: rgba(#fff, 0.6); } } } diff --git a/web/sass-files/sass/partials/_search.scss b/web/sass-files/sass/partials/_search.scss index d4a4da243..794358320 100644 --- a/web/sass-files/sass/partials/_search.scss +++ b/web/sass-files/sass/partials/_search.scss @@ -5,9 +5,10 @@ width: auto; height: auto; position: absolute; - top: 17px; + top: 1px; right: 15px; cursor: pointer; + padding: 1em 0; z-index: 5; display: none; } diff --git a/web/sass-files/sass/partials/_signup.scss b/web/sass-files/sass/partials/_signup.scss index db22718d2..826394a10 100644 --- a/web/sass-files/sass/partials/_signup.scss +++ b/web/sass-files/sass/partials/_signup.scss @@ -23,6 +23,9 @@ font-weight: 600; margin: 0 0 1.3em 0; font-size: 1.4em; + &.extra-margin { + margin-bottom: 2.5em; + } } h4 { font-size: em(18px); @@ -44,6 +47,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 +69,53 @@ .form-control { height: em(38px); } + .or__container { + height: 1px; + background: #dddddd; + text-align: center; + margin: 2em 0; + span { + width: 33px; + top: -10px; + position: relative; + line-height: 20px; + font-weight: 600; + background: #fff; + display: inline-block; + } + } .btn { padding: em(7px) em(15px); font-weight: 600; font-size: em(13px); + &.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; } @@ -90,9 +141,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 { |