diff --git a/app/assets/images/cat-background-sample.png b/app/assets/images/cat-background-sample.png deleted file mode 100644 index b35be324..00000000 Binary files a/app/assets/images/cat-background-sample.png and /dev/null differ diff --git a/app/assets/images/donate_photo_1.jpg b/app/assets/images/donate_photo_1.jpg new file mode 100644 index 00000000..02c651c3 Binary files /dev/null and b/app/assets/images/donate_photo_1.jpg differ diff --git a/app/assets/images/donate_photo_1_mobile.jpg b/app/assets/images/donate_photo_1_mobile.jpg new file mode 100644 index 00000000..741b4e7b Binary files /dev/null and b/app/assets/images/donate_photo_1_mobile.jpg differ diff --git a/app/assets/images/donate_photo_2.jpg b/app/assets/images/donate_photo_2.jpg new file mode 100644 index 00000000..67275a70 Binary files /dev/null and b/app/assets/images/donate_photo_2.jpg differ diff --git a/app/assets/images/donate_photo_2_mobile.jpg b/app/assets/images/donate_photo_2_mobile.jpg new file mode 100644 index 00000000..4cde746b Binary files /dev/null and b/app/assets/images/donate_photo_2_mobile.jpg differ diff --git a/app/assets/images/product_1.jpg b/app/assets/images/product_1.jpg new file mode 100644 index 00000000..0f71c3ff Binary files /dev/null and b/app/assets/images/product_1.jpg differ diff --git a/app/assets/images/product_2.jpg b/app/assets/images/product_2.jpg new file mode 100644 index 00000000..cd863872 Binary files /dev/null and b/app/assets/images/product_2.jpg differ diff --git a/app/assets/images/product_3.jpg b/app/assets/images/product_3.jpg new file mode 100644 index 00000000..62b17ba2 Binary files /dev/null and b/app/assets/images/product_3.jpg differ diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 27a5780e..f79967d7 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -18,6 +18,7 @@ body { font-size: 100%; margin: 0; padding: 0; + font-family: 'Libre Franklin', sans-serif; } * { diff --git a/app/assets/stylesheets/static_pages.scss b/app/assets/stylesheets/static_pages.scss index f0a688e0..0a08ba1f 100644 --- a/app/assets/stylesheets/static_pages.scss +++ b/app/assets/stylesheets/static_pages.scss @@ -10,11 +10,23 @@ } #money { - background: no-repeat center/cover url('cat-background-sample'); + background: linear-gradient(rgba($primary-color, 0.1) 0%, rgba($primary-color, 0.2) 99%); + + @media (min-width: 48rem) { + background: no-repeat center/cover url('donate_photo_1.jpg'); + } } #cause { - background: no-repeat center/cover url('cat-background-sample'); + background: linear-gradient(rgba($primary-color, 0.2) 0%, rgba($primary-color, 0.1) 99%); + + @media (min-width: 48rem) { + background: no-repeat center/cover url('donate_photo_2.jpg'); + } +} + +#retail { + background: linear-gradient(rgba($primary-color, 0.1) 0%, rgba($primary-color, 0.2) 99%); } #money, @@ -39,7 +51,6 @@ } > section { - min-height: 100vh; display: flex; justify-content: center; align-items: center; @@ -49,6 +60,20 @@ @media (min-width: 48rem) { padding: 2rem 5rem; } + + @media (min-width: 80rem) { + min-height: 100vh; + } + } + + .mobile-section-photo { + width: 100%; + display: block; + margin: 0 auto; + + @media (min-width: 48rem) { + display: none; + } } .subscription { @@ -86,6 +111,7 @@ h3 { width: 100%; + font-weight: bold; display: flex; justify-content: space-between; } @@ -94,6 +120,15 @@ margin: 0.5rem 0; text-align: left; } + + p, + .trix-content { + display: none; + + @media (min-width: 80rem) { + display: block; + } + } } &--plan-price { @@ -123,11 +158,17 @@ margin: 1rem 2rem; background: $primary-color; border: 1px solid $secondary-color; - border-radius: 5px; + border-radius: 1rem; + overflow: hidden; - img { + img { // fix for odd image export from Figma display: block; + height: 101%; + margin-left: -1px; + margin-top: -1px; + overflow: hidden; width: 100%; + width: 101%; } } } diff --git a/app/views/layouts/admin.html.erb b/app/views/layouts/admin.html.erb index 7fa886d6..fc53efbf 100644 --- a/app/views/layouts/admin.html.erb +++ b/app/views/layouts/admin.html.erb @@ -9,6 +9,8 @@ <%= javascript_pack_tag 'application', 'data-turbolinks-track': 'reload' %> + + <%= javascript_pack_tag 'admin-bundle' %> diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index dd1c82be..5bd7e380 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -11,7 +11,7 @@ <%= javascript_pack_tag 'application', 'data-turbolinks-track': 'reload' %> <%= javascript_include_tag 'https://checkout.stripe.com/checkout.js' %> <%= javascript_include_tag 'https://js.stripe.com/v3/' %> - + diff --git a/app/views/static_pages/home.html.erb b/app/views/static_pages/home.html.erb index 401a4fd6..1c1194ca 100644 --- a/app/views/static_pages/home.html.erb +++ b/app/views/static_pages/home.html.erb @@ -47,7 +47,9 @@ - + + Help us fund our mission +

Where is your money going?

@@ -60,7 +62,9 @@
- + + Push us closer to future projects +

What are we fighting for?

@@ -75,16 +79,16 @@
-
+
- article + sweather
- article + t-shirt
- article + stickers

Rather war your cause on your sleeve?