Skip to content
This repository was archived by the owner on Mar 19, 2020. It is now read-only.

Update next event button. #34

Merged
merged 2 commits into from
Jun 23, 2018
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
20 changes: 10 additions & 10 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -75,16 +75,16 @@ GEM
ethon (0.11.0)
ffi (>= 1.3.0)
execjs (2.7.0)
factory_bot (4.8.2)
factory_bot (4.10.0)
activesupport (>= 3.0.0)
factory_bot_rails (4.8.2)
factory_bot (~> 4.8.2)
factory_bot_rails (4.10.0)
factory_bot (~> 4.10.0)
railties (>= 3.0.0)
faraday (0.12.2)
multipart-post (>= 1.2, < 3)
faraday_middleware (0.12.2)
faraday (>= 0.7.4, < 1.0)
ffi (1.9.23)
ffi (1.9.25)
font-awesome-rails (4.7.0.4)
railties (>= 3.2, < 6.0)
gh (0.15.1)
Expand Down Expand Up @@ -154,8 +154,8 @@ GEM
net-http-persistent (2.9.4)
net-http-pipeline (1.0.1)
netrc (0.11.0)
nio4r (2.3.0)
nokogiri (1.8.2)
nio4r (2.3.1)
nokogiri (1.8.3)
mini_portile2 (~> 2.3.0)
oauth2 (1.4.0)
faraday (>= 0.8, < 0.13)
Expand All @@ -171,7 +171,7 @@ GEM
omniauth (~> 1.2)
omniauth-slack (2.3.0)
omniauth-oauth2 (~> 1.3.1)
pg (0.21.0)
pg (1.0.0)
pusher-client (0.6.2)
json
websocket (~> 1.0)
Expand Down Expand Up @@ -257,7 +257,7 @@ GEM
simplecov-html (0.10.2)
spring (2.0.2)
activesupport (>= 4.2)
sprockets (3.7.1)
sprockets (3.7.2)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.2.1)
Expand Down Expand Up @@ -286,7 +286,7 @@ GEM
ethon (>= 0.8.0)
tzinfo (1.2.5)
thread_safe (~> 0.1)
uglifier (4.1.10)
uglifier (4.1.12)
execjs (>= 0.3.0, < 3)
unf (0.1.4)
unf_ext
Expand All @@ -296,7 +296,7 @@ GEM
binding_of_caller (>= 0.7.2)
railties (>= 4.0)
sprockets-rails (>= 2.0, < 4.0)
websocket (1.2.5)
websocket (1.2.8)
websocket-driver (0.7.0)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.3)
Expand Down
14 changes: 6 additions & 8 deletions app/assets/stylesheets/staticpages.scss
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
.mdl-layout__header-row {
margin-top: 0.5rem;
.mdl-layout-title {

}
}
.header-section {
Expand All @@ -31,14 +31,12 @@
p {
font-size: 1.6rem;
line-height: 2rem;
text-align: center;
text-align: center;
}
}
.header-section-button {
width: 100%;
height: 100%;
a {
height: 100%;
color: white;
font-size: 1.3rem;
border-radius: 3px;
padding-left: 0.8rem;
Expand Down Expand Up @@ -136,7 +134,7 @@ article {
padding: 0.8rem;
margin: 1rem;
width: 20rem;
height: 5rem;
height: 5rem;
list-style-type: none;
display: inline-block;
img {
Expand Down Expand Up @@ -164,7 +162,7 @@ article {
display: inline-block;
margin: 0.5rem;
vertical-align: top;
}
}
.twitter-timeline-box {
display: inline-block;
position: relative;
Expand Down Expand Up @@ -220,4 +218,4 @@ article {
}
.next_event_button:hover {
opacity: 0.7;
}
}
9 changes: 7 additions & 2 deletions app/views/staticpages/index.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,9 @@
アドバイスをし、 そしてモノづくりの楽しさを共有します!
.header-section-button
- unless next_event_url.nil?
= link_to "次回の開催Check!", next_event_url, class: 'btn mdl-button mdl-js-button mdl-button--raised mdl-js-ripple-effect mdl-button--accent mdl-js-ripple-effect'
= link_to "次回の開催をCheck!", next_event_url, class: 'btn mdl-button mdl-js-button mdl-button--raised mdl-js-ripple-effect mdl-button--accent mdl-js-ripple-effect', target: "_new"
- else
= link_to "申し込みページは只今準備中です!", root_url, class: 'btn btn-disabled mdl-button mdl-js-button'
.mdl-layout__drawer
%span.mdl-layout-title CoderDojo Konan Okayama Official Site
%nav.mdl-navigation
Expand Down Expand Up @@ -68,7 +70,10 @@
%p 道場ごとに内容も規模も違いますが、Ninjaの自主性を重視している姿勢は一緒です。
- unless next_event_url.nil?
.mdl-card__actions.mdl-card--borde.next-event-button
= link_to "次回の開催Check!", next_event_url, class: 'btn mdl-button mdl-button--colored mdl-button--raised mdl-js-button mdl-js-ripple-effect'
= link_to "次回の開催をCheck!", next_event_url, class: 'btn mdl-button mdl-js-button mdl-button--raised mdl-js-ripple-effect mdl-button--accent mdl-js-ripple-effect', target: "_new"
- else
.mdl-card__actions.mdl-card--borde.next-event-button
= link_to "申し込みページは只今準備中です!", root_url, class: 'btn btn-disabled mdl-button mdl-js-button'
%section#language-section
.language-section-card.mdl-card.mdl-shadow--2dp
.mdl-card__title
Expand Down