Merge branch 'main' into ans_sonarcube_fixes

cfpb · Nov 8, 2023 · a074237 · a074237
2 parents fc5afb4 + 225e2ad
commit a074237
Show file tree

Hide file tree

Showing 30 changed files with 113 additions and 92 deletions.
diff --git a/...aying_for_college/jinja2/paying-for-college/college-cost-blocks/macros/secondary-nav.html b/...aying_for_college/jinja2/paying-for-college/college-cost-blocks/macros/secondary-nav.html
@@ -17,14 +17,14 @@
      aria-label="Section navigation">
     <button class="o-secondary-nav_header" type="button" aria-expanded="false">
         <span class="o-secondary-nav_label">
-            {{ _('In this section') }}
+            {{ _('Navigate this section') }}
         </span>
         <span class="o-secondary-nav_cues">
             <span class="o-secondary-nav_cue-open" aria-label="Show">
-                {{ svg_icon('plus-round') }}
+                {{ svg_icon('down') }}
             </span>
             <span class="o-secondary-nav_cue-close" aria-label="Hide">
-                {{ svg_icon('minus-round') }}
+                {{ svg_icon('up') }}
             </span>
         </span>
     </button>

diff --git a/cfgov/regulations3k/jinja2/regulations3k/regulations3k-secondary-nav.html b/cfgov/regulations3k/jinja2/regulations3k/regulations3k-secondary-nav.html
@@ -21,10 +21,10 @@
             </span>
             <span class="o-expandable_cues">
                 <span class="o-expandable_cue-open" role="img" aria-label="{{ _('Show') }}">
-                    {{ svg_icon('plus-round') }}
+                    {{ svg_icon('down') }}
                 </span>
                 <span class="o-expandable_cue-close" role="img" aria-label="{{ _('Hide') }}">
-                    {{ svg_icon('minus-round') }}
+                    {{ svg_icon('up') }}
                 </span>
             </span>
         </button>

