Projet

Général

Profil

0001-manager-improve-association-between-day-label-and-ho.patch

Frédéric Péters, 22 septembre 2018 15:43

Télécharger (2,64 ko)

Voir les différences:

Subject: [PATCH] manager: improve association between day label and hours
 (#26426)

 chrono/manager/static/css/style.scss          | 19 +++++++++++++------
 .../chrono/manager_agenda_day_view.html       |  2 +-
 .../chrono/manager_agenda_month_view.html     |  2 +-
 3 files changed, 15 insertions(+), 8 deletions(-)
chrono/manager/static/css/style.scss
120 120
	}
121 121
	&.weekday {
122 122
		width: 12.5%;
123
		padding-top: 3rem;
123 124
	}
124 125
}
125 126

  
126
.agenda-table tbody tr:nth-child(2n+1) th.hour,
127
.agenda-table tbody tr:nth-child(2n+1) td {
127
.agenda-table tbody tr:first-child th.weekday {
128
	// don't add extra padding on top row
129
	padding-top: 0;
130
}
131

  
132
.agenda-table tbody tr.odd th.hour,
133
.agenda-table tbody tr.odd td {
128 134
	background: #f0f0f0;
129 135
	@media print {
130 136
		border-top: 1px solid #aaa;
131 137
	}
132 138
}
133 139

  
140
.agenda-table tbody tr.odd td.other-month {
141
	background: #f8f8f8;
142
}
143

  
144

  
134 145
.agenda-table tbody td {
135 146
	padding: 0 1ex;
136 147
	vertical-align: top;
......
143 154
	border-width: 0 5px;
144 155
}
145 156

  
146
.agenda-table tbody tr td.other-month {
147
	background: transparent;
148
}
149

  
150 157
@for $i from 1 through 60 {
151 158
	table.hourspan-#{$i} tbody td {
152 159
		height: calc(#{$i} * 2.5em);
chrono/manager/templates/chrono/manager_agenda_day_view.html
48 48
  <tbody>
49 49
{% endif %}
50 50

  
51
    <tr>
51
    <tr class="{% cycle 'odd' 'even' %}">
52 52
      <th class="hour">{{ period|date:"TIME_FORMAT" }}</th>
53 53
      {% for desk_info in desk_infos %}
54 54
      <td>
chrono/manager/templates/chrono/manager_agenda_month_view.html
43 43
    {% endfor %}
44 44
  </tr>
45 45
  {% for hour in week_days.periods %}
46
  <tr>
46
  <tr class="{% cycle 'odd' 'even' %}">
47 47
    <th class="hour">{{ hour|date:"TIME_FORMAT" }}</th>
48 48
    {% for day in week_days.days %}
49 49
    <td{% if day.other_month %} class="other-month"{% endif %}>
50
-