nfg_ui 6.16.2 → 6.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d864361668c5317d82b786d3aa2279f6e994472e56f321662541ec987f8542c
-  data.tar.gz: 3aba84161a5431ee9226a0e76a316efbbc4a924b555f2e3d91939a7193f3ff03
+  metadata.gz: 79a77fa158b8e65c640f998d3095a85401e0a21850a5b222bafbdfd392fdd89a
+  data.tar.gz: b8d6e582be486b664b523b6531cf8e9a4452fe3f891a357028c7a3dfe86607fa
 SHA512:
-  metadata.gz: a30baaff6ae02c4c070a649b4bb90db13a9fd427629843b3a7eb82a2fffa85ce15c42e0f7df60fc69d34a9583223c6714172f6f34ce9156095af77dc07516c92
-  data.tar.gz: 2badcf6d917cc015d9efb25904a548499924f82847b50282f88fb7789547dc91ee49100aa2a3c864267cf596c15dc61a6906dbfe16650c2d32d4e8ed83639ec8
+  metadata.gz: 5ce8219cfa1b71dda92e0e793809e98358d088a884b572ac65c7233d96bb43649719f3d2aaca7996921a81484b40346d8f1d341849cc8b0178c73e1ff10625e0
+  data.tar.gz: 0dde6820b59e8c0e7ced6efe7b308864948153fc190f183c26633174003e555aa10882748f86b5017941573ffbb22a9b73e1b304934b661bfd0b37ddd1c4c48d

data/app/assets/stylesheets/nfg_ui/network_for_good/admin/nfg_theme/custom/_sortable.scss

@@ -27,3 +27,71 @@
 .option {
   &.ui-sortable-placeholder { margin-bottom: ($spacer * .25); }
 }
+
+
+// Used for sorting images for auction items
+.sortable-image {
+  padding: ($grid-gutter-width * .5);
+  border: $border-width dashed transparent;
+  &.sortable-ghost {
+    background-color: $body-bg;
+    border-color: $border-color;
+    border-radius: $border-radius;
+  }
+  @for $i from 0 through 20 {
+    &:nth-child(#{$i}) {
+      .sortable-item::after { content: '#{$i - 1}'; }
+    }
+  }
+}
+.sortable-item {
+  width: ($spacer * 5);
+  height: ($spacer * 5);
+  text-align: center;
+  background-color: $white;
+  border-radius: $border-radius;
+  overflow: hidden;
+  cursor: pointer;
+  transition: $transition-base;
+  &:hover {
+    box-shadow: $box-shadow-sm;
+    .delete-image-btn { bottom: 0; }
+  }
+  &::after {
+    position: absolute;
+    top: 0;
+    left: 0;
+    padding: ($spacer * .25) ($spacer * .5);
+    color: $body-color;
+    background-color: $white;
+    border-right: $border-width solid $border-color;
+    border-bottom: $border-width solid $border-color;
+    border-radius: $border-radius 0 $border-radius 0;
+    z-index: 10;
+    opacity: 0.9;
+  }
+  img { // keeps image scaled proportionally
+    position: absolute;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    left: 0;
+    width: auto !important;
+    min-width: 0px !important;
+    max-width: 100%;
+    height: 100% !important;
+    max-height: 100%;
+    margin: auto;
+    z-index: 0;
+  }
+  .delete-image-btn {
+    position: absolute;
+    bottom: -(($spacer * 1.25) + 1rem);
+    right: 0;
+    left: 0;
+    z-index: 10;
+    background-color: $white;
+    transition: $transition-base;
+    border-top: $border-width solid $border-color;
+  }
+}

data/app/assets/stylesheets/nfg_ui/network_for_good/core/plugins/_dropzone.scss

@@ -1,5 +1,6 @@
+//** Override styles for dropzone
 .dropzone-target {
-  padding: $spacer !important;
+  padding: ($spacer * 1.25) !important;
   min-height: ($spacer * 6) !important;
   border: $border-width solid $border-color !important;
   background-color: $white;
@@ -13,3 +14,4 @@
 }
 [data-dz-remove] { cursor: pointer; }
 .dz-preview + .dz-preview { margin-top: $spacer; }
+.dropzone .dz-message { margin: 0 !important; }

data/app/assets/stylesheets/nfg_ui/network_for_good/core/plugins/_trix.scss

@@ -88,10 +88,12 @@
   }
 }
 
+.trix-button-row { overflow-y: hidden !important; }
+
 // Editor similar to textarea
 trix-editor {
-  padding: 20px;
-  min-height: ($spacer * 5);
-  border: $input-border-width solid $input-border-color;
-  border-radius: $input-border-radius;
+  padding: $input-padding-y $input-padding-x !important;
+  min-height: ($spacer * 5) !important;
+  border: $input-border-width solid $input-border-color !important;
+  border-radius: $input-border-radius !important;
 }

data/lib/nfg_ui/ui/base.rb

@@ -12,10 +12,12 @@ module NfgUi
       end
 
       def bootstrap(component_name = nil, *traits, **options, &block)
+        traits, options = process_traits_and_options(*traits, **options)
         NfgUi::UI::Bootstrap.new(view_context, component_name, *traits, **options, &block).render_component
       end
 
       def nfg(component_name = nil, *traits, **options, &block)
+        traits, options = process_traits_and_options(*traits, **options)
         return unless render_nfg_component?(options)
         NfgUi::UI::NetworkForGood.new(view_context, component_name, *traits, **options, &block).render_component
       end
@@ -30,6 +32,19 @@ module NfgUi
           !options[:render_unless]
         end
       end
+
+      def process_traits_and_options(*traits, **options)
+        # In ruby 3 keyword arguments are separated from positional arguments
+        # Ensure traits is an array and default to an empty array if no elements are passed
+        traits = traits.empty? ? [] : traits
+
+        # Check if the last element of traits is a hash and merge it with options
+        if traits.last.is_a?(Hash)
+          options = traits.pop.merge(options)
+        end
+
+        [traits, options]
+      end
     end
   end
 end

data/lib/nfg_ui/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module NfgUi
-  VERSION = '6.16.2'
+  VERSION = '6.17.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nfg_ui
 version: !ruby/object:Gem::Version
-  version: 6.16.2
+  version: 6.17.0
 platform: ruby
 authors:
 - Jonathan Roehm
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-28 00:00:00.000000000 Z
+date: 2024-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bootstrap
@@ -337,14 +337,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.7'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: The embodied design system for Network for Good.
 email:
 - jonathan.roehm@networkforgood.com
@@ -859,7 +901,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.5.18
 signing_key:
 specification_version: 4
 summary: NFG UI front-end design system code for rapid product building