Merge branch 'staging' into feature/VOTE-119-accessibility-page-hi

usagov · Sep 14, 2023 · 8e47478 · 8e47478
2 parents d84bb0b + 186953f
commit 8e47478
Show file tree

Hide file tree

Showing 352 changed files with 3,635 additions and 3,928 deletions.
diff --git a/.github/workflows/cypress-axe-workflow.yml b/.github/workflows/cypress-axe-workflow.yml
@@ -15,9 +15,9 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Install node.js.
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
-          node-version: '16'
+          node-version: '18'
 
       - name: Install NPM dependencies.
         run: npm install

diff --git a/.github/workflows/cypress-external-links-cron-workflow.yml b/.github/workflows/cypress-external-links-cron-workflow.yml
@@ -20,9 +20,9 @@ jobs:
           ref: master
 
       - name: Install node.js.
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
-          node-version: '16'
+          node-version: '18'
 
       - name: Install NPM dependencies.
         run: npm install

diff --git a/.github/workflows/cypress-functional-workflow.yml b/.github/workflows/cypress-functional-workflow.yml
@@ -15,9 +15,9 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Install node.js.
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
-          node-version: '16'
+          node-version: '18'
 
       - name: Install NPM dependencies.
         run: npm install

diff --git a/.github/workflows/cypress-links-workflow.yml b/.github/workflows/cypress-links-workflow.yml
@@ -15,7 +15,7 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Install node.js.
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
           node-version: '18'
 

diff --git a/.stylelintrc.json b/.stylelintrc.json
@@ -1,151 +1,11 @@
 {
+  "extends": "stylelint-config-standard-scss",
   "rules": {
-    "at-rule-no-unknown": null,
-    "block-no-empty": true,
-    "color-no-invalid-hex": true,
-    "comment-no-empty": true,
-    "declaration-block-no-duplicate-custom-properties": true,
-    "declaration-block-no-duplicate-properties": [
-      true,
-      {
-        "ignore": [
-          "consecutive-duplicates-with-different-values"
-        ]
-      }
-    ],
-    "declaration-block-no-shorthand-property-overrides": true,
-    "font-family-no-duplicate-names": true,
-    "font-family-no-missing-generic-family-keyword": true,
-    "function-calc-no-invalid": true,
-    "function-calc-no-unspaced-operator": true,
-    "function-linear-gradient-no-nonstandard-direction": true,
-    "keyframe-declaration-no-important": true,
-    "media-feature-name-no-unknown": true,
-    "named-grid-areas-no-invalid": true,
-    "no-duplicate-at-import-rules": true,
-    "no-duplicate-selectors": true,
-    "no-empty-source": true,
-    "no-extra-semicolons": true,
-    "no-invalid-double-slash-comments": true,
-    "no-invalid-position-at-import-rule": null,
-    "no-irregular-whitespace": true,
-    "property-no-unknown": true,
-    "selector-pseudo-class-no-unknown": true,
-    "selector-pseudo-element-no-unknown": true,
-    "selector-type-no-unknown": [
-      true,
-      {
-        "ignore": [
-          "custom-elements"
-        ]
-      }
-    ],
-    "string-no-newline": true,
-    "unit-no-unknown": true,
-    "at-rule-empty-line-before": null,
-    "at-rule-name-case": "lower",
-    "at-rule-name-space-after": "always-single-line",
-    "at-rule-semicolon-newline-after": "always",
-    "block-closing-brace-empty-line-before": "never",
-    "block-closing-brace-newline-after": "always",
-    "block-closing-brace-newline-before": "always-multi-line",
-    "block-closing-brace-space-before": "always-single-line",
-    "block-opening-brace-newline-after": "always-multi-line",
-    "block-opening-brace-space-after": "always-single-line",
-    "block-opening-brace-space-before": "always",
-    "color-hex-case": "lower",
-    "color-hex-length": "short",
-    "comment-empty-line-before": [
-      "always",
-      {
-        "except": [
-          "first-nested"
-        ],
-        "ignore": [
-          "stylelint-commands"
-        ]
-      }
-    ],
-    "comment-whitespace-inside": "always",
-    "custom-property-empty-line-before": [
-      "always",
-      {
-        "except": [
-          "after-custom-property",
-          "first-nested"
-        ],
-        "ignore": [
-          "after-comment",
-          "inside-single-line-block"
-        ]
-      }
-    ],
-    "declaration-bang-space-after": "never",
-    "declaration-bang-space-before": "always",
-    "declaration-block-semicolon-newline-after": "always-multi-line",
-    "declaration-block-semicolon-space-after": "always-single-line",
-    "declaration-block-semicolon-space-before": "never",
-    "declaration-block-single-line-max-declarations": 1,
-    "declaration-block-trailing-semicolon": "always",
-    "declaration-colon-newline-after": "always-multi-line",
-    "declaration-colon-space-after": "always-single-line",
-    "declaration-colon-space-before": "never",
-    "declaration-empty-line-before": null,
-    "function-comma-newline-after": "always-multi-line",
-    "function-comma-space-after": "always-single-line",
-    "function-comma-space-before": "never",
-    "function-max-empty-lines": 0,
-    "function-name-case": "lower",
-    "function-parentheses-newline-inside": "always-multi-line",
-    "function-parentheses-space-inside": "never-single-line",
-    "function-whitespace-after": "always",
-    "indentation": 2,
-    "length-zero-no-unit": true,
-    "max-empty-lines": 1,
-    "media-feature-colon-space-after": "always",
-    "media-feature-colon-space-before": "never",
-    "media-feature-name-case": "lower",
-    "media-feature-parentheses-space-inside": "never",
-    "media-feature-range-operator-space-after": "always",
-    "media-feature-range-operator-space-before": "always",
-    "media-query-list-comma-newline-after": "always-multi-line",
-    "media-query-list-comma-space-after": "always-single-line",
-    "media-query-list-comma-space-before": "never",
-    "no-eol-whitespace": true,
-    "no-missing-end-of-source-newline": true,
-    "number-leading-zero": "always",
-    "number-no-trailing-zeros": true,
-    "property-case": "lower",
-    "rule-empty-line-before": [
-      "always-multi-line",
-      {
-        "except": [
-          "first-nested"
-        ],
-        "ignore": [
-          "after-comment"
-        ]
-      }
-    ],
-    "selector-attribute-brackets-space-inside": "never",
-    "selector-attribute-operator-space-after": "never",
-    "selector-attribute-operator-space-before": "never",
-    "selector-combinator-space-after": "always",
-    "selector-combinator-space-before": "always",
-    "selector-descendant-combinator-no-non-space": true,
-    "selector-list-comma-newline-after": "always",
-    "selector-list-comma-space-before": "never",
-    "selector-max-empty-lines": 0,
-    "selector-pseudo-class-case": "lower",
-    "selector-pseudo-class-parentheses-space-inside": "never",
-    "selector-pseudo-element-case": "lower",
+    "selector-class-pattern": null,
+    "selector-id-pattern": null,
+    "no-descending-specificity": null,
     "selector-pseudo-element-colon-notation": "single",
-    "selector-type-case": "lower",
-    "unit-case": "lower",
-    "value-keyword-case": "lower",
-    "value-list-comma-newline-after": "always-multi-line",
-    "value-list-comma-space-after": "always-single-line",
-    "value-list-comma-space-before": "never",
-    "value-list-max-empty-lines": 0
+    "media-feature-range-notation": null,
+    "at-rule-empty-line-before": null
   }
 }
