Skip to content

Add section of sponsers logo #86

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 16 commits into from
Jan 13, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added app/assets/images/logos/case-shinjuku.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/logos/case-shinjuku.pxm
Binary file not shown.
Binary file added app/assets/images/logos/osscafe.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/logos/osscafe.pxm
Binary file not shown.
Binary file added app/assets/images/logos/scrivito.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/logos/scrivito.pxm
Binary file not shown.
Binary file added app/assets/images/logos/yasslab.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/logos/yasslab.pxm
Binary file not shown.
29 changes: 29 additions & 0 deletions app/assets/stylesheets/custom.scss
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,35 @@ div #README{
margin: 0 !important;
}

// Sponsor section
.sponsors_logo {
ul{
padding-left: 0px;
}
li{
list-style-type: none;
display: inline-block;
padding-top: 20px;
width: 300px;
height: 120px;

@media only screen and (min-width: 560px) {
padding: 20px 0px 0px 0px;
margin: 0px 0px 0px 0px;
width: 220px;
height: 100px;
}
@media only screen and (min-width: 720px) {
padding: 0px 20px 0px 20px;
margin: 20px 0px 0px 0px;
width: 320px;
height: 100px;
}
img{
width:100%;
}
}
}

// Customized by @coderdojo-tokyo

Expand Down
25 changes: 22 additions & 3 deletions app/views/custom_widget/show.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<p>それぞれインタビュー形式で構成されているので、より具体的なイメージが掴めるかなと思います :)</p>

<ol style="list-style:none;">
<li style="display: inline-block; line-height: 11px;">
<li style="display: inline-block; line-height: 11px; margin-left: -35px;">
<div class="fb-like" data-href="https://coderdojo.jp" data-layout="button_count"
data-action="like" data-show-faces="true" data-share="true"></div></li>
<li style="display: inline-block;">
Expand Down Expand Up @@ -107,8 +107,27 @@

<p>本家サイトである CoderDojo (英語) では世界中の活動の様子が見れます。また、Facebook の CoderDojo Japan では日本全国の活動の様子を知ることができます。</p>
<p>「これまでの成り立ちを知りたい」「地元で道場を立ち上げてみたい」といった場合には <a href="/kata">CoderDojo Kata</a> を参照してみてください。</p>
<br />
<h2>お問い合わせ</h2>
</section>
</div>

<div id="sponsors">
<section class='detail-introduction sponsors_logo text-center'>
<h2>スポンサー</h2>
<ul>
<li><a href="https://case-shinjuku.com/">
<%= image_tag "logos/case-shinjuku.png"%></a></li>
<li><a href="http://www.osscafe.net/">
<%= image_tag "logos/osscafe.png"%></a></li>
<li><a href="https://scrivito.com/">
<%= image_tag "logos/scrivito.png"%></a></li>
<li><a href="https://yasslab.jp/">
<%= image_tag "logos/yasslab.png"%></a></li>
</ul>
</section>
</div>
<div class="text-center grayscale-bg">
<section class='detail-introduction'>
<h2>お問い合わせ</h2>

<p>取材や支援などのお問い合わせについては、下記からご連絡ください 📨<br />
メールの場合は担当の安川まで (<i>yohei@coderdojo.jp</i>) ご連絡ください。</p>
Expand Down
2 changes: 1 addition & 1 deletion db/dojos.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@
- Ruby
- name: 豊橋 (中部)
image_url: /img/dojos/coderdojo-toyohashi.png
url: https://coderdojo-toyohashi.doorkeeper.jp/
url: https://www.facebook.com/coderdojo.toyohashi/
description: 愛知県豊橋市で不定期開催
order: 44
tags:
Expand Down
9 changes: 9 additions & 0 deletions test/integration/top_test.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# -*- coding: utf-8 -*-
require 'test_helper'

class Toptest < ActionDispatch::IntegrationTest
test "Sponser links should be exist" do
get "/"
assert_select 'section.sponsors_logo a[href]', count:4
end
end