diff --git a/app/assets/stylesheets/podcast-episodes-show.scss b/app/assets/stylesheets/podcast-episodes-show.scss index 7e8f5b4ba..22d39e04e 100644 --- a/app/assets/stylesheets/podcast-episodes-show.scss +++ b/app/assets/stylesheets/podcast-episodes-show.scss @@ -196,34 +196,6 @@ display: none; } } - .subscribe-buttons { - text-align: center; - a { - padding: 5px; - background-color: rgb(47, 61, 73); - color: white; - border-radius: 3px; - margin: 6px; - font-size: 14px; - display: inline-block; - width: 40%; - border: 1px solid rgb(60, 81, 99); - box-shadow: inset 1px 1px 0 rgb(72, 95, 116); - transition: background-color 250ms ease; - @media screen and (min-width: 590px) { - width: 112px; - } - &:hover { - background-color: rgb(41, 46, 52); - } - img { - width: 20px; - height: 20px; - vertical-align: -4px; - margin-right: 4px; - } - } - } .container { margin-bottom: 60px; margin-top: 20px; diff --git a/app/assets/stylesheets/user-profile-header.scss b/app/assets/stylesheets/user-profile-header.scss index 03f62c7ff..20cc0e4b9 100644 --- a/app/assets/stylesheets/user-profile-header.scss +++ b/app/assets/stylesheets/user-profile-header.scss @@ -52,13 +52,19 @@ width: 100%; padding: 15px 0px; @media screen and (min-width: 950px) { - vertical-align: 3px; + vertical-align: 5px; display: inline-block; - font-size: calc(1.9vw + 8px); + font-size: calc(1.5vw + 8px); width: 280px; padding: 3px 0px; } } + @media screen and (min-width: 1600px) { + font-size: 55px; + .follow-action-button { + font-size: 32px; + } + } } img.record { height: 150px; @@ -76,37 +82,6 @@ vertical-align: calc(-1vw - 15px); } } - .subscribe-buttons { - text-align: center; - margin-top: 35px; - z-index: 10; - position: relative; - a { - padding: 5px; - background-color: rgb(47, 61, 73); - color: white; - border-radius: 3px; - margin: 6px; - font-size: 14px; - display: inline-block; - width: 40%; - border: 1px solid rgb(60, 81, 99); - box-shadow: inset 1px 1px 0 rgb(72, 95, 116); - transition: background-color 250ms ease; - @media screen and (min-width: 590px) { - width: 112px; - } - &:hover { - background-color: rgb(41, 46, 52); - } - img { - width: 20px; - height: 20px; - vertical-align: -4px; - margin-right: 4px; - } - } - } } .user-profile-header-container, .tag-or-query-header-container { diff --git a/app/views/api/v0/podcast_episodes/index.json.jbuilder b/app/views/api/v0/podcast_episodes/index.json.jbuilder index f394af89e..4737db1a6 100644 --- a/app/views/api/v0/podcast_episodes/index.json.jbuilder +++ b/app/views/api/v0/podcast_episodes/index.json.jbuilder @@ -1,5 +1,6 @@ json.array! @podcast_episodes do |episode| - json.type_of "podcast_episodes" + json.type_of "podcast_episodes" + json.class_name "PodcastEpisode" json.extract!(episode, :id, :path, :title) diff --git a/spec/requests/api/v0/podcasts_episodes_spec.rb b/spec/requests/api/v0/podcasts_episodes_spec.rb index 11468e1b5..4306bb08c 100644 --- a/spec/requests/api/v0/podcasts_episodes_spec.rb +++ b/spec/requests/api/v0/podcasts_episodes_spec.rb @@ -32,9 +32,10 @@ RSpec.describe "Api::V0::PodcastEpisodes", type: :request do get api_podcast_episodes_path response_episode = response.parsed_body.first - expect(response_episode.keys).to match_array(%w[type_of id path image_url title podcast]) + expect(response_episode.keys).to match_array(%w[class_name type_of id path image_url title podcast]) expect(response_episode["type_of"]).to eq("podcast_episodes") + expect(response_episode["class_name"]).to eq("PodcastEpisode") %w[id path title].each do |attr| expect(response_episode[attr]).to eq(podcast_episode.public_send(attr)) end