Skip to content

Commit 84790bd

Browse files
Merge branch 'main' into feature/23748-round-time-entries-on-create
2 parents 3004d16 + 735ae95 commit 84790bd

File tree

5 files changed

+14
-56
lines changed

5 files changed

+14
-56
lines changed

app/components/timer_session_entry_component.html.erb

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
1-
<tr class="timer-session-table-row <%= row_classes %>">
2-
<td class="timer-session-subject" colspan="2">
3-
<div class="issue-links">
4-
<% issue_link_list(timer_session_entry.issues).each do |issue_link| %>
5-
<%= issue_link %><br>
6-
<% end %>
7-
</div>
8-
<p class="comments"><%= timer_session_entry.comments %></p>
1+
<tr class="<%= row_classes %>">
2+
<td class="td-px-0 w-40">
3+
<% issue_link_list(timer_session_entry.issues).each do |issue_link| %>
4+
<%= issue_link %>
5+
<br>
6+
<% end %>
97
</td>
10-
<td class="whitespace-nowrap"><%= timer_session_entry.formated_session_time %></td>
11-
<td class="whitespace-nowrap"><%= format_worked_hours(timer_session_entry.recorded_hours) %></td>
12-
<td class="whitespace-nowrap timer-session-table-actions">
8+
<td class="w-20"><%= timer_session_entry.comments %></td>
9+
<td><%= timer_session_entry.formated_session_time %></td>
10+
<td><%= format_worked_hours(timer_session_entry.recorded_hours) %></td>
11+
<td class="timer-session-table-actions">
1312
<% if timer_session_entry? %>
1413
<% if can_continue_entry? %>
1514
<%= link_to timer_sessions_continue_path(timer_session_entry),

app/views/timer_sessions/index.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<div class="redmine-tracky">
2-
<div class="w-100">
2+
<div class="w-75 mx-auto">
33
<h1 class="text-center"><%= t('timer_sessions.index.title') %></h1>
44
<div class="w-100 mt-3" data-timer-session-container>
55
<%= render 'timer_container', timer_session: @current_timer_session %>

assets.src/src/styles/time_sessions_table.scss

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,10 @@
11
@import 'variables';
22

33
.redmine-tracky {
4-
.timer-session-table-row {
5-
display: flex;
6-
}
7-
84
.timer-sessions-table td {
95
text-align: left !important;
106
}
117

12-
.timer-session-subject {
13-
display: flex;
14-
flex-grow: 1;
15-
16-
.issue-links {
17-
width: 40%;
18-
}
19-
20-
.comments {
21-
width: 60%;
22-
}
23-
}
24-
258
.timer-session-table-actions {
269
text-align: right !important;
2710
}

assets.src/src/styles/utils.scss

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,6 @@
2828
color: #d74427;
2929
}
3030

31-
.whitespace-nowrap {
32-
white-space: nowrap;
33-
width: fit-content;
34-
}
35-
3631
.w-20 {
3732
width: 20% !important;
3833
}
@@ -87,7 +82,6 @@
8782

8883
.timer-sessions-table {
8984
border-collapse: collapse;
90-
table-layout: auto;
9185
}
9286

9387
.timer-sessions-table > td {

assets/javascripts/redmine-tracky.js

Lines changed: 3 additions & 21 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)