Update TNA Frontend

nationalarchives · Jan 16, 2024 · 413f9cc · 413f9cc
1 parent 6a7d972
commit 413f9cc
Show file tree

Hide file tree

Showing 7 changed files with 72 additions and 16 deletions.
diff --git a/app/static/images/icon-maskable-1024x1024.png b/app/static/images/icon-maskable-1024x1024.png
diff --git a/app/static/manifest.json b/app/static/manifest.json
@@ -2,24 +2,84 @@
   "short_name": "National Archives",
   "name": "The National Archives",
   "theme_color": "#000",
-  "_icons": [
+  "icons": [
     {
-      "src": "/static/assets/images/apple-touch-icon-152x152.png",
+      "src": "/static/assets/images/icon-48x48.png",
+      "type": "image/png",
+      "sizes": "48x48",
+      "purpose": "any"
+    },
+    {
+      "src": "/static/assets/images/icon-72x72.png",
+      "type": "image/png",
+      "sizes": "72x72",
+      "purpose": "any"
+    },
+    {
+      "src": "/static/assets/images/icon-96x96.png",
+      "type": "image/png",
+      "sizes": "96x96",
+      "purpose": "any"
+    },
+    {
+      "src": "/static/assets/images/icon-120x120.png",
+      "type": "image/png",
+      "sizes": "120x120",
+      "purpose": "any"
+    },
+    {
+      "src": "/static/assets/images/icon-144x144.png",
+      "type": "image/png",
+      "sizes": "144x144",
+      "purpose": "any"
+    },
+    {
+      "src": "/static/assets/images/icon-152x152.png",
       "type": "image/png",
       "sizes": "152x152",
       "purpose": "any"
     },
     {
-      "src": "/static/assets/images/apple-touch-icon-167x167.png",
+      "src": "/static/assets/images/icon-167x167.png",
       "type": "image/png",
       "sizes": "167x167",
       "purpose": "any"
     },
     {
-      "src": "/static/assets/images/apple-touch-icon-180x180.png",
+      "src": "/static/assets/images/icon-180x180.png",
       "type": "image/png",
       "sizes": "180x180",
       "purpose": "any"
+    },
+    {
+      "src": "/static/assets/images/icon-192x192.png",
+      "type": "image/png",
+      "sizes": "192x192",
+      "purpose": "any"
+    },
+    {
+      "src": "/static/assets/images/icon-256x256.png",
+      "type": "image/png",
+      "sizes": "256x256",
+      "purpose": "any"
+    },
+    {
+      "src": "/static/assets/images/icon-512x512.png",
+      "type": "image/png",
+      "sizes": "512x512",
+      "purpose": "any"
+    },
+    {
+      "src": "/static/assets/images/icon-1024x1024.png",
+      "type": "image/png",
+      "sizes": "1024x1024",
+      "purpose": "any"
+    },
+    {
+      "src": "/static/images/icon-maskable-1024x1024.png",
+      "type": "image/png",
+      "sizes": "1024x1024",
+      "purpose": "maskable"
     }
   ],
   "start_url": "/explore-the-collection/?source=pwa",

diff --git a/app/templates/explore/base.html b/app/templates/explore/base.html
@@ -6,7 +6,7 @@
 
 {% block stylesheets %}
 {{ super() }}
-<link rel="stylesheet" href="{{ url_for('static', filename='articles.min.css') }}">
+<link rel="stylesheet" href="{{ url_for('static', filename='article.min.css') }}">
 {% endblock %}
 
 {% block head %}

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,16 +1,16 @@
 {
   "scripts": {
-    "build:css": "sass --style=compressed --load-path=node_modules --embed-sources src/styles/app.scss:app/static/app.min.css src/styles/search.scss:app/static/search.min.css src/styles/articles.scss:app/static/articles.min.css src/styles/catalogue.scss:app/static/catalogue.min.css",
+    "build:css": "sass --style=compressed --load-path=node_modules --embed-sources src/styles/app.scss:app/static/app.min.css src/styles/search.scss:app/static/search.min.css src/styles/article.scss:app/static/article.min.css src/styles/catalogue.scss:app/static/catalogue.min.css",
     "build:js": "webpack",
     "build": "npm run build:css && npm run build:js",
-    "dev:css": "sass --load-path=node_modules --watch src/styles/app.scss:app/static/app.min.css src/styles/search.scss:app/static/search.min.css src/styles/articles.scss:app/static/articles.min.css src/styles/catalogue.scss:app/static/catalogue.min.css",
+    "dev:css": "sass --load-path=node_modules --watch src/styles/app.scss:app/static/app.min.css src/styles/search.scss:app/static/search.min.css src/styles/article.scss:app/static/article.min.css src/styles/catalogue.scss:app/static/catalogue.min.css",
     "dev:js": "webpack --config webpack.config.js --mode=development --watch",
     "dev": "npm run dev:css & npm run dev:js &",
     "lint": "prettier --check src && stylelint 'src/styles/**/*.scss' && eslint 'src/scripts/**/*.js'",
     "lint:fix": "prettier --write src && stylelint --fix 'src/styles/**/*.scss' && eslint --fix 'src/scripts/**/*.js'"
   },
   "dependencies": {
-    "@nationalarchives/frontend": "0.1.34"
+    "@nationalarchives/frontend": "0.1.35"
   },
   "devDependencies": {
     "@babel/core": "^7.22.11",

diff --git a/src/styles/articles.scss → src/styles/article.scss b/src/styles/articles.scss → src/styles/article.scss
diff --git a/src/styles/modules/_frontend-overrides.scss b/src/styles/modules/_frontend-overrides.scss
@@ -28,10 +28,6 @@
 }
 
 .tna-card {
-  &--horizontal {
-    aspect-ratio: auto 3/1;
-  }
-
   &.etna-promoted-item {
     @include colour.colour-background("background-tint");