diff --git a/cfgov/unprocessed/apps/ccdb-search/npm-packages-offline-cache/@cfpb-ccdb5-ui-2.9.1.tgz b/cfgov/unprocessed/apps/ccdb-search/npm-packages-offline-cache/@cfpb-ccdb5-ui-2.9.1.tgz
diff --git a/cfgov/unprocessed/apps/ccdb-search/npm-packages-offline-cache/@cfpb-ccdb5-ui-2.9.2.tgz b/cfgov/unprocessed/apps/ccdb-search/npm-packages-offline-cache/@cfpb-ccdb5-ui-2.9.2.tgz
diff --git a/cfgov/unprocessed/apps/ccdb-search/package.json b/cfgov/unprocessed/apps/ccdb-search/package.json
@@ -9,7 +9,7 @@
     "url": "https://cfpb.github.io/"
   },
   "dependencies": {
-    "@cfpb/ccdb5-ui": "2.9.1"
+    "@cfpb/ccdb5-ui": "2.9.2"
   },
   "repository": {
     "type": "git",

diff --git a/cfgov/unprocessed/apps/ccdb-search/yarn.lock b/cfgov/unprocessed/apps/ccdb-search/yarn.lock
@@ -2,7 +2,7 @@
 # yarn lockfile v1
 
 
-"@cfpb/[email protected].1":
-  version "2.9.1"
-  resolved "https://registry.yarnpkg.com/@cfpb/ccdb5-ui/-/ccdb5-ui-2.9.1.tgz#e66d1dce3e106f62e57bb5023ec1ae7ff738b236"
-  integrity sha512-1+0vmoBgDcUzRT64pjklD0a6B0U1DaUV+w5weUEE9tE6kHfVr/t19Tf/3fbcNT3l3Zzfvmm7XDTwirX+ybsEjw==
+"@cfpb/[email protected].2":
+  version "2.9.2"
+  resolved "https://registry.yarnpkg.com/@cfpb/ccdb5-ui/-/ccdb5-ui-2.9.2.tgz#497ad56cf589735e74702a5219b02538f5d25659"
+  integrity sha512-hmxIVxaBSxSEh7jzjdSIi0wjj/V0V1fVoveX5d9ovvLVUzmHPgHJE/krtfaCnlDkcHp2s9qv9Ta1wMYNKO256A==
diff --git a/cfgov/unprocessed/apps/regulations3k/css/reg-navigation.less b/cfgov/unprocessed/apps/regulations3k/css/reg-navigation.less
@@ -13,9 +13,10 @@
 
   .respond-to-max( @bp-sm-max, {
     background-color: @gray-5;
-    border-bottom: 1px solid @gray-40;
-    border-top: 1px solid @gray-40;
-    margin-bottom: unit( @grid_gutter-width / 2 / @base-font-size-px, em );
+    margin-bottom: unit( @grid_gutter-width / @base-font-size-px, em );
+
+    // Add drop-shadow.
+    box-shadow: 0 5px 5px rgba(0, 0, 0, 0.2);
   } );
 
   // TODO - this will be updated to data-open='true' in newer expandables.

diff --git a/cfgov/unprocessed/css/breadcrumbs.less b/cfgov/unprocessed/css/breadcrumbs.less
@@ -1,18 +1,22 @@
-.breadcrumbs {
+.m-breadcrumbs {
   // Mobile size.
+  position: relative;
   display: flex;
-  flex-wrap: wrap;
   gap: unit(10px / @base-font-size-px, rem);
   align-items: center;
+  flex-wrap: wrap;
+
   font-size: unit(14px / @base-font-size-px, rem);
   padding-top: unit(15px / @base-font-size-px, rem);
   padding-bottom: unit(15px / @base-font-size-px, rem);
-  margin-left: unit(20px / @base-font-size-px, rem);
-  margin-right: unit(20px / @base-font-size-px, rem);
+  min-height: 33px;
+  width: calc(100vw - 65px);
 
-  .cf-icon-svg {
-    fill: @pacific;
-    margin-left: unit(-20px / @base-font-size-px, rem);
+  &_crumbs {
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    display: block;
   }
 
   // Desktop size.
@@ -24,30 +28,25 @@
 
 // Hide on print.
 .respond-to-print( {
-  .breadcrumbs {
+  .m-breadcrumbs {
     display: none;
   }
 } );
 
 // Right-to-left (RTL) layout.
 html[lang='ar'] {
-  .breadcrumbs {
+  .m-breadcrumbs {
     margin-right: unit(20px / @base-font-size-px, rem);
     margin-left: unit(20px / @base-font-size-px, rem);
-
-    .cf-icon-svg {
-      margin-right: unit(-20px / @base-font-size-px, rem);
-      margin-left: initial;
-    }
   }
 }
 
 // TODO: When the layout-2-1 template is converted to use `u-layout-grid_wrapper`, this can be removed.
-.content_wrapper .breadcrumbs {
-  margin-left: unit(35px / @base-font-size-px, rem);
+.content_wrapper .m-breadcrumbs {
+  margin-left: unit(15px / @base-font-size-px, rem);
 
   // Tablet size only.
   .respond-to-range(@bp-sm-min, @bp-sm-max, {
-    margin-left: unit(50px / @base-font-size-px, rem);
+    margin-left: unit(30px / @base-font-size-px, rem);
   });
 }
diff --git a/cfgov/unprocessed/css/enhancements/layout-1-3.less b/cfgov/unprocessed/css/enhancements/layout-1-3.less
@@ -10,9 +10,28 @@
       }
     }
 
+    // Tablet and below.
+    .respond-to-max(@bp-sm-max, {
+      .u-layout-grid {
+        &_breadcrumbs {
+          padding-left: unit(30px / @base-font-size-px, rem);
+          padding-right: unit(30px / @base-font-size-px, rem);
+          margin-left: unit(-30px / @base-font-size-px, rem);
+          margin-right: unit(-30px / @base-font-size-px, rem);
+          background: @gray-5;
+          border-bottom: 1px solid @gray-40;
+        }
+      }
+    });
+
     // Tablet
     .respond-to-range( @bp-sm-min, @bp-sm-max, {
       .u-layout-grid {
+        &_breadcrumbs {
+          padding-left: unit(15px / @base-font-size-px, rem);
+          padding-right: unit(15px / @base-font-size-px, rem);
+        }
+
         &_secondary-nav {
           margin-left: unit(-30px / @base-font-size-px, rem);
           margin-right: unit(-30px / @base-font-size-px, rem);

diff --git a/cfgov/unprocessed/css/organisms/secondary-nav.less b/cfgov/unprocessed/css/organisms/secondary-nav.less
@@ -12,14 +12,14 @@
         <nav class="o-secondary-nav">
             <button class="o-secondary-nav_header">
                 <span class="o-secondary-nav_label">
-                    In this section
+                    Navigate this section
                 </span>
                 <span class="o-secondary-nav_cues">
                     <span class="o-secondary-nav_cue-open" aria-label="Show">
-                        {{ svg_icon('plus-round') }}
+                        {{ svg_icon('down') }}
                     </span>
                     <span class="o-secondary-nav_cue-close" aria-label="Hide">
-                        {{ svg_icon('minus-round') }}
+                        {{ svg_icon('up') }}
                     </span>
                 </span>
             </button>
@@ -110,7 +110,10 @@
     // Grow to available width.
     flex-grow: 1;
 
-    .h5();
+    font-size: unit(16px / @base-font-size-px, rem);
+    font-weight: 600;
+    letter-spacing: 1px;
+    color: @pacific;
 
     line-height: unit((22 / @size-v));
     margin-bottom: 0;
@@ -193,6 +196,9 @@
     background: @gray-5;
     border-bottom: 1px solid @gray-40;
 
+    // Add drop-shadow.
+    box-shadow: 0 5px 5px rgba(0, 0, 0, .2);
+
     &__no-children {
       display: none;
     }
@@ -202,11 +208,6 @@
         display: none;
       }
     }
-
-    .o-secondary-nav {
-      border-top: 1px solid @gray-40;
-      border-bottom: 1px solid @gray-40;
-    }
   } );
 
   // Desktop

diff --git a/cfgov/v1/jinja2/v1/includes/molecules/breadcrumbs.html b/cfgov/v1/jinja2/v1/includes/molecules/breadcrumbs.html
@@ -1,36 +1,43 @@
 {# ==========================================================================
 
-   breadcrumbs.render()
+    breadcrumbs.render()
 
-   ==========================================================================
+    ==========================================================================
 
-   Description:
+    Description:
 
-   Create breadcrumb markup when given:
+    Create breadcrumb markup when given:
 
-   breadcrumbs: An array of tuples used to display nav items.
-                Format: (href, live, title)
+    breadcrumbs: An array of tuples used to display nav items.
+                 Format: (href, live, title)
 
-   ========================================================================== #}
+    ========================================================================== #}
+
+ {% macro render( breadcrumbs ) %}
+     <nav class="m-breadcrumbs" aria-label="{{ _('Breadcrumbs') }}">
+
+         {# Change slash direction in RTL languages. #}
+         {% if language == 'ar' %}
+         {% set crumb_divider = ' \\ ' %}
+         {% else %}
+         {% set crumb_divider = ' / ' %}
+         {% endif %}
+
+         {% for crumb in breadcrumbs %}
+
+            {{ crumb_divider }}
 
-{% macro render( breadcrumbs ) %}
-    <nav class="breadcrumbs" aria-label="{{ _('Breadcrumbs') }}">
-        {{ svg_icon('left') }}
-        {% for crumb in breadcrumbs %}
             {% if crumb.href or crumb.live %}
-                <a href="{{ crumb.href if crumb.href else pageurl(crumb) }}">
-                    {{ crumb.title | e }}
+                <a class="m-breadcrumbs_crumb"
+                   href="{{ crumb.href if crumb.href else pageurl(crumb) }}">
+                    {{ crumb.title }}
                 </a>
             {% else %}
-                <span class="breadcrumbs_text">{{ crumb.title | e }}</span>
-            {% endif %}
-            {% if not loop.last %}
-                {% if language == 'ar' %}
-                \
-                {% else %}
-                /
-                {% endif %}
+                <span class="m-breadcrumbs_crumb">
+                    {{ crumb.title }}
+                </span>
             {% endif %}
-        {% endfor %}
-    </nav>
-{% endmacro %}
+
+         {% endfor %}
+     </nav>
+ {% endmacro %}
diff --git a/cfgov/v1/jinja2/v1/includes/organisms/secondary-nav-fig.html b/cfgov/v1/jinja2/v1/includes/organisms/secondary-nav-fig.html
@@ -41,10 +41,10 @@ <h3>Table of contents</h3>
             </span>
             <span class="o-secondary-nav_cues">
                 <span class="o-secondary-nav_cue-open" aria-label="Show">
-                    {{ svg_icon('plus-round') }}
+                    {{ svg_icon('down') }}
                 </span>
                 <span class="o-secondary-nav_cue-close" aria-label="Hide">
-                    {{ svg_icon('minus-round') }}
+                    {{ svg_icon('up') }}
                 </span>
             </span>
         </button>

diff --git a/cfgov/v1/jinja2/v1/includes/organisms/secondary-nav.html b/cfgov/v1/jinja2/v1/includes/organisms/secondary-nav.html
@@ -21,14 +21,14 @@
 
     <button class="o-secondary-nav_header" type="button" aria-expanded="false">
         <span class="o-secondary-nav_label">
-            {{ _('In this section') }}
+            {{ _('Navigate this section') }}
         </span>
         <span class="o-secondary-nav_cues">
             <span class="o-secondary-nav_cue-open" aria-label="Show">
-                {{ svg_icon('plus-round') }}
+                {{ svg_icon('down') }}
             </span>
             <span class="o-secondary-nav_cue-close" aria-label="Hide">
-                {{ svg_icon('minus-round') }}
+                {{ svg_icon('up') }}
             </span>
         </span>
     </button>

diff --git a/cfgov/v1/locale/ar/LC_MESSAGES/django.mo b/cfgov/v1/locale/ar/LC_MESSAGES/django.mo
diff --git a/cfgov/v1/locale/ar/LC_MESSAGES/django.po b/cfgov/v1/locale/ar/LC_MESSAGES/django.po
@@ -202,8 +202,8 @@ msgid "Section navigation"
 msgstr ""
 
 #: v1/jinja2/v1/includes/organisms/secondary-nav.html:18
-msgid "In this section"
-msgstr "في هذا القسم"
+msgid "Navigate this section"
+msgstr "انتقل إلى هذا القسم"
 
 #: v1/jinja2/v1/includes/organisms/video-player.html:60
 msgid "Close video"

diff --git a/cfgov/v1/locale/es/LC_MESSAGES/django.mo b/cfgov/v1/locale/es/LC_MESSAGES/django.mo
diff --git a/cfgov/v1/locale/es/LC_MESSAGES/django.po b/cfgov/v1/locale/es/LC_MESSAGES/django.po
@@ -209,8 +209,8 @@ msgid "Section navigation"
 msgstr "Navegación de la sección"
 
 #: v1/jinja2/v1/includes/organisms/secondary-nav.html:18
-msgid "In this section"
-msgstr "En esta sección"
+msgid "Navigate this section"
+msgstr "Navegue por esta sección"
 
 #: v1/jinja2/v1/includes/organisms/video-player.html:60
 msgid "Close video"

diff --git a/cfgov/v1/locale/ht/LC_MESSAGES/django.mo b/cfgov/v1/locale/ht/LC_MESSAGES/django.mo
diff --git a/cfgov/v1/locale/ht/LC_MESSAGES/django.po b/cfgov/v1/locale/ht/LC_MESSAGES/django.po
@@ -193,8 +193,8 @@ msgid "Section navigation"
 msgstr ""
 
 #: v1/jinja2/v1/includes/organisms/secondary-nav.html:18
-msgid "In this section"
-msgstr "Nan seksyon sa a"
+msgid "Navigate this section"
+msgstr "Vizite seksyon sa a"
 
 #: v1/jinja2/v1/includes/organisms/video-player.html:60
 msgid "Close video"

diff --git a/cfgov/v1/locale/ko/LC_MESSAGES/django.mo b/cfgov/v1/locale/ko/LC_MESSAGES/django.mo
diff --git a/cfgov/v1/locale/ko/LC_MESSAGES/django.po b/cfgov/v1/locale/ko/LC_MESSAGES/django.po
@@ -201,8 +201,8 @@ msgid "Section navigation"
 msgstr ""
 
 #: v1/jinja2/v1/includes/organisms/secondary-nav.html:18
-msgid "In this section"
-msgstr "이 섹션에서는"
+msgid "Navigate this section"
+msgstr "섹션 탐색하기"
 
 #: v1/jinja2/v1/includes/organisms/video-player.html:60
 msgid "Close video"

diff --git a/cfgov/v1/locale/ru/LC_MESSAGES/django.mo b/cfgov/v1/locale/ru/LC_MESSAGES/django.mo
diff --git a/cfgov/v1/locale/ru/LC_MESSAGES/django.po b/cfgov/v1/locale/ru/LC_MESSAGES/django.po
@@ -203,8 +203,8 @@ msgid "Section navigation"
 msgstr ""
 
 #: v1/jinja2/v1/includes/organisms/secondary-nav.html:18
-msgid "In this section"
-msgstr "В этом разделе"
+msgid "Navigate this section"
+msgstr "Навигация по этому разделу"
 
 #: v1/jinja2/v1/includes/organisms/video-player.html:60
 msgid "Close video"

diff --git a/cfgov/v1/locale/tl/LC_MESSAGES/django.mo b/cfgov/v1/locale/tl/LC_MESSAGES/django.mo
diff --git a/cfgov/v1/locale/tl/LC_MESSAGES/django.po b/cfgov/v1/locale/tl/LC_MESSAGES/django.po
@@ -193,8 +193,8 @@ msgid "Section navigation"
 msgstr ""
 
 #: v1/jinja2/v1/includes/organisms/secondary-nav.html:18
-msgid "In this section"
-msgstr "Sa seksyong ito"
+msgid "Navigate this section"
+msgstr "Galugarin ang seksyong ito"
 
 #: v1/jinja2/v1/includes/organisms/video-player.html:60
 msgid "Close video"

diff --git a/cfgov/v1/locale/vi/LC_MESSAGES/django.mo b/cfgov/v1/locale/vi/LC_MESSAGES/django.mo
diff --git a/cfgov/v1/locale/vi/LC_MESSAGES/django.po b/cfgov/v1/locale/vi/LC_MESSAGES/django.po
@@ -193,8 +193,8 @@ msgid "Section navigation"
 msgstr ""
 
 #: v1/jinja2/v1/includes/organisms/secondary-nav.html:18
-msgid "In this section"
-msgstr "Trong phần này"
+msgid "Navigate this section"
+msgstr "Điều hướng phần này"
 
 #: v1/jinja2/v1/includes/organisms/video-player.html:60
 msgid "Close video"

diff --git a/cfgov/v1/locale/zh_Hant/LC_MESSAGES/django.mo b/cfgov/v1/locale/zh_Hant/LC_MESSAGES/django.mo
diff --git a/cfgov/v1/locale/zh_Hant/LC_MESSAGES/django.po b/cfgov/v1/locale/zh_Hant/LC_MESSAGES/django.po
@@ -201,8 +201,8 @@ msgid "Section navigation"
 msgstr ""
 
 #: v1/jinja2/v1/includes/organisms/secondary-nav.html:18
-msgid "In this section"
-msgstr "本節概述"
+msgid "Navigate this section"
+msgstr "瀏覽本部分"
 
 #: v1/jinja2/v1/includes/organisms/video-player.html:60
 msgid "Close video"