katalyst-koi 5.0.0.alpha.1 → 5.0.0.alpha.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4080b3cf1a331e6a44c27073860147d44ba416aedee36ed5b9544e53b053337e
-  data.tar.gz: 7cd2b85aaafa0703b7276efdaeab07a05aa5cf104b9e88a26af0cedd2759a787
+  metadata.gz: 8fcedc1a4ceaad07f40a65c739317ff349bf3eb7e758e5ed044ec2839c04e825
+  data.tar.gz: f3305d49058f1c1dcfb3b6481580bd5c32b1061442905c43eab21f7aa609566a
 SHA512:
-  metadata.gz: dc7bd443f0a1ae6d4d4b503af59200592c35c4d1f73326400be7e05b85ad92fdf814d2f9e339034907eb4ede0a0b513dc744f1edc89ce9ce69dc856edf416bff
-  data.tar.gz: 2a9973470c68cf9b6930aa7f5da4b62d71f1218e88fb383ee66643427b742522fa742649aa1c2a18f2c6e3c9eafcb7564e79c2be97651c559efde0ecaa463aae
+  metadata.gz: 53676e2729ac91e2483d8cc71627de7e3eeb4bef19ff0542abb1acae2df07dc0ed1a67dc95ea7aa7d858b3abdc16b947b4e84326ef113ade0096ede7d67575dc
+  data.tar.gz: aafc8b03af7a5fb846d5a45ed2a49b47a32489359e7d9c469614580f3dbfd77899dedf7f8560399eb2f30a651f6faf1df1e1f6fb94cacae6a0ba38cfe21dbd19

data/app/assets/stylesheets/koi/blocks/flash.css

@@ -3,17 +3,17 @@
 }
 
 .flash:is([data-flash-type="alert"]) {
-  --flash-color: var(--site-alert);
+  --flash-color: var(--color-alert);
 }
 
 .flash:is([data-flash-type="notice"]) {
-  --flash-color: var(--site-notice);
+  --flash-color: var(--color-notice);
 }
 
 .flash:is([data-flash-type="success"]) {
-  --flash-color: var(--site-success);
+  --flash-color: var(--color-success);
 }
 
 .flash:is([data-flash-type="warning"], [data-flash-type="error"]) {
-  --flash-color: var(--site-warning);
+  --flash-color: var(--color-warning);
 }

data/app/assets/stylesheets/koi/blocks/tables/table.css

@@ -41,7 +41,7 @@
         content: "";
         display: block;
         grid-area: input;
-        border-color: var(--site-text-color);
+        border-color: var(--color-dark);
         border-style: solid;
       }
 

data/app/assets/stylesheets/koi/index.css

@@ -15,22 +15,3 @@
 @import url("blocks/index.css");
 
 @import url("icons.css");
-
-:root {
-  /* Color styles */
-  --site-primary-light: #5a87c9;
-  --site-primary: #266dd3;
-  --site-primary-dark: #344055;
-  --site-on-primary: #ffffff;
-  --site-secondary-light: #5a87c9;
-  --site-secondary: #266dd3;
-  --site-secondary-dark: #344055;
-  --site-on-secondary: #ffffff;
-  --site-text-color: #000000;
-  --site-success: #129d7f;
-  --site-warning: #ffc759;
-  --site-alert: #ea3946;
-  --site-notice: rgb(37, 99, 235);
-  --site-disabled: #9ca3af;
-  --site-link: #266dd3;
-}

data/app/controllers/admin/sessions_controller.rb

@@ -6,7 +6,7 @@ module Admin
     include Koi::Controller::RecordsAuthentication
 
     before_action :redirect_authenticated, only: %i[new], if: :admin_signed_in?
-    before_action :authenticate_local_admin, only: %i[new], if: -> { Koi.config.authenticate_local_admins? }
+    before_action :authenticate_local_admin, only: %i[new], if: -> { Koi.config.authenticate_local_admins }
 
     layout "koi/login"
 

data/app/controllers/concerns/koi/controller.rb

@@ -24,6 +24,7 @@ module Koi
       # Koi Helpers
       helper FormHelper
       helper HeaderHelper
+      helper ModalHelper
       helper Pagy::Frontend
 
       # @deprecated to be removed in Koi 5

data/app/helpers/koi/modal_helper.rb

