Skip to content
This repository has been archived by the owner on Jun 29, 2020. It is now read-only.

Commit

Permalink
クラスの命名がアレだったのなおした
Browse files Browse the repository at this point in the history
  • Loading branch information
tunacook committed Dec 6, 2014
1 parent 9dd1cb2 commit cd8e1d2
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion src/kawaz/apps/events/fixtures/debug.yaml
Expand Up @@ -14,7 +14,7 @@
pub_state: public
number_restriction: 3
title: 5/22 Kawazミーティング
attendance_deadline: "2014-11-01 00:00:00+09:00"
attendance_deadline: "2015-11-01 00:00:00+09:00"
body: |-
##### 概要
Expand Down
4 changes: 2 additions & 2 deletions src/statics/less/events.less
Expand Up @@ -146,11 +146,11 @@
.page-header-right {
text-align: center;
padding: 0;
.event-join-utility {
.event-status-control {
width: 220px;
margin: 10px auto 0;
.btn-danger {
.glyphicon {
.event-attend-icon {
margin-right: 5px;
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/templates/events/event_detail.html
Expand Up @@ -70,7 +70,7 @@ <h2>{{ event.title }}</h2>
</div>
</div>
<div class="col col-lg-3 col-xs-12 page-header-right">
<div class="event-join-utility">
<div class="event-status-control">
{# event.number_restriction が設定されている場合は「あと何人」参加可能かを計算し変数に代入 #}
{% if even.number_restriction %}
{% expr event.number_restriction - event.attendees.count() as remaining_attendees_restriction %}
Expand Down Expand Up @@ -110,7 +110,7 @@ <h2>{{ event.title }}</h2>
{# イベント参加者 #}
<a href="{% url "events_event_quit" event.pk %}"
class="btn btn-danger btn-large btn-lg btn-primary post-link">

This comment has been minimized.

Copy link
@shinka-cb

shinka-cb Dec 6, 2014

Member

btn-dangerbtn-primaryの2つのクラスが同居しているのは良くないと思います。

参考リンク

<span class="glyphicon glyphicon-log-out"></span><span>{% trans "Withdraw from the event" %}</span>
<span class="glyphicon glyphicon-log-out event-attend-icon"></span><span>{% trans "Withdraw from the event" %}</span>
<form method="POST" style="display: none;">{% csrf_token %}</form>
</a>
{% else %}
Expand Down

0 comments on commit cd8e1d2

Please sign in to comment.