diff --git a/assets/styles/component/accordion.scss b/assets/styles/component/accordion.scss
@@ -15,7 +15,7 @@
 
   .usa-accordion__button {
     font-size: 24px;
-    font-weight: 500;
+    font-weight: 400;
     background-color: $light-gray;
     padding: 1.8rem 3.5rem 1.8rem 1.3rem;
 
@@ -66,4 +66,4 @@
 
 [dir="rtl"] .usa-language-container {
   padding: 0.5rem 0 0.5rem 1rem;
-}
+}
diff --git a/assets/styles/component/identifier.scss b/assets/styles/component/identifier.scss
@@ -68,5 +68,6 @@ button#touchpoints-form-embed {
     left: 0;
     margin: auto;
     border-radius: 0;
+    width: 100%;
   }
 }
diff --git a/assets/styles/component/language-switcher.scss b/assets/styles/component/language-switcher.scss
@@ -2,6 +2,29 @@
   display: flex;
   justify-content: flex-end;
   padding: 0.5rem 1rem 0.5rem 0;
+  .usa-button {
+    a {
+      color: #fff;
+    }
+  }
+}
+
+.usa-language__submenu {
+  padding: 20px;
+  width: auto;
+  border-radius: 3px;
+  white-space: nowrap;
+  @media (max-width: 768px) {
+    overflow: auto;
+    height: 80vh;
+  }
+  @media (min-width: 768px) {
+    columns: 2 auto;
+  }
+}
+.usa-language__submenu-item {
+  padding: 8px;
+  border: unset;
 }
 
 .switcher-desktop {
@@ -23,8 +46,8 @@ li.usa-language__submenu-item[data-lang="lang-nv"] {
 
 .usa-language__primary-item:last-of-type .usa-language__submenu {
   [dir="rtl"] & {
+    position: absolute;
     right: unset;
     left: 0;
-    padding-right: 0;
   }
 }
diff --git a/config/_default/languages.json b/config/_default/languages.json
@@ -87,7 +87,7 @@
     "contentDir": "content/hi",
     "title": "मतदाता पंजीकरण ",
     "languageName": "हिन्दी ",
-    "weight": 8,
+    "weight": 9,
     "params": {
       "Owner": "%Vote.gov% हिन्दी में",
       "language_direction": "ltr",
@@ -108,7 +108,7 @@
     "contentDir": "content/ko",
     "title": "유권자 등록 ",
     "languageName": "한국어",
-    "weight": 10,
+    "weight": 11,
     "params": {
       "Owner": "%Vote.gov% 한국어 ",
       "language_direction": "ltr",
@@ -129,7 +129,7 @@
     "contentDir": "content/km",
     "title": "ការចុះឈ្មោះអ្នកបោះឆ្នោត",
     "languageName": "ភាសាខ្មែរ",
-    "weight": 9,
+    "weight": 10,
     "params": {
       "Owner": "%Vote.gov% ជាភាសាខ្មែរ",
       "language_direction": "ltr",
@@ -150,9 +150,9 @@
     "contentDir": "content/ru",
     "title": "Регистрация Избирателей",
     "languageName": "Русский",
-    "weight": 13,
+    "weight": 14,
     "params" : {
-      "Owner": "%Vote.gov% in Русский",
+      "Owner": "%Vote.gov% по-русски",
       "language_direction": "ltr",
       "publishDir": "tmp/public/ru",
       "register_path": "register",
@@ -171,7 +171,7 @@
     "contentDir": "content/tl",
     "title": "Pagpaparehistro ng Botante",
     "languageName": "Tagalog",
-    "weight": 14,
+    "weight": 15,
     "params": {
       "Owner": "%Vote.gov% sa Tagalog",
       "language_direction": "ltr",
@@ -192,7 +192,7 @@
     "contentDir": "content/vi",
     "title": "Đăng kí bầu cử",
     "languageName": "Tiếng Việt",
-    "weight": 15,
+    "weight": 16,
     "params": {
       "Owner": "%Vote.gov% bằng Tiếng Việt",
       "language_direction": "ltr",
@@ -255,7 +255,7 @@
     "contentDir": "content/ypk",
     "title": "Nakmikimun Ilatelleq",
     "languageName": "Yup'ik-Akuzipik",
-    "weight": 16,
+    "weight": 17,
     "params": {
       "Owner": "%Vote.gov% Akuzipigestun",
       "language_direction": "ltr",
@@ -277,7 +277,7 @@
     "contentDir": "content/nv",
     "title": "Check Voter Registration Deadlines and Laws in Your State in Diné (Navajo)",
     "languageName": "Diné",
-    "weight": 11,
+    "weight": 12,
     "params": {
       "Owner": "%Vote.gov% Diné",
       "language_direction": "ltr",
@@ -299,7 +299,7 @@
     "contentDir": "content/ht",
     "title": "Enskripsyon Votè",
     "languageName": "Kreyòl Ayisyen",
-    "weight": 7,
+    "weight": 8,
     "params": {
       "Owner": "%Vote.gov% an Kreyòl Ayisyen",
       "language_direction": "ltr",
@@ -316,11 +316,31 @@
       "ext_link_title": "Lyen ekstèn lan ap louvri yon nouvo fenèt"
     }
   },
+  "fr": {
+    "contentDir": "content/fr",
+    "title": "Inscription au vote",
+    "languageName": "Français",
+    "weight": 7,
+    "params": {
+      "Owner": "%Vote.gov% en Français",
+      "language_direction": "ltr",
+      "publishDir": "tmp/public/fr",
+      "register_path": "register",
+      "go_back": "Retourner en arrière",
+      "skip_text": "Passer au contenu principal",
+      "meta__title": "Inscrivez-vous pour voter",
+      "meta__description": "Découvrez les modes d'inscription au vote dans votre État",
+      "english_only": "(en anglais)",
+      "last_updated": "Dernière mise à jour :",
+      "select_language": "Sélectionner une langue %dropdown-list%",
+      "english_languageName": "French"
+    }
+  },
   "pt": {
     "contentDir": "content/pt",
     "title": "Registro de Eleitores",
     "languageName": "Português",
-    "weight": 12,
+    "weight": 13,
     "params": {
       "Owner": "%Vote.gov% em Português",
       "language_direction": "ltr",

diff --git a/content/ar/register/as.md b/content/ar/register/as.md
@@ -7,7 +7,7 @@ registration_type = "in-person"
 translationKey = "American Samoa"
 type = "register"
 hp_link = "https://aselectionoffice.gov/"
-more_info_link = "https://aselectionoffice.gov/"
+more_info_link = "https://aselectionoffice.gov/node/3"
 confirm_registration_link = "https://aselectionoffice.gov/status.php"
 default_ip_deadline = "29 يومًا قبل يوم الانتخابات"
 default_mail_received_deadline = "يجب أن يتم الاستلام قبل 29 يومًا من يوم الانتخابات"