Skip to content

Commit 6bd5817

Browse files
committed
Merge commit '4f51d40cf65debbdbd42086cfff7781a09bc0a05' into add_upcoming_events_task
2 parents b7e0ec4 + 4f51d40 commit 6bd5817

File tree

8 files changed

+11
-7
lines changed

8 files changed

+11
-7
lines changed

app.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,6 @@
4646
},
4747
"RACK_ENV": "staging",
4848
"RAILS_ENV": "staging",
49-
// "RACK_ENV": { "required": true },
50-
// "RAILS_ENV": { "required": true },
5149
"RAILS_SERVE_STATIC_FILES": {
5250
"required": true
5351
},

app/assets/stylesheets/custom.scss

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@
33

44
// Customized by YassLab team
55

6+
/* DojoCast Cover Photo */
7+
.dojocast-cover {
8+
border-radius: 0px;
9+
}
10+
611
/* DocSearch by Algolia */
712
.search {
813
padding-top: 17px;
@@ -493,7 +498,8 @@ a {
493498
margin-left: auto;
494499
margin-right: auto;
495500
display: block;
496-
margin-top: -3%
501+
margin-top: -3%;
502+
border-radius: 0px;
497503
}
498504

499505
.dojos > ul {

app/controllers/podcasts_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
class PodcastsController < ApplicationController
22
def index
33
@title = 'DojoCast'
4-
@description = 'Highlight people around CoderDojo communities by Podcast.'
4+
@description = 'Highlight people around CoderDojo community by Podcast.'
55
@episodes = SoundCloudTrack.all.sort_by{ |episode| episode.published_at }
66
@url = request.url
77
@next_live_date = ENV['NEXT_LIVE_DATE'] || '未定'

app/views/podcasts/index.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<% provide(:desc, @description) %>
33
<% provide(:url, @url ) %>
44

5-
<img alt="DojoCast Cover Photo" src="/img/dojocast-cover.jpg" />
5+
<img class="dojocast-cover" alt="DojoCast Cover Photo" src="/img/dojocast-cover.jpg" />
66

77
<div class="container" style="line-height: 2.2em;">
88
<section class="keiyaku" style="padding: 50px 0px 0px 0px;">

app/views/podcasts/show.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<% provide(:desc, @episode.description) %>
33
<% provide(:url, @url) %>
44

5-
<img alt="DojoCast Cover Photo" src="/img/dojocast-cover.jpg" />
5+
<img class="dojocast-cover" alt="DojoCast Cover Photo" src="/img/dojocast-cover.jpg" />
66

77
<style type="text/css">
88
.prev { display: table-cell; font-color: white; text-align: left; }

public/img/dojocast-cover.jpg

-618 Bytes
Loading

public/img/dojocast-cover.pxm

-3.23 KB
Binary file not shown.

public/podcasts/10.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ CoderDojo 共同創設者の [@Whelton](https://twitter.com/whelton) と、Coder
1717
## 📝 Shownote
1818

1919
- [James Whelton - Wikipedia](https://en.wikipedia.org/wiki/James_Whelton)
20-
- [DojoCast - Highlight people around CoderDojo communities by Podcast 📻✨](/podcasts)
20+
- [DojoCast - Highlight people around CoderDojo community by Podcast 📻✨](/podcasts)
2121
- [Progate - Learn to code, learn to be creative.](https://progate.com/)
2222
- [プログラミング学習のProgate、全国のCoderDojoへ法人プランの無料提供開始](https://news.coderdojo.jp/2018/10/29/%E3%83%97%E3%83%AD%E3%82%B0%E3%83%A9%E3%83%9F%E3%83%B3%E3%82%B0%E5%AD%A6%E7%BF%92%E3%81%AEprogate%E3%80%81%E5%85%A8%E5%9B%BD%E3%81%AEcoderdojo%E3%81%B8%E6%B3%95%E4%BA%BA%E3%83%97%E3%83%A9%E3%83%B3/)
2323
- [DojoCon Japan 2017](https://dojocon2017.coderdojo.jp/)

0 commit comments

Comments
 (0)