Merge branch 'main' into billing/PM-24996/implement-upgrade-from-free-dialog

apps/web/src/locales/en/messages.json

@@ -59,8 +59,8 @@
   "createNewLoginItem": {
     "message": "Create new login item"
   },
-  "onceYouMarkCriticalApplicationsActivityDescription": {
-    "message": "Once you mark applications critical, they will display here."
+  "onceYouMarkApplicationsCriticalTheyWillDisplayHere": {
+    "message": "Once you mark applications critical, they will display here"
   },
   "viewAtRiskMembers": {
     "message": "View at-risk members"
@@ -165,8 +165,8 @@
   "membersAtRiskActivityDescription":{
     "message": "Members with edit access to at-risk items for critical applications"
   },
-  "membersAtRisk": {
-    "message": "$COUNT$ members at risk",
+  "membersAtRiskCount": {
+    "message": "$COUNT$ members at-risk",
     "placeholders": {
       "count": {
         "content": "$1",

bitwarden_license/bit-web/src/app/dirt/access-intelligence/all-activity.component.html

@@ -22,7 +22,7 @@
       <dirt-activity-card
         class="tw-col-span-2 tw-cursor-pointer"
         [title]="'atRiskMembers' | i18n"
-        [cardMetrics]="'membersAtRisk' | i18n: totalCriticalAppsAtRiskMemberCount"
+        [cardMetrics]="'membersAtRiskCount' | i18n: totalCriticalAppsAtRiskMemberCount"
         [metricDescription]="'membersAtRiskActivityDescription' | i18n"
         navigationText="{{ 'viewAtRiskMembers' | i18n }}"
         navigationLink="{{ getLinkForRiskInsightsTab(RiskInsightsTabType.AllApps) }}"
@@ -37,11 +37,11 @@
         [cardMetrics]="
           totalCriticalAppsCount === 0
             ? ('countOfCriticalApplications' | i18n: totalCriticalAppsCount)
-            : ('countOfApplicationsAtRisk' | i18n: totalCriticalAppsCount)
+            : ('countOfApplicationsAtRisk' | i18n: totalCriticalAppsAtRiskCount)
         "
         [metricDescription]="
           totalCriticalAppsCount === 0
-            ? ('onceYouMarkCriticalApplicationsActivityDescription' | i18n)
+            ? ('onceYouMarkApplicationsCriticalTheyWillDisplayHere' | i18n)
             : ('criticalApplicationsAreAtRisk'
               | i18n: totalCriticalAppsAtRiskCount : totalCriticalAppsCount)
         "

libs/components/src/form-field/form-field.component.html

@@ -56,7 +56,7 @@
         <ng-container *ngTemplateOutlet="prefixContent"></ng-container>
       </div>
       <div
-        class="tw-w-full tw-relative tw-py-1 has-[bit-select]:tw-p-0 has-[bit-multi-select]:tw-p-0 has-[input:read-only:not([hidden])]:tw-bg-secondary-100 has-[textarea:read-only:not([hidden])]:tw-bg-secondary-100 has-[textarea]:tw-my-1"
+        class="tw-w-full tw-relative tw-py-1 [&:has(select)_select]:tw-pe-6 has-[select]:after:tw-absolute has-[select]:after:tw-end-4 has-[select]:after:tw-top-[calc(50%_-_2px)] has-[select]:after:tw-rotate-[45deg] has-[select]:after:-tw-translate-y-1/2 has-[select]:after:tw-size-2 has-[select]:after:tw-border-text-main has-[select]:after:tw-border-r-[2px] has-[select]:after:tw-border-b-[2px] has-[bit-select]:tw-p-0 has-[bit-multi-select]:tw-p-0 has-[input:read-only:not([hidden])]:tw-bg-secondary-100 has-[textarea:read-only:not([hidden])]:tw-bg-secondary-100 has-[textarea]:tw-my-1"
         data-default-content
         [ngClass]="[
           prefixHasChildren() ? '' : 'tw-rounded-s-lg tw-ps-3',

libs/components/src/tw-theme-preflight.css

@@ -54,6 +54,14 @@
     display: none !important;
   }
 
+  dl {
+    @apply tw-mb-4;
+  }
+
+  dt {
+    @apply tw-font-bold;
+  }
+
   hr {
     border-color: rgba(0, 0, 0, 0.1);
   }