From 36f71078746154040c8d26c61ccbd807ef484a56 Mon Sep 17 00:00:00 2001 From: Michael Ball Date: Sun, 21 Feb 2021 01:14:24 -0800 Subject: [PATCH 01/20] Update sentry logging --- config/initializers/sentry.rb | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/config/initializers/sentry.rb b/config/initializers/sentry.rb index e42fcce6..a94cc79a 100644 --- a/config/initializers/sentry.rb +++ b/config/initializers/sentry.rb @@ -1,4 +1,13 @@ Sentry.init do |config| config.enabled_environments = %|production staging| config.dsn = ENV['SENTRY_DSN'] + config.breadcrumbs_logger = [:active_support_logger] + + # To activate performance monitoring, set one of these options. + # We recommend adjusting the value in production: + config.traces_sample_rate = 0.5 + # or + # config.traces_sampler = lambda do |context| + # true + # end end From 8961cea8499e5967e0a90c3f41923994b1292e21 Mon Sep 17 00:00:00 2001 From: Michael Ball Date: Wed, 24 Feb 2021 20:23:59 -0800 Subject: [PATCH 02/20] Bah! Typo.... :sob: --- spec/helpers/application_helper_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb index 7e209774..10aced29 100644 --- a/spec/helpers/application_helper_spec.rb +++ b/spec/helpers/application_helper_spec.rb @@ -91,7 +91,7 @@ describe ApplicationHelper, type: :helper do end it 'should use the conference organization name' do - expect(nav_link_text(nil)).to match conference.organization.name) + expect(nav_link_text(nil)).to match conference.organization.name end end end From 27873c307be2f23c07ec9bf271b315e8929a60b4 Mon Sep 17 00:00:00 2001 From: Michael Ball Date: Wed, 24 Feb 2021 20:36:44 -0800 Subject: [PATCH 03/20] Sigh, actually fix the specs for nav logos --- spec/helpers/application_helper_spec.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb index 10aced29..b54a0bd2 100644 --- a/spec/helpers/application_helper_spec.rb +++ b/spec/helpers/application_helper_spec.rb @@ -75,7 +75,7 @@ describe ApplicationHelper, type: :helper do # TODO-SNAPCON: This is an indicator in a conference it should be the conference name. it 'should use the conference organization name' do - expect(nav_root_link_for(nil)).to include image_tag('snapcon_logo.png', alt: conference.organization.name) + expect(nav_root_link_for(conference)).to include image_tag('snapcon_logo.png', alt: conference.organization.name) end end @@ -91,7 +91,7 @@ describe ApplicationHelper, type: :helper do end it 'should use the conference organization name' do - expect(nav_link_text(nil)).to match conference.organization.name + expect(nav_link_text(conference)).to match conference.organization.name end end end From 5c902e7e36dd85a0243e57949e8e50b496a074f7 Mon Sep 17 00:00:00 2001 From: Michael Ball Date: Wed, 24 Feb 2021 20:53:28 -0800 Subject: [PATCH 04/20] Delint from a local pronto run --- app/helpers/events_helper.rb | 2 +- config/puma.rb | 6 +++--- spec/features/commercials_spec.rb | 2 +- spec/support/external_request.rb | 3 ++- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb index c920c16f..95b2d106 100644 --- a/app/helpers/events_helper.rb +++ b/app/helpers/events_helper.rb @@ -221,7 +221,7 @@ module EventsHelper def calendar_event_text(event, event_schedule, conference) <<~TEXT #{conference.title} - #{event.title} - #{event_schedule.start_time.strftime("%Y %B %e - %H:%M")} #{event_schedule.timezone} + #{event_schedule.start_time.strftime('%Y %B %e - %H:%M')} #{event_schedule.timezone} More Info: #{conference_program_proposal_url(conference, event)} Join: #{event.url} diff --git a/config/puma.rb b/config/puma.rb index 0d3b583f..c6f137da 100644 --- a/config/puma.rb +++ b/config/puma.rb @@ -46,9 +46,9 @@ end lowlevel_error_handler do |ex, env| Sentry.capture_exception( ex, - :message => ex.message, - :extra => { :puma => env }, - :transaction => "Puma" + message: ex.message, + extra: { puma: env }, + transaction: "Puma" ) # note the below is just a Rack response [500, {}, ["An error has occurred, and engineers have been informed. Please reload the page. If you continue to have problems, contact conference@snap.berkeley.edu\n"]] diff --git a/spec/features/commercials_spec.rb b/spec/features/commercials_spec.rb index 13c46f3b..d6fc7f38 100644 --- a/spec/features/commercials_spec.rb +++ b/spec/features/commercials_spec.rb @@ -69,7 +69,7 @@ feature Commercial do scenario 'does not add an invalid commercial of an event', feature: true, js: true do # TODO-SNAPCON - skip("Snap!Con allows all materials to be saved.") + skip('Snap!Con allows all materials to be saved.') visit edit_conference_program_proposal_path(conference.short_title, event.id) click_link 'Materials' fill_in 'commercial_url', with: 'invalid_commercial_url' diff --git a/spec/support/external_request.rb b/spec/support/external_request.rb index b9a61e85..c968acd3 100644 --- a/spec/support/external_request.rb +++ b/spec/support/external_request.rb @@ -35,6 +35,7 @@ def mock_commercial_request end def mock_image_request - WebMock.stub_request(:post, "https://api.cloudinary.com/v1_1/snapcon/image/destroy") + # TODO-SNAPCON: This needs to be configurable somehow. + WebMock.stub_request(:post, 'https://api.cloudinary.com/v1_1/snapcon/image/destroy') .to_return(status: 200, body: {}.to_json, headers: {}) end From 807fbab3b6431b0b3c8f3a98fff0b0bf0783eae1 Mon Sep 17 00:00:00 2001 From: Michael Ball Date: Wed, 24 Feb 2021 20:55:59 -0800 Subject: [PATCH 05/20] Add a flay ignore file --- .flayignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 .flayignore diff --git a/.flayignore b/.flayignore new file mode 100644 index 00000000..cbee825d --- /dev/null +++ b/.flayignore @@ -0,0 +1 @@ +spec/**/*.rb From cf22b5c9f4cfeb0b08d89e9ad29eb55b669b34fb Mon Sep 17 00:00:00 2001 From: Michael Ball Date: Wed, 24 Feb 2021 21:39:10 -0800 Subject: [PATCH 06/20] Bump ruby version to 2.6.6 --- .ruby-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ruby-version b/.ruby-version index ecd7ee50..338a5b5d 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.5.8 +2.6.6 From 7e5e2d9e3de00ab75fe8883b85d1f82622d23f26 Mon Sep 17 00:00:00 2001 From: Michael Ball Date: Wed, 24 Feb 2021 21:41:16 -0800 Subject: [PATCH 07/20] Bump ruby matrix on travis --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6d3ac828..d0f72711 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,8 +7,9 @@ addons: language: ruby cache: bundler rvm: - - 2.5 - 2.6 + - 2.7 + - 3.0 branches: except: - /^depfu/.*$/ From ee2aec90c936712aa10747ac0ffcc9217bc87882 Mon Sep 17 00:00:00 2001 From: Michael Ball Date: Wed, 24 Feb 2021 21:41:39 -0800 Subject: [PATCH 08/20] Switch travis OS to 20.04 / focal to match Heroku --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d0f72711..08514c0e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ sudo: required -dist: xenial +dist: focal addons: apt: packages: From 2d1a59934002c00f4784bec684195abbdceb4a34 Mon Sep 17 00:00:00 2001 From: Michael Ball Date: Wed, 24 Feb 2021 22:06:10 -0800 Subject: [PATCH 09/20] Specify ruby version in Gemfile in a way that works for Heroku + Travis --- Gemfile | 2 +- Gemfile.lock | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 77ac5a7e..5877787b 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ source 'https://rubygems.org' -# ruby '~> 2.5.0' +ruby ENV['TRAVIS_RUBY_VERSION'] || '2.6.6' # rails-assets requires >= 1.8.4 if Gem::Version.new(Bundler::VERSION) < Gem::Version.new('1.8.4') diff --git a/Gemfile.lock b/Gemfile.lock index 241cbb00..929552b6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -784,5 +784,8 @@ DEPENDENCIES webmock whenever +RUBY VERSION + ruby 2.6.6p146 + BUNDLED WITH 1.17.3 From f10139efeb8b6aaf8793f6342602d303f008d8ac Mon Sep 17 00:00:00 2001 From: Michael Ball Date: Wed, 24 Feb 2021 22:11:32 -0800 Subject: [PATCH 10/20] Update badges and readme slightly --- README.md | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 2fe87dcf..ac0aa758 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,15 @@ -[![Build Status](https://travis-ci.org/openSUSE/osem.svg?branch=master)](https://travis-ci.org/openSUSE/osem) -[![Code Climate](https://codeclimate.com/github/openSUSE/osem.png)](https://codeclimate.com/github/openSUSE/osem) -[![codecov](https://codecov.io/gh/opensuse/osem/branch/master/graph/badge.svg)](https://codecov.io/gh/opensuse/osem) -[![Security Status](https://hakiri.io/github/openSUSE/osem/master.svg)](https://hakiri.io/github/openSUSE/osem/master) -[![Dependencies](https://badges.depfu.com/badges/8fcd630367d20f5b48d393774c00c5fd/overview.svg)](https://depfu.com/repos/openSUSE/osem) - +[![Build Status](https://travis-ci.org/snap-cloud/snapcon.svg?branch=master)](https://travis-ci.org/snap-cloud/snapcon) +[![Code Climate](https://codeclimate.com/github/snap-cloud/snapcon.png)](https://codeclimate.com/github/snap-cloud/snapcon) +[![codecov](https://codecov.io/gh/snap-cloud/snapcon/branch/master/graph/badge.svg)](https://codecov.io/gh/snap-cloud/snapcon) +[![Security Status](https://hakiri.io/github/snap-cloud/snapcon/master.svg)](https://hakiri.io/github/snap-cloud/snapcon/master) +[![Dependencies](https://badges.depfu.com/badges/8fcd630367d20f5b48d393774c00c5fd/overview.svg)](https://depfu.com/repos/snap-cloud/snapcon) + Deploy -# Open Source Event Manager - [osem.io](https://osem.io) + +# [Snap!Con](https://snapcon.org) +forked from: +## Open Source Event Manager - [osem.io](https://osem.io) ![OSEM Logo](doc/osem-logo.png) An event management tool tailored to Free and Open Source Software conferences. From 9d3043d8107360000d8312afdd20b8f0f7ac55ac Mon Sep 17 00:00:00 2001 From: Michael Ball Date: Wed, 24 Feb 2021 22:29:41 -0800 Subject: [PATCH 11/20] Rails 5.2 is only good on Ruby 2.6. Will not run other versions until upgrade --- .travis.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 08514c0e..60307caa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,9 +7,7 @@ addons: language: ruby cache: bundler rvm: - - 2.6 - - 2.7 - - 3.0 + - 2.6.6 branches: except: - /^depfu/.*$/ From 8238ff03be0e763187b51d7e73109731724359cc Mon Sep 17 00:00:00 2001 From: Michael Ball Date: Wed, 24 Feb 2021 22:47:51 -0800 Subject: [PATCH 12/20] CodeClimate Test Reporter from Travis --- .travis.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.travis.yml b/.travis.yml index 60307caa..2f095c95 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,16 +25,28 @@ notifications: on_success: change on_failure: change before_script: + # install CodeClimate test reporter and tell it we are starting a test run + - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > $CCTR + - chmod +x $CCTR + - $CCTR before-build - RAILS_ENV=test bundle exec rake db:bootstrap --trace - RAILS_ENV=test bundle exec bin/rails webdrivers:chromedriver:update script: - "./travis_script.sh $TEST_SUITE" + - $CCTR format-coverage -t simplecov --output coverage/codeclimate.$SUITE.json +after_script: + # combine coverage from all suites, and upload to CodeClimate + - $CCTR sum-coverage coverage/codeclimate.*.json | $CCTR upload-coverage + - $CCTR after-build --exit-code $TRAVIS_TEST_RESULT + env: global: - OSEM_DB_ADAPTER=sqlite3 - OSEM_DB_HOST='' - OSEM_DB_PORT='' - OSEM_DB_NAME='osem_test' + - CC_TEST_REPORTER_ID=$CC_TEST_REPORTER + - CCTR=./cc-test-reporter matrix: - TEST_SUITE=ability - TEST_SUITE=features From 2e6e60d5682640dc8f4ead71ca68713b63c0dfa0 Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Thu, 25 Feb 2021 06:58:49 +0000 Subject: [PATCH 13/20] Update puma to version 5.2.1 --- Gemfile | 2 +- Gemfile.lock | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 77ac5a7e..d759c7c7 100644 --- a/Gemfile +++ b/Gemfile @@ -12,7 +12,7 @@ end gem 'rails', '~> 5.2' # Use Puma as the app server -gem 'puma', '~> 3.0' +gem 'puma', '~> 5.2' # respond_to methods have been extracted to the responders gem # http://edgeguides.rubyonrails.org/upgrading_ruby_on_rails.html#responders diff --git a/Gemfile.lock b/Gemfile.lock index 241cbb00..75f5f46a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -415,7 +415,8 @@ GEM method_source (~> 0.8.1) slop (~> 3.4) public_suffix (3.1.1) - puma (3.12.6) + puma (5.2.1) + nio4r (~> 2.0) racc (1.5.2) rack (2.2.3) rack-openid (1.3.1) @@ -736,7 +737,7 @@ DEPENDENCIES pronto-haml pronto-rubocop pry - puma (~> 3.0) + puma (~> 5.2) rails (~> 5.2) rails-assets-bootstrap-markdown! rails-assets-bootstrap-select! From 705cc469de35a8660c5fe78dd26c3b407d2458f4 Mon Sep 17 00:00:00 2001 From: Michael Ball Date: Wed, 24 Feb 2021 23:03:19 -0800 Subject: [PATCH 14/20] Update badges in README --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ac0aa758..489b10b9 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,6 @@ -[![Build Status](https://travis-ci.org/snap-cloud/snapcon.svg?branch=master)](https://travis-ci.org/snap-cloud/snapcon) -[![Code Climate](https://codeclimate.com/github/snap-cloud/snapcon.png)](https://codeclimate.com/github/snap-cloud/snapcon) +[![Build Status](https://travis-ci.com/snap-cloud/snapcon.svg?branch=master)](https://travis-ci.com/snap-cloud/snapcon) +[![Maintainability](https://api.codeclimate.com/v1/badges/b7b0d559a03bf218663a/maintainability)](https://codeclimate.com/github/snap-cloud/snapcon/maintainability) +[![Test Coverage](https://api.codeclimate.com/v1/badges/b7b0d559a03bf218663a/test_coverage)](https://codeclimate.com/github/snap-cloud/snapcon/test_coverage) [![codecov](https://codecov.io/gh/snap-cloud/snapcon/branch/master/graph/badge.svg)](https://codecov.io/gh/snap-cloud/snapcon) [![Security Status](https://hakiri.io/github/snap-cloud/snapcon/master.svg)](https://hakiri.io/github/snap-cloud/snapcon/master) [![Dependencies](https://badges.depfu.com/badges/8fcd630367d20f5b48d393774c00c5fd/overview.svg)](https://depfu.com/repos/snap-cloud/snapcon) From 56042226a130d2bb133e5764ba35f4e2e919b32a Mon Sep 17 00:00:00 2001 From: Michael Ball Date: Thu, 25 Feb 2021 01:28:07 -0800 Subject: [PATCH 15/20] CodeClimate isnt quite configured right... --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2f095c95..f33b6c3b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,7 +33,8 @@ before_script: - RAILS_ENV=test bundle exec bin/rails webdrivers:chromedriver:update script: - "./travis_script.sh $TEST_SUITE" - - $CCTR format-coverage -t simplecov --output coverage/codeclimate.$SUITE.json + # TODO Get this working. + # - $CCTR format-coverage -t simplecov --output coverage/codeclimate.$SUITE.json after_script: # combine coverage from all suites, and upload to CodeClimate - $CCTR sum-coverage coverage/codeclimate.*.json | $CCTR upload-coverage From 6cb8fe3787e03555156f98c64fe13365fd20303c Mon Sep 17 00:00:00 2001 From: Michael Ball Date: Thu, 25 Feb 2021 01:51:55 -0800 Subject: [PATCH 16/20] Comment out all codeclimate references --- .travis.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index f33b6c3b..d725ca97 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,19 +26,19 @@ notifications: on_failure: change before_script: # install CodeClimate test reporter and tell it we are starting a test run - - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > $CCTR - - chmod +x $CCTR - - $CCTR before-build + # - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > $CCTR + # - chmod +x $CCTR + # - $CCTR before-build - RAILS_ENV=test bundle exec rake db:bootstrap --trace - RAILS_ENV=test bundle exec bin/rails webdrivers:chromedriver:update script: - "./travis_script.sh $TEST_SUITE" # TODO Get this working. # - $CCTR format-coverage -t simplecov --output coverage/codeclimate.$SUITE.json -after_script: - # combine coverage from all suites, and upload to CodeClimate - - $CCTR sum-coverage coverage/codeclimate.*.json | $CCTR upload-coverage - - $CCTR after-build --exit-code $TRAVIS_TEST_RESULT +# after_script: + # combine coverage from all suites, and upload3 to CodeClimate + # - $CCTR sum-coverage coverage/codeclimate.*.json | $CCTR upload-coverage + # - $CCTR after-build --exit-code $TRAVIS_TEST_RESULT env: global: From c6640c0de2ccbd467a0015420e480c47efd0a865 Mon Sep 17 00:00:00 2001 From: Michael Ball Date: Thu, 25 Feb 2021 14:15:10 -0800 Subject: [PATCH 17/20] Update travis config. Try bionic build. --- .travis.yml | 5 ++--- travis_script.sh => bin/travis_script.sh | 0 2 files changed, 2 insertions(+), 3 deletions(-) rename travis_script.sh => bin/travis_script.sh (100%) diff --git a/.travis.yml b/.travis.yml index d725ca97..fe35742e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,4 @@ -sudo: required -dist: focal +dist: bionic addons: apt: packages: @@ -32,7 +31,7 @@ before_script: - RAILS_ENV=test bundle exec rake db:bootstrap --trace - RAILS_ENV=test bundle exec bin/rails webdrivers:chromedriver:update script: - - "./travis_script.sh $TEST_SUITE" + - "bin/travis_script.sh $TEST_SUITE" # TODO Get this working. # - $CCTR format-coverage -t simplecov --output coverage/codeclimate.$SUITE.json # after_script: diff --git a/travis_script.sh b/bin/travis_script.sh similarity index 100% rename from travis_script.sh rename to bin/travis_script.sh From fa85205d27da0842021d4336a9e0a708b26dc09d Mon Sep 17 00:00:00 2001 From: Michael Ball Date: Thu, 25 Feb 2021 15:52:51 -0800 Subject: [PATCH 18/20] Cleanup travis a bit, add postgres, but its not used yet... --- .travis.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index fe35742e..a94c68ef 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,12 +1,14 @@ +language: ruby +cache: bundler +rvm: + - 2.6.6 dist: bionic addons: apt: packages: - chromium-browser -language: ruby -cache: bundler -rvm: - - 2.6.6 +services: + - postgresql branches: except: - /^depfu/.*$/ From 27b0022a88dfd99205f88581607774466339849c Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Tue, 2 Mar 2021 22:16:32 +0000 Subject: [PATCH 19/20] Update codecov to version 0.5.0 --- Gemfile.lock | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 929552b6..5909f6c4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -124,9 +124,8 @@ GEM aws_cf_signer rest-client cocoon (1.2.14) - codecov (0.2.11) - json - simplecov + codecov (0.5.0) + simplecov (>= 0.15, < 0.22) coderay (1.1.1) concurrent-ruby (1.1.8) countable-rails (0.0.1) @@ -159,7 +158,7 @@ GEM devise_ichain_authenticatable (0.3.2) devise (>= 2.2) diff-lcs (1.3) - docile (1.3.2) + docile (1.3.5) domain_name (0.5.20180417) unf (>= 0.0.5, < 1.0.0) dotenv (2.7.5) @@ -264,7 +263,7 @@ GEM thor (>= 0.14, < 2.0) jquery-ui-rails (6.0.1) railties (>= 3.2.16) - json (2.3.1) + json (2.5.1) json-schema (2.8.1) addressable (>= 2.4) jsonapi-renderer (0.2.2) @@ -584,10 +583,12 @@ GEM shellany (0.0.1) shoulda-matchers (4.1.2) activesupport (>= 4.2.0) - simplecov (0.19.0) + simplecov (0.21.2) docile (~> 1.1) simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) + simplecov_json_formatter (0.1.2) sixarm_ruby_unaccent (1.2.0) skylight (3.1.5) skylight-core (= 3.1.5) From 06b05b8177a78eef2842fbd994b526703ed020d2 Mon Sep 17 00:00:00 2001 From: Michael Ball Date: Tue, 2 Mar 2021 18:55:41 -0800 Subject: [PATCH 20/20] Fixup the last trapeziod on social media section --- app/assets/stylesheets/osem-splash.scss | 7 ++++++- app/views/conferences/_social_media.haml | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/app/assets/stylesheets/osem-splash.scss b/app/assets/stylesheets/osem-splash.scss index e2bdda65..09e8a31d 100644 --- a/app/assets/stylesheets/osem-splash.scss +++ b/app/assets/stylesheets/osem-splash.scss @@ -3,7 +3,8 @@ #splash { // Counter the general padding for #content - margin-bottom: -60px; + margin-bottom: -65px; + section { padding-top: 60px; padding-bottom: 60px; @@ -144,6 +145,10 @@ } } + .social-media.trapezoid { + border-top-color: #0C3559; // TODO: Use @conference color? + } + #social-media{ background: none repeat scroll 0 0 #0C3559; padding: 50px 20px; diff --git a/app/views/conferences/_social_media.haml b/app/views/conferences/_social_media.haml index ebbfb8e1..0f73e46a 100644 --- a/app/views/conferences/_social_media.haml +++ b/app/views/conferences/_social_media.haml @@ -27,4 +27,4 @@ - if contact.email? = mail_to "#{ contact.email }" do %i.fa.fa-envelope-o.fa-4x - .trapezoid + .trapezoid.social-media