Merge pull request #35 from rails-girls-summer-of-code/lg-update-styling

update the styling of checkout and thank you pages

Author: alicetragedy

app/assets/stylesheets/application.scss

@@ -12,16 +12,8 @@
  *= require_self
  */
 
- @font-face {
-     font-family: 'Interstate';
-     src: url('/fonts/interstate_mono-webfont.eot');
-     src: url('/fonts/interstate_mono-webfont.eot?#iefix') format('embedded-opentype'),
-          url('/fonts/interstate_mono-webfont.woff') format('woff'),
-          url('/fonts/interstate_mono-webfont.ttf') format('truetype'),
-          url('/fonts/interstate_mono-webfont.svg#interstate_monoregular') format('svg');
-     font-weight: normal;
-     font-style: normal;
- }
+ @import url(https://fonts.googleapis.com/css?family=Lato:400,700,400italic,700italic);
+
  html,
  button,
  input,
@@ -34,7 +26,7 @@
  }
  body {
      font-size: 1em;
-     font: 16px/26px Helvetica, Helvetica Neue, Arial;
+     font: 16px/26px 'Lato', Helvetica, Helvetica Neue, Arial;
      overflow-x: hidden;
  }
  ::-moz-selection {
@@ -198,13 +190,13 @@
  .footer-container { min-height: 10em; padding-bottom: 1em; padding-top: 2em; clear: both; }
  .footer-container .nav-meta a { color: white; font-weight: normal; text-decoration: none }
  .footer-container .nav-meta a:hover { text-decoration: underline; }
- .footer-container .wrapper {position: relative; min-height: 20em;}
+ .footer-container .wrapper {position: relative; min-height: 15em;}
 
  a.button, .simple_form input[type="submit"]{
    display: inline-block;
    margin: 2em 1em 2em 0;
    padding: 20px;
-   background-color: #e53f05;
+   background-color: #D82222;
    color: white;
    text-decoration: none;
    font-size: 1.2em;
@@ -259,7 +251,7 @@
    margin: 0;
  }
  .intro h2 {
-   font-family: Interstate, Helvetica;
+   font-family: 'Lato', sans-serif;
    font-size: 18px;
    color: white;
    letter-spacing: 1px;
@@ -296,6 +288,7 @@
  .footer-container footer {
    color: white;
    padding-top: 1em;
+   font-size: 0.8em;
  }
  .footer-container footer a {
    color: white;
@@ -336,7 +329,7 @@
  h2,
  h3,
  .button h3 {
-   font-family: 'Interstate', sans-serif;
+   font-family: 'Lato', sans-serif;
    font-weight: normal;
  }
  h2 {

app/assets/stylesheets/simple.css

@@ -7,7 +7,7 @@ body.simple {
   width: 800px;
   padding: 2em 4em;
   line-height: 150%;
-  font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
+  font-family: 'Lato', sans-serif;
 }
 
 .nav {

app/views/donations/checkout.html.slim

@@ -6,11 +6,9 @@ section class="main container"
         = f.hidden_field :amount
         = f.hidden_field :stripe_card_token
 
-        h2 Rails Girls Summer of Code
+        h2 Confirm your donation
 
-        p You are about to donate #{format_donation(donation)} to the Rails Girls Summer of Code.
-
-        p Which is... amazing! Thank you so much.
+        p You are about to donate #{format_donation(donation)} to Rails Girls Summer of Code.
 
         - if donation.errors[:base].any?
           .application-error
@@ -20,14 +18,14 @@ section class="main container"
         - if company?
           #address
             h3 About you
-            p We'd love to list you on the crowdfunding page. Please provide us with some information about your company:
+            p We'd love to list you on our crowdfunding page. Please fill out the form below with information about your company:
             fieldset
               = f.input :name, required: true
               = f.input :twitter_handle, label: 'Twitter', hint: 'Your Twitter handle', input_html: { placeholder: '@' }
               = f.input :github_handle,  label: 'Github',  hint: 'Your Github handle'
               = f.input :homepage, input_html: { placeholder: 'http://' }
               = f.input :comment, as: :string
-            p Please provide your address so we can send you an email with a billing receipt.
+            p Please provide your company's billing address so we can send you an email with a billing receipt.
             fieldset
               = f.input :email, required: true
               = f.input :address, required: true
@@ -39,7 +37,7 @@ section class="main container"
         - else
           #user
             h3 About you
-            p We'd love to list you on the crowdfunding page. Please provide us with some information about you:
+            p We'd love to list you on our crowdfunding page. Please fill out the form below with information about you:
             fieldset
               = f.input :name
               = f.input :email, required: true
@@ -48,7 +46,7 @@ section class="main container"
               = f.input :homepage, input_html: { placeholder: 'http://' }
               = f.input :comment, as: :string
               = f.input :hide, as: :boolean, label: 'Hide amount?', input_html: { class: 'inline' }
-            p.note If you leave these fields empty, we will list the donation as anonymous. If you tick "Hide amount?", we won't display the amount. We won't display the email address, but show your <a href="http://gravatar.com">Gravatar</a>.
+            p.note If you leave the above fields empty, we will list the donation as anonymous. If you tick "Hide amount?", we won't display the amount. Your email address will <strong>not</strong> be displayed on our site, but we will show your <a href="http://gravatar.com">Gravatar</a>.
 
         - if needs_vat?
           = f.hidden_field :add_vat, value: false
@@ -73,7 +71,7 @@ section class="main container"
 
         ul.footnotes
           li
-            | As far as we know contributions and payments to the Rails Girls Summer of
+            | As far as we know contributions and payments to Rails Girls Summer of
               Code are not deductible as charitable contributions for federal income
               tax purposes. However, they may be deductible under other provisions of
               the Internal Revenue Code (for US) or your local tax authority's advice.

app/views/donations/confirm_creation.html.slim

@@ -1,21 +1,18 @@
 section class="main container"
     div class="wrapper clearfix"
         article class="content"
-            h2 Thank you!
+            h2 Thank you for your donation!
             p
               - if false && subscription?
                 | You have just ordered the subscription <em>"#{donation.package.name}"</em> which means you are donating <em>#{number_to_currency donation.amount_in_dollars}</em> per month to Travis CI (until you cancel the subscription).
               - else
-                | You have just donated <em>#{number_to_currency donation.amount_in_dollars}</em> to RailsGirls Summer of Code.
-
-            p We can't express how much we appreciate your support.
-
-            h4 Thank you so much!
+                | You have just donated <em>#{number_to_currency donation.amount_in_dollars}</em> to Rails Girls Summer of Code.
+              
+              br We can't express how much we appreciate your support.
 
             #sociallinks
               h3 Please help spread the word!
-              p They say the number one reason for people to donate is that they have been inspired by others.
-              p Please help spread the word and ask friends, colleagues or your company to support Rails Girls Summer of Code!
+              p They say the number one reason for people to donate is that they have been inspired by others. Please help spread the word and ask friends, colleagues or your company to support Rails Girls Summer of Code!
               p Share your donation:
               table
                 tr
@@ -29,7 +26,7 @@ section class="main container"
 
             p
              | Go back to the 
-             a href="http://railsgirlssummerofcode.org/campaign" campaign page
+             a href="https://railsgirlssummerofcode.org/campaign" campaign page
 
 
 

app/views/layouts/application.html.slim

@@ -11,26 +11,22 @@ html
 		div class="header-container"
 			header class="wrapper clearfix"
 				h1 class="logo-nav"
-					a.ir href="http://railsgirlssummerofcode.org" Rails Girls Summer of Code
-				/ nav class="nav-primary clearfix"
-				/     ul
-				/         li: a href="http://railsgirlsberlin.github.io/summer-of-code/students.html" Students
-				/         li: a href="http://railsgirlsberlin.github.io/summer-of-code/sponsors-stripe.html" Sponsors
-				/         li: a href="http://railsgirlsberlin.github.io/summer-of-code/projects.html" Projects
-				/         li: a href="http://railsgirlsberlin.github.io/summer-of-code/faq.html" FAQ
-				/         li: a href="http://railsgirlsberlin.github.io/summer-of-code/contact.html" Contact
+					a.ir href="https://railsgirlssummerofcode.org" Rails Girls Summer of Code
 
 		= yield
 
 		div class="footer-container"
 			footer class="sponsors wrapper"
 				p
-					' ©
-					a href="http://railsgirls.com" Rails Girls
-					'  2013–2017 — supported by
-					a href="http://foundation.travis-ci.org" Travis Foundation
+					' © Rails Girls Summer of Code
+					'  2013–2018 — managed by
+					a href="https://foundation.travis-ci.org" Travis Foundation
 					'  |
-					a href="http://railsgirlssummerofcode.org/about/impressum/" Legal Notice
+					a href="https://railsgirlssummerofcode.org/about/code-of-conduct/" Code of Conduct
+					'  |
+					a href="https://railsgirlssummerofcode.org/sponsorship-guidelines/" Sponsorship Guidelines
+					'  |
+					a href="https://railsgirlssummerofcode.org/about/impressum/" Legal Notice
 
 
 		script

app/views/static/index.html.slim

@@ -3,4 +3,4 @@ section class="main container"
     article class="content"
       h1 Help us Fund Rails Girls Summer of Code!
       p
-        | Rails Girls Summer of Code offers three-months full time scholarships to programming newcomers. Last year's Summer of Code has been a raging success. This year we will make it happen again with your help! <a href="http://railsgirlssummerofcode.org/campaign/">Donate here!</a>
+        | Rails Girls Summer of Code offers three-month, full-time scholarships to women and non-binary people. The last editions of RGSoC have been a raging success. This year we will make it happen again with your help. <a href="https://railsgirlssummerofcode.org/campaign/">Donate here</a>!