Merge pull request #391 from isomerpages/next-gen-develop

Release (next gen)
isomerpages · Mar 18, 2024 · 3d539fd · 3d539fd
2 parents 9955619 + fec0de3
commit 3d539fd
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 23 deletions.
diff --git a/Gemfile b/Gemfile
@@ -1,10 +1,3 @@
-# frozen_string_literal: true
-
 source "https://rubygems.org"
-gem 'jekyll'
-group :jekyll_plugins do
-	gem "jekyll-feed"
-	gem "jekyll-assets"
-	gem "jekyll-sitemap"
-	gem "jekyll-paginate"
-end
+
+gem "isomer-jekyll", group: :jekyll_plugins
diff --git a/_config.yml b/_config.yml
@@ -20,10 +20,9 @@ url: "https://www.tech.gov.sg" # the base hostname & protocol for your site, e.g
 plugins:
   - jekyll-feed
   - jekyll-assets
-  # - jekyll-paginate
+  - jekyll-paginate
   - jekyll-sitemap
-  # - jekyll-paginate-v2
-  # - sanitize
+  - jekyll-remote-theme
 safe: false
 exclude:
   [

diff --git a/_includes/head.html b/_includes/head.html
@@ -48,7 +48,7 @@
     <link rel="stylesheet" href="{{- site.baseurl -}}/assets/css/blueprint.css">
     <link rel="stylesheet" href="{{- site.baseurl -}}{{- site.custom_css_path -}}">
     <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Lato:400,600" crossorigin="anonymous">
-    <link href='https://unpkg.com/boxicons@2.0.9/css/boxicons.min.css' rel='stylesheet'>
+    <link href='https://cdnjs.cloudflare.com/ajax/libs/boxicons/2.0.9/css/boxicons.min.css' rel='stylesheet'>
     {%- if site.vica -%}
         <link
             href="https://webchat.vica.gov.sg/static/css/chat.css"

diff --git a/_includes/homepage/hero.html b/_includes/homepage/hero.html
@@ -45,7 +45,7 @@ <h1 class="display padding--bottom--lg margin--none">
           section.hero.url and section.hero.button -%}
           <a
             href="{{- site.baseurl -}}{{- section.hero.url -}}"
-            class="bp-button is-secondary is-uppercase search-button"
+            class="bp-button is-secondary is-uppercase search-button hero-button"
           >
             {{- section.hero.button -}}
           </a>

diff --git a/_includes/main_scripts.html b/_includes/main_scripts.html
@@ -32,7 +32,7 @@
 
 
 {%- if page.layout == 'search' -%}
-<script src="https://unpkg.com/lunr@2.3.6/lunr.js" integrity="sha384-WYZhYwlpZbtVuVpKReDUDRhoKr0MubxAfgcS0k8y5lprnl0i482oHTKTBeWTbcaz" crossorigin="anonymous"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/lunr.js/2.3.6/lunr.js" integrity="sha384-WYZhYwlpZbtVuVpKReDUDRhoKr0MubxAfgcS0k8y5lprnl0i482oHTKTBeWTbcaz" crossorigin="anonymous"></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/dompurify/3.0.9/purify.min.js" integrity="sha384-3HPB1XT51W3gGRxAmZ+qbZwRpRlFQL632y8x+adAqCr4Wp3TaWwCLSTAJJKbyWEK" crossorigin="anonymous"></script>
 <script src="{{- "/assets/posts.js" | relative_url -}}"></script>
 <script src="{{- "/assets/js/worker.js" | relative_url -}}" crossorigin="anonymous"></script>

diff --git a/assets/css/blueprint.css b/assets/css/blueprint.css
@@ -11621,4 +11621,9 @@ h6 center {
 }
 .social-logo:hover {
   filter: brightness(1);
+}
+.hero-button.bp-button {
+  min-height: 2.4rem;
+  height: auto;
+  white-space: normal;
 }
diff --git a/assets/js/algolia-search.js b/assets/js/algolia-search.js
@@ -57,6 +57,16 @@ search.addWidgets([
             <p class="search-content description ml-9">Publish date: ${new Date(
               hit.publishTimestamp
             ).toLocaleDateString("fr-CA")}</p>
+            ${hit.text 
+              ? `<p class="search-content description ml-9">Content: ${instantsearch.snippet(
+                {
+                  attribute: "text",
+                  highlightedTagName: "mark",
+                  hit,
+                }
+              )}</p>`
+              : ""
+            }
             <p>
              </h5>
           `;

diff --git a/assets/js/worker.js b/assets/js/worker.js
@@ -1,4 +1,3 @@
-
 let loaded = false;
 
 async function loadcontext() {

diff --git a/netlify.toml b/netlify.toml
@@ -1,7 +0,0 @@
-[[headers]]
-  for = "/*"
-  [headers.values]
-    X-Frame-Options = "DENY"
-    X-XSS-Protection = "1; mode=block"
-    Referrer-Policy = "no-referrer"
-    X-Content-Type-Options = "nosniff"