@@ -18,11 +18,12 @@ module Koi
       tag.header(class: "repel", data: "nowrap") do
         concat(tag.h2(title))
         concat(tag.button(
-          form:       form_id,
-          formmethod: "dialog",
-          class:      "button",
-          data:       { button_padding: "tight",
-                        "text-button":  "" },
+          class: "button",
+          data:  {
+            action:         "koi--modal#dismiss",
+            button_padding: "tight",
+            "text-button":  "",
+          },
         ) do
           tag.icon(" ".html_safe, aria: { hidden: true }, class: "icon", data: { icon: "close" }) +
             tag.span("Close", class: "visually-hidden")

data/lib/generators/koi/admin/admin_generator.rb

@@ -4,7 +4,6 @@ require "rails/generators/named_base"
 
 module Koi
   class AdminGenerator < Rails::Generators::NamedBase
-
     class_option :force, type: :boolean, default: true
 
     hook_for :admin_controller, in: :koi, as: :admin, type: :boolean, default: true do |instance, controller|

data/lib/generators/koi/admin_views/templates/archived.html.erb.tt

@@ -7,10 +7,10 @@
 
   <h1>Archived <%= human_name.pluralize.titleize %></h1>
 <%% end %>
+<%- if query? -%>
 
-<% if query? %>
 <%%= table_query_with(collection:) %>
-<% end %>
+<%- end -%>
 
 <%%= table_selection_with(collection:) do %>
   <%%= tag.button("Restore", formaction: <%= restore_admin_helper %>, formmethod: :put, class: "button") %>
@@ -27,7 +27,7 @@
   <%- end -%>
   <%% row.date :archived_at %>
 <%% end %>
-
 <%- if paginate? -%>
+
 <%%= table_pagination_with(collection:) %>
 <%- end -%>

data/lib/generators/koi/helpers/resource_helpers.rb

@@ -111,7 +111,7 @@ module Koi
         limit = [controller.size, model.size].min
 
         (1..limit).reverse_each do |size|
-          return model.slice(0...size) if controller.slice(size - 1..-1) == model.slice(0...size)
+          return model.slice(0...size) if controller.slice((size - 1)..-1) == model.slice(0...size)
         end
 
         []

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: katalyst-koi
 version: !ruby/object:Gem::Version
-  version: 5.0.0.alpha.1
+  version: 5.0.0.alpha.4
 platform: ruby
 authors:
 - Katalyst Interactive
@@ -330,10 +330,6 @@ files:
 - app/assets/stylesheets/koi/icons.css
 - app/assets/stylesheets/koi/index.css
 - app/assets/stylesheets/koi/login.css
-- app/assets/stylesheets/koi/themes/_content.scss
-- app/assets/stylesheets/koi/themes/_index.scss
-- app/assets/stylesheets/koi/themes/_navigation.scss
-- app/assets/stylesheets/koi/themes/_trix.scss
 - app/assets/stylesheets/koi/utilities/index.css
 - app/assets/stylesheets/koi/utilities/visually-hidden.css
 - app/components/concerns/koi/tables/cells.rb

data/app/assets/stylesheets/koi/themes/_content.scss

@@ -1,62 +0,0 @@
-@use "katalyst/content/editor/variables" as variables;
-@use "katalyst/content";
-
-[data-controller="content--editor--container"] {
-  --heading--h4: 1rem;
-}
-
-[data-controller="content--editor--table"] {
-  .content--editor--table-editor {
-    // ensure the table editor is easy to target when empty
-    &:not(:has(table)) {
-      min-height: 4rem !important;
-    }
-
-    // tight wrap the table editor around the table and use table borders
-    &:has(table) {
-      border: none !important;
-      padding: 0 !important;
-    }
-
-    table {
-      width: 100%;
-    }
-
-    table,
-    th,
-    td {
-      border: 2px solid black;
-    }
-  }
-
-  // restore webkit spinners, hidden by govuk
-  // these are not ideal, but spinners are much easier to work with for this
-  // use case than the default number input, because we submit the form on
-  // change to implement the live preview
-  input[type="number"]::-webkit-inner-spin-button {
-    position: relative;
-    right: -1px;
-    margin-top: -2px;
-    margin-bottom: -4px;
-    -webkit-appearance: inner-spin-button !important;
-    opacity: 1 !important;
-  }
-}
-
-[data-enum="state"][data-value="published"] {
-  --tag-background-color: #{variables.$status-published-background-color};
-  --tag-color: #{variables.$status-published-color};
-  border: 1px solid variables.$status-published-border-color;
-}
-
-[data-enum="state"][data-value="draft"] {
-  --tag-background-color: #{variables.$status-draft-background-color};
-  --tag-color: #{variables.$status-draft-color};
-  border: 1px solid variables.$status-draft-border-color;
-}
-
-[data-enum="state"][data-value="unpublished"] {
-  --tag-background-color: #{variables.$status-draft-background-color};
-  --tag-color: #{variables.$status-draft-color};
-  border: 1px solid variables.$status-draft-border-color;
-}

data/app/assets/stylesheets/koi/themes/_index.scss

@@ -1,4 +0,0 @@
-@use "content";
-@use "govuk";
-@use "navigation";
-@use "trix";

data/app/assets/stylesheets/koi/themes/_navigation.scss

@@ -1,5 +0,0 @@
-@use "katalyst/navigation/editor";
-
-[data-controller="navigation--editor--menu"] {
-  --heading--h4: 1rem;
-}

data/app/assets/stylesheets/koi/themes/_trix.scss

@@ -1,32 +0,0 @@
-// navigation and content already load trix, ensure they are loaded first
-@use "content";
-@use "navigation";
-
-// overrides for default trix styles to match our button styles
-trix-toolbar {
-  .trix-button-group {
-    border: 1px solid var(--site-text-color);
-    border-radius: 0;
-  }
-
-  .trix-button {
-    color: var(--site-secondary);
-    border-bottom: none;
-  }
-
-  .trix-button:not(:first-child) {
-    border-left: 1px solid var(--site-text-color);
-  }
-
-  .trix-button.trix-active {
-    background-color: var(--site-secondary-light);
-    color: var(--site-on-secondary);
-    border-bottom: none;
-  }
-}
-
-// set a maximim width for the text editor and toolbar to match other inputs
-trix-toolbar,
-trix-editor {
-  max-width: var(--text-width);
-}