Commit 8ef1017c authored by Tugce Nur Tas's avatar Tugce Nur Tas

resolve conflicts

parents 15d36095 75828baa
Pipeline #66739 passed with stage
in 37 minutes and 12 seconds
......@@ -31,3 +31,20 @@
.billing-expenses.new .table-scrollable {
max-height: 500px;
}
.table-multicolumn {
display: flex;
flex-wrap: wrap;
& > table:first-child {
margin-bottom: 0;
}
@media (min-width: $container-md) {
flex-wrap: nowrap;
& > table:not(:first-child) {
margin-left: 10px;
}
}
}
......@@ -2,7 +2,7 @@ h1.m-b-20= @client.contact.full_name
= render 'show_navigation'
.table-responsive.m-t-20
.table-responsive.table-multicolumn.m-t-20
table.table.table-no-border-top
tbody
tr
......@@ -75,7 +75,9 @@ h1.m-b-20= @client.contact.full_name
tr
td= t_attr(:created_at)
td= l(@client.created_at)
- if policy(Client).show_comments?
- if policy(Client).show_comments?
table.table.table-no-border-top.table-right
tbody
tr
td= t_attr(:comments_internal)
td= @client.comments
......
......@@ -26,7 +26,7 @@ h2.small Persönlicher Hintergrund
.col-xs-12.col-md-4
fieldset
= show_status_date(@volunteer, true, :created_at, :invited_at, :accepted_at, :undecided_at, :rejected_at, :resigned_at)
.table-responsive
.table-responsive.table-multicolumn
table.table.table-no-border-top
tbody
tr
......@@ -87,7 +87,9 @@ h2.small Persönlicher Hintergrund
= t('volunteer_self_applicant')
- else
= link_to @volunteer.registrar.full_name, profile_url_path(@volunteer.registrar)
- if policy(Volunteer).show_comments?
- if policy(Volunteer).show_comments?
table.table.table-no-border-top
tbody
tr
td= t_attr(:comments_internal)
td= @volunteer.comments
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment