浏览代码

Fix buttons linebreaking, color, placeholder

Maarten van den Berg 8 年之前
父节点
当前提交
1a570cd415
共有 3 个文件被更改,包括 12 次插入5 次删除
  1. 9 0
      app/assets/stylesheets/application.scss
  2. 2 4
      app/views/activities/show.html.erb
  3. 1 1
      app/views/dashboard/home.html.haml

+ 9 - 0
app/assets/stylesheets/application.scss

57
 body {
57
 body {
58
   padding-top: 70px;
58
   padding-top: 70px;
59
 }
59
 }
60
+
61
+/* Force .btn-groups to not break */
62
+table .btn-group {
63
+  display: flex;
64
+}
65
+
66
+.editable.editable-empty {
67
+  color: inherit;
68
+}

+ 2 - 4
app/views/activities/show.html.erb

14
     <tr class="<%= p.row_class %>" data-person-id="<%= p.person.id %>" data-activity-id="<%= @activity.id %>">
14
     <tr class="<%= p.row_class %>" data-person-id="<%= p.person.id %>" data-activity-id="<%= @activity.id %>">
15
       <td>
15
       <td>
16
         <%= p.person.full_name %>
16
         <%= p.person.full_name %>
17
-      </td>
18
-      <td>
19
-        <%= p.is_organizer %>
17
+        <% if p.is_organizer %><i class="fa fa-star-o"></i><% end %>
20
       </td>
18
       </td>
21
       <td>
19
       <td>
22
         <%=
20
         <%=
23
-          editable p, :notes, url: presence_group_activity_path(@activity.group, @activity, person_id: p.person_id), title: "Notes", value: p.notes
21
+          editable p, :notes, url: presence_group_activity_path(@activity.group, @activity, person_id: p.person_id), title: "Notes", value: p.notes, emptytext: "--"
24
         %>
22
         %>
25
       </td>
23
       </td>
26
       <td>
24
       <td>

+ 1 - 1
app/views/dashboard/home.html.haml

85
                   %td
85
                   %td
86
                     = render partial: "activities/presence_buttons", locals: {activity: e, person: current_person, state: p.attending}
86
                     = render partial: "activities/presence_buttons", locals: {activity: e, person: current_person, state: p.attending}
87
                   %td
87
                   %td
88
-                    = editable p, :notes, url: presence_group_activity_path(e.group, e, person_id: current_person.id), title: "Notes", value: p.notes
88
+                    = editable p, :notes, url: presence_group_activity_path(e.group, e, person_id: current_person.id), title: "Notes", value: p.notes, emptytext: 'Notes'