diff options
author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-12-06 09:18:17 -0600 |
---|---|---|
committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-12-06 09:18:17 -0600 |
commit | bdd1193f57a2e2e9c38f5f267179bd62a876f030 (patch) | |
tree | bf768e92fe7247e27142f689c9286375e99e0f32 | |
parent | 4aaf6af3cc7970cbe5414d323f290b4a94e479d0 (diff) | |
download | gitlab-ce-bdd1193f57a2e2e9c38f5f267179bd62a876f030.tar.gz |
Remove confirmation.scss
-rw-r--r-- | app/assets/stylesheets/pages/confirmation.scss | 32 | ||||
-rw-r--r-- | app/views/devise/confirmations/almost_there.haml | 7 |
2 files changed, 4 insertions, 35 deletions
diff --git a/app/assets/stylesheets/pages/confirmation.scss b/app/assets/stylesheets/pages/confirmation.scss deleted file mode 100644 index 8aab5e8231d..00000000000 --- a/app/assets/stylesheets/pages/confirmation.scss +++ /dev/null @@ -1,32 +0,0 @@ -.well-confirmation { - margin-bottom: 20px; - border-bottom: 1px solid $gray-darker; - - > h1, - h2, - h3, - h4, - h5, - h6 { - font-weight: 400; - } - - .lead { - margin-bottom: 20px; - } - - ul, - ol { - padding-left: 0; - } - - li { - list-style-type: none; - } -} - -.confirmation-content { - a { - color: $md-link-color; - } -} diff --git a/app/views/devise/confirmations/almost_there.haml b/app/views/devise/confirmations/almost_there.haml index 20cd7b0179d..fb70d158096 100644 --- a/app/views/devise/confirmations/almost_there.haml +++ b/app/views/devise/confirmations/almost_there.haml @@ -1,12 +1,13 @@ -.well-confirmation.text-center +.well-confirmation.text-center.append-bottom-20 %h1.prepend-top-0 Almost there... - %p.lead + %p.lead.append-bottom-20 Please check your email to confirm your account + %hr - if current_application_settings.after_sign_up_text.present? .well-confirmation.text-center = markdown_field(current_application_settings, :after_sign_up_text) -%p.confirmation-content.text-center +%p.text-center No confirmation email received? Please check your spam folder or .append-bottom-20.prepend-top-20.text-center %a.btn.btn-lg.btn-success{ href: new_user_confirmation_path } |