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

Commit a4a0cf2

Browse files
author
Yuma Soga (YuSan | ゆ~さん)
authored
Merge pull request #34 from CoderDojo-Konan-Okayama/future/next-event-button_update
Update next event button.
2 parents d031d92 + cab76bd commit a4a0cf2

File tree

2 files changed

+13
-10
lines changed

2 files changed

+13
-10
lines changed

app/assets/stylesheets/staticpages.scss

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
.mdl-layout__header-row {
1818
margin-top: 0.5rem;
1919
.mdl-layout-title {
20-
20+
2121
}
2222
}
2323
.header-section {
@@ -31,14 +31,12 @@
3131
p {
3232
font-size: 1.6rem;
3333
line-height: 2rem;
34-
text-align: center;
34+
text-align: center;
3535
}
3636
}
3737
.header-section-button {
38-
width: 100%;
39-
height: 100%;
4038
a {
41-
height: 100%;
39+
color: white;
4240
font-size: 1.3rem;
4341
border-radius: 3px;
4442
padding-left: 0.8rem;
@@ -136,7 +134,7 @@ article {
136134
padding: 0.8rem;
137135
margin: 1rem;
138136
width: 20rem;
139-
height: 5rem;
137+
height: 5rem;
140138
list-style-type: none;
141139
display: inline-block;
142140
img {
@@ -164,7 +162,7 @@ article {
164162
display: inline-block;
165163
margin: 0.5rem;
166164
vertical-align: top;
167-
}
165+
}
168166
.twitter-timeline-box {
169167
display: inline-block;
170168
position: relative;
@@ -220,4 +218,4 @@ article {
220218
}
221219
.next_event_button:hover {
222220
opacity: 0.7;
223-
}
221+
}

app/views/staticpages/index.html.haml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,9 @@
2929
アドバイスをし、 そしてモノづくりの楽しさを共有します!
3030
.header-section-button
3131
- unless next_event_url.nil?
32-
= 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'
32+
= 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"
33+
- else
34+
= link_to "申し込みページは只今準備中です!", root_url, class: 'btn btn-disabled mdl-button mdl-js-button'
3335
.mdl-layout__drawer
3436
%span.mdl-layout-title CoderDojo Konan Okayama Official Site
3537
%nav.mdl-navigation
@@ -68,7 +70,10 @@
6870
%p 道場ごとに内容も規模も違いますが、Ninjaの自主性を重視している姿勢は一緒です。
6971
- unless next_event_url.nil?
7072
.mdl-card__actions.mdl-card--borde.next-event-button
71-
= link_to "次回の開催Check!", next_event_url, class: 'btn mdl-button mdl-button--colored mdl-button--raised mdl-js-button mdl-js-ripple-effect'
73+
= 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"
74+
- else
75+
.mdl-card__actions.mdl-card--borde.next-event-button
76+
= link_to "申し込みページは只今準備中です!", root_url, class: 'btn btn-disabled mdl-button mdl-js-button'
7277
%section#language-section
7378
.language-section-card.mdl-card.mdl-shadow--2dp
7479
.mdl-card__title

0 commit comments

Comments
 (0)