diff options
author | Jacob Schatz <jschatz@gitlab.com> | 2016-12-06 22:43:38 +0000 |
---|---|---|
committer | Jacob Schatz <jschatz@gitlab.com> | 2016-12-06 22:43:38 +0000 |
commit | 180f87cab7c530852c049e130e9297267e006010 (patch) | |
tree | af1a941dd021d27c432674390084940fd6164946 | |
parent | 5ba6d5e7a25e3444772172ae8a487f4b4c18f052 (diff) | |
parent | 6886fab4aa7f6ddba27f1d7df591b1a6bfc27044 (diff) | |
download | gitlab-ce-180f87cab7c530852c049e130e9297267e006010.tar.gz |
Merge branch 'remove-pages-css' into 'master'
Remove more pages css
* Moves award emojis to `/framework`
* Moves generic image styles to `/framework`
* Removes `confirmation.scss`
See merge request !7952
-rw-r--r-- | app/assets/stylesheets/framework.scss | 2 | ||||
-rw-r--r-- | app/assets/stylesheets/framework/awards.scss (renamed from app/assets/stylesheets/pages/awards.scss) | 0 | ||||
-rw-r--r-- | app/assets/stylesheets/framework/images.scss (renamed from app/assets/stylesheets/pages/appearances.scss) | 0 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/confirmation.scss | 32 | ||||
-rw-r--r-- | app/views/devise/confirmations/almost_there.haml | 7 |
5 files changed, 6 insertions, 35 deletions
diff --git a/app/assets/stylesheets/framework.scss b/app/assets/stylesheets/framework.scss index 694fcd4b59d..4d4835568ed 100644 --- a/app/assets/stylesheets/framework.scss +++ b/app/assets/stylesheets/framework.scss @@ -40,4 +40,6 @@ @import "framework/blank"; @import "framework/wells.scss"; @import "framework/page-header.scss"; +@import "framework/awards.scss"; +@import "framework/images.scss"; @import "framework/broadcast-messages"; diff --git a/app/assets/stylesheets/pages/awards.scss b/app/assets/stylesheets/framework/awards.scss index c13cb4a02b2..c13cb4a02b2 100644 --- a/app/assets/stylesheets/pages/awards.scss +++ b/app/assets/stylesheets/framework/awards.scss diff --git a/app/assets/stylesheets/pages/appearances.scss b/app/assets/stylesheets/framework/images.scss index 878f44116ba..878f44116ba 100644 --- a/app/assets/stylesheets/pages/appearances.scss +++ b/app/assets/stylesheets/framework/images.scss 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 } |