🚧 [#2272] fix

maykinmedia · Apr 16, 2024 · b91bc05 · b91bc05
1 parent 790e45b
commit b91bc05
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 41 deletions.
diff --git a/src/open_inwoner/components/templates/components/File/File.html b/src/open_inwoner/components/templates/components/File/File.html
@@ -11,7 +11,7 @@
                 {% endif %}
             </p>
 
-            <p class="p file__data">
+            <p class="file__data">
                 {% if recently_added %}
                     <span class="file__file--recent">{% icon icon="fiber_manual_record" outlined=False extra_classes="file__file--recent" %}{% trans "Nieuw" %}</span>
                 {% endif %}

diff --git a/src/open_inwoner/js/components/form/FileInput.js b/src/open_inwoner/js/components/form/FileInput.js
@@ -298,10 +298,10 @@ export class FileInput extends Component {
                 type.match('image') ? 'image' : 'description'
               }</span>
             </p>
-            <p class="p file__data">
+            <p class="file__data">
               <span class="file__name">${name} (${ext}, ${sizeMB}MB)</span>
             </p>
-            <a class="link link--primary" href="#document-upload" role="button" aria-label="${labelDelete}">
+            <a class="link link--primary file__download" href="#document-upload" role="button" aria-label="${labelDelete}">
               <span aria-hidden="true" class="material-icons-outlined">delete</span>
             </a>
         </div>

diff --git a/src/open_inwoner/scss/components/File/File.scss b/src/open_inwoner/scss/components/File/File.scss
@@ -10,7 +10,7 @@
 
   &__file {
     align-items: center;
-    justify-content: space-between;
+    justify-content: flex-start;
     border: var(--border-width-thin) solid var(--color-gray);
     border-radius: var(--border-radius);
     box-sizing: border-box;
@@ -36,28 +36,28 @@
   &__data {
     display: flex;
     flex-direction: column;
+    font-family: var(--font-family-body);
 
-    .file__name {
-      display: inline-block;
-      white-space: nowrap;
-      text-overflow: ellipsis;
-      overflow: hidden;
-      min-width: 0;
-      min-height: 0;
-      flex: 1;
-    }
-  }
-
-  &__file .file__data {
-    width: 100%;
     align-items: flex-start;
     white-space: nowrap;
     text-overflow: ellipsis;
     overflow: hidden;
     min-width: 0;
     min-height: 0;
-    flex: 1;
+    //width: 100%;
+    //flex: 1;
     line-height: var(--spacing-extra-large);
+    //background-color: yellow;
+
+    .file__name {
+      display: inline-block;
+      //white-space: nowrap;
+      //text-overflow: ellipsis;
+      //overflow: hidden;
+      //min-width: 0;
+      //min-height: 0;
+      //flex: 1;
+    }
   }
 
   &__file .link,
@@ -67,7 +67,7 @@
   }
 
   .file__download {
-    //margin-left: auto;
+    margin-left: auto;
   }
 
   &__file .link:hover {

diff --git a/src/open_inwoner/scss/components/Typography/H2.scss b/src/open_inwoner/scss/components/Typography/H2.scss
@@ -36,7 +36,7 @@
   }
 
   &.indicator {
-    //display: inline-block;
+    display: inline-block;
     justify-content: flex-start;
     overflow: visible;
     position: relative;
@@ -47,7 +47,7 @@
       border-radius: 100px;
       display: inline-block;
       height: 8px;
-      //position: absolute;
+      position: absolute;
       right: -12px;
       top: 6px;
       width: 8px;

diff --git a/src/open_inwoner/templates/cms/plugins/userfeed/userfeed.html b/src/open_inwoner/templates/cms/plugins/userfeed/userfeed.html
@@ -2,16 +2,9 @@
 
 {% if userfeed %}
 <section class="plugin userfeed">
-    <div class="userfeed__heading">
-{#        <h2 class="h2 {% if userfeed.action_required %}indicator{% endif %}">#}
-{#            <span class="userfeed__heading-title">{{ instance.title }}</span>#}
-{#            {% if userfeed.action_required %}<span class="userfeed__heading-indicator"></span>{% endif %}#}
-{#        </h2>#}
-        <h2 class="h2 {% if userfeed.action_required %}indicator{% endif %}">
-            {{ instance.title }}
-        </h2>
-    </div>
-
+    <h2 class="h2 {% if userfeed.action_required %}indicator{% endif %}">
+        {{ instance.title }}
+    </h2>
     <div class="userfeed__summary">
         <ul class="userfeed__list">
             {% for line in userfeed.summary %}

diff --git a/src/open_inwoner/templates/pages/cases/status_inner.html b/src/open_inwoner/templates/pages/cases/status_inner.html
@@ -1,6 +1,6 @@
 {% load i18n utils anchor_menu_tags card_tags file_tags form_tags grid_tags table_tags solo_tags link_tags button_tags icon_tags notification_tags %}
 
-{# Messages #}
+{#  Messages #}
 <div class="container container--no-margin" id="cases-status-messages-oob" hx-swap-oob="true">
     {% notifications messages closable=True %}
 </div>
@@ -11,7 +11,7 @@
 {% if case %}
     {% render_grid %}
         {% render_column span=12 %}
-            {# Title/dashboard #}
+            {#  Title/dashboard #}
             <h1 class="utrecht-heading-1" id="title">{{ case.description }}</h1>
             {% include "components/Dashboard/Dashboard.html" with metrics=metrics only %}
         {% endrender_column %}
@@ -60,17 +60,11 @@ <h2 class="h2" id="documents-upload">{% trans "Document toevoegen" %}</h2>
 
             {#  Documents #}
             {% if case.documents %}
-                <div class="file-list__heading">
-{#                    <h2 class="h2 file-list__h2 {% if case.new_docs %}indicator{% endif %}" id="documents">#}
-{#                        <span class="file-list__heading-title">{% trans 'Eerder toegevoegde documenten' %}</span>#}
-{#                        <span class="file-list__heading-indicator indicator"></span>#}
-{#                    </h2>#}
-                    <h2 class="h2 {% if case.new_docs %}indicator{% endif %}" id="documents">{% trans 'Eerder toegevoegde documenten' %}</h2>
-                </div>
+                <h2 class="h2 {% if case.new_docs %}indicator{% endif %}" id="documents">{% trans 'Eerder toegevoegde documenten' %}</h2>
                 {% case_document_list case.documents %}
             {% endif %}
 
-            {# Questions/contactmomenten #}
+            {#  Questions/contactmomenten #}
             {% if case.questions %}
                 {% include "pages/questions/questions.html" with questions=case.questions only %}
                 {% if case.questions|length > 3 %}