From f0663d83caf138d4454b56fabb65e71d4583f19b Mon Sep 17 00:00:00 2001 From: Ben Halpern Date: Wed, 1 May 2019 15:14:18 -0400 Subject: [PATCH] Add nightmode image (#2640) --- app/assets/stylesheets/articles.scss | 6 +++++- app/assets/stylesheets/variables.scss | 8 +++++++- app/dashboards/organization_dashboard.rb | 8 +++++++- app/models/organization.rb | 1 + app/views/articles/_sidebar.html.erb | 3 ++- .../20190501180125_add_dark_nav_image_to_organizations.rb | 5 +++++ db/schema.rb | 4 +++- 7 files changed, 30 insertions(+), 5 deletions(-) create mode 100644 db/migrate/20190501180125_add_dark_nav_image_to_organizations.rb diff --git a/app/assets/stylesheets/articles.scss b/app/assets/stylesheets/articles.scss index 9a23f5289..e4f8e6d7d 100644 --- a/app/assets/stylesheets/articles.scss +++ b/app/assets/stylesheets/articles.scss @@ -1182,9 +1182,13 @@ img { border: 0; margin: auto; + margin-bottom: 8px; width: 98%; min-height: 35px; border-radius: 8px; + &.partner-image-dark-mode { + display: none; + } } .sponsor-tagline { margin: 10px auto; @@ -1616,4 +1620,4 @@ ); background-size: 800px 104px; position: relative; -} +} \ No newline at end of file diff --git a/app/assets/stylesheets/variables.scss b/app/assets/stylesheets/variables.scss index aee72676e..193c32293 100644 --- a/app/assets/stylesheets/variables.scss +++ b/app/assets/stylesheets/variables.scss @@ -45,6 +45,12 @@ body.night-theme { border-color: white !important; box-shadow: 3px 3px 0px #fff !important; } + .partner-image-dark-mode { + display: block !important; + } + .partner-image-light-mode { + display: none !important; + } } body.sans-serif-article-body { @@ -65,4 +71,4 @@ body.comic-sans-article-body { font-size: 0.98em; } -} +} \ No newline at end of file diff --git a/app/dashboards/organization_dashboard.rb b/app/dashboards/organization_dashboard.rb index f9d0d88e7..bd5616498 100644 --- a/app/dashboards/organization_dashboard.rb +++ b/app/dashboards/organization_dashboard.rb @@ -15,6 +15,7 @@ class OrganizationDashboard < Administrate::BaseDashboard tag_line: Field::String, profile_image: CarrierwaveField, nav_image: CarrierwaveField, + dark_nav_image: CarrierwaveField, url: Field::String, twitter_username: Field::String, github_username: Field::String, @@ -36,7 +37,9 @@ class OrganizationDashboard < Administrate::BaseDashboard cta_body_markdown: Field::Text, sponsorship_url: Field::Text, sponsorship_tagline: Field::Text, - is_gold_sponsor: Field::Boolean + is_gold_sponsor: Field::Boolean, + sponsorship_blurb_html: Field::Text, + sponsorship_featured_number: Field::Number }.freeze # COLLECTION_ATTRIBUTES @@ -66,6 +69,7 @@ class OrganizationDashboard < Administrate::BaseDashboard tag_line profile_image nav_image + dark_nav_image url bg_color_hex text_color_hex @@ -84,7 +88,9 @@ class OrganizationDashboard < Administrate::BaseDashboard cta_body_markdown sponsorship_url sponsorship_tagline + sponsorship_blurb_html is_gold_sponsor + sponsorship_featured_number ].freeze def display_resource(organization) diff --git a/app/models/organization.rb b/app/models/organization.rb index 7a4b9a173..c05a5c947 100644 --- a/app/models/organization.rb +++ b/app/models/organization.rb @@ -51,6 +51,7 @@ class Organization < ApplicationRecord mount_uploader :profile_image, ProfileImageUploader mount_uploader :nav_image, ProfileImageUploader + mount_uploader :dark_nav_image, ProfileImageUploader alias_attribute :username, :slug alias_attribute :old_username, :old_slug diff --git a/app/views/articles/_sidebar.html.erb b/app/views/articles/_sidebar.html.erb index 258b94d51..6ecca58c6 100644 --- a/app/views/articles/_sidebar.html.erb +++ b/app/views/articles/_sidebar.html.erb @@ -16,7 +16,8 @@ <% @sponsors.each do |organization| %>