darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-14 23:08:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/GSA/notifications-admin into 718-clean-up-components-section

Browse Source 
# Conflicts:
#	app/templates/components/components/footer/_footer.scss
#	app/templates/components/components/hint/_hint.scss
#	app/templates/views/service-settings/data-retention.html
#	app/templates/views/service-settings/sms-senders.html
#	app/templates/views/two-factor-webauthn.html
#	app/templates/views/user-profile/security-keys.html
This commit is contained in:
Jonathan Bobel
2023-08-31 12:06:55 -04:00
parent 1881cd7c89 155ea99b36
commit c19083b04e
186 changed files with 3619 additions and 16898 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/templates/views/conversations/conversation.html
View File

@@ -16,7 +16,7 @@
<div class="dashboard">
<div class="bottom-gutter js-stick-at-top-when-scrolling">
<h1 class="heading-large govuk-!-margin-top-0">
<h1 class="heading-large">
{{ user_number }}
</h1>
</div>

8
app/templates/views/conversations/messages.html
View File

@@ -1,18 +1,18 @@
<div class="ajax-block-container">
{% for message in conversation %}
<div class="govuk-grid-row sms-message-row" id="n{{ message.id }}" tabindex="0">
<div class="grid-row sms-message-row" id="n{{ message.id }}" tabindex="0">
{% if message.inbound %}
<div class="govuk-grid-column-two-thirds sms-message-inbound">
<div class="grid-col-8 sms-message-inbound">
{{ message.content | string }}
<div class="sms-message-status">
{{ message.created_at | format_datetime_relative }}
</div>
</div>
{% else %}
<div class="govuk-grid-column-one-third">
<div class="grid-col-4">
&nbsp;
</div>
<div class="govuk-grid-column-two-thirds">
<div class="grid-col-8">
{{ message.content | string }}
{% if message.status == 'delivered' %}
<div class="sms-message-status sms-message-status-outbound">