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
This commit is contained in:
Jacob Schatz 2016-12-06 22:43:38 +00:00
commit 180f87cab7
5 changed files with 6 additions and 35 deletions

View file

@ -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";

View file

@ -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;
}
}

View file

@ -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 }