nfg_ui 0.12.0.3 → 0.12.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd1a26d01e794a85545d14401527b545f9794fa1d4a08d72d7cb7e5aafa43747
-  data.tar.gz: 46341d8e79543535e52ab5c14eca5f88ae78248715414c3673e188920d9486d2
+  metadata.gz: b45c3d32a180df2da86ae37f687850785b8a5c22833c4b70b0e0371f48e1b3cc
+  data.tar.gz: ab34a149c78bf3b596ddc5ea990ab3bd27372fd340166908b47aefe5df519d85
 SHA512:
-  metadata.gz: 8a373a212e8b62c17208147f9311052a5802340ddee7df4b097d2ef4472201cce6ac60bd2e003e6c7751effc2f6aa96f76c7b6fdb5164ffa5964014f64d90ba8
-  data.tar.gz: 83454913b0309e83502af894a13964a33c19395ef56c1b5c711766259c1e0f82c331cce4c760cb1d1cde89f1af700a173abf951d9dc319114c516c3bdb14e70e
+  metadata.gz: 44f3894e5054710f58a2198ca37c0a5ffbdb6e1a96c6c90d7d71363afbbd70ebee58b6d855b55ef0fcf90c03c5af04df8f2ecd5fe2dd401cf6223b168183d25f
+  data.tar.gz: b3dc49d58c96fe8ee3020d561c27d93950513c862b15174f92b1a45ec197af8d803691bf48eab1b948e06aec10ebe62b7247874feefbddbe9a9b3b11ade5cc8f

data/app/assets/javascripts/nfg_ui/application.coffee

@@ -3,8 +3,6 @@
 #= require popper
 #= require select2
 #= require bootstrap
-#= require moment
-#= require nfg_ui/vendor/bootstrap-datetimepicker.min
 #= require nfg_ui/vendor/legacy_browser_support/application
 
 #= require_self
@@ -12,7 +10,7 @@
 #= require nfg_ui/collapsible_toggle
 #= require nfg_ui/select2
 #= require nfg_ui/tooltips
-#= require nfg_ui/datetimepicker_configuration
 #= require nfg_ui/file_inputs
+#= require nfg_ui/datepicker
 
-window.NfgUi = {}
+window.NfgUi = {}

data/app/assets/javascripts/nfg_ui/collapsible_toggle.coffee

@@ -1,3 +1,6 @@
+if typeof NfgUi == "undefined"
+  window.NfgUi = {}
+
 class NfgUi.CollapsibleToggle
   constructor: (@el) ->
     @target = @collapseTarget()

data/app/assets/javascripts/nfg_ui/datepicker.coffee

@@ -0,0 +1,5 @@
+#= require moment
+#= require nfg_ui/vendor/bootstrap-datetimepicker.min
+#= require nfg_ui/datetimepicker_configuration
+
+window.NfgUi = window.NfgUi || {}

data/app/assets/javascripts/nfg_ui/datetimepicker_configuration.js

@@ -44,6 +44,7 @@ function () {
         clear:"fa fa-trash-o",
         close:"fa fa-times"
       }
+      options.sideBySide = true;
       // options.debug = true
       return options;
     }
@@ -52,11 +53,11 @@ function () {
     value: function defaultFormat() {
 
       if (this.input.data('datetimepicker') == 'datetime') {
-        return 'Y-MM-DD hh:mm A';
+        return 'YYYY-MM-DD hh:mm A';
       } else if (this.input.data('datetimepicker') == 'time') {
         return 'hh:mm A';
       } else {
-        return 'Y-MM-DD';
+        return 'YYYY-MM-DD';
       }
     }
   }]);
@@ -79,4 +80,4 @@ function initNfgUiDateTimePicker() {
 if (NfgUi.turbolinks)
   $(document).on('turbolinks:load', initNfgUiDateTimePicker);
 else
-  $(document).ready(initNfgUiDateTimePicker);
+  $(document).ready(initNfgUiDateTimePicker);

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

@@ -5,11 +5,16 @@
 }
 
 // Height if just the builder-header is present
-.builder-header + .builder-container {
+.builder-header ~ .builder-container {
   #bee_plugin_container { height: calc(100vh - 72px); }
 }
 
 // Height if both builder-header and builder-nav are present (typical in onboarder)
-.builder-header + .builder-nav + .builder-container {
+.builder-header ~ .builder-nav ~ .builder-container {
   #bee_plugin_container { height: calc(100vh - 180px); }
+
+  // Height if there are buttons above the bee plugin
+  .builder-container-buttons {
+    ~ #bee_plugin_container { height: calc(100vh - 284px); }
+  }
 }

data/app/assets/stylesheets/nfg_ui/network_for_good/core/legacy_browser_support/application.scss

@@ -31,5 +31,6 @@ html.flexboxtweener {
   @import 'nfg_theme/custom';
 
   // Plugins
+  @import 'plugins/datetimepicker';
   @import 'plugins/sticky_div';
 }

data/app/assets/stylesheets/nfg_ui/network_for_good/core/legacy_browser_support/plugins/_datetimepicker.scss

@@ -0,0 +1,5 @@
+.bootstrap-datetimepicker-widget {
+  &.timepicker-sbs {
+    .row { -ms-flex-align: center; }
+  }
+}

data/app/assets/stylesheets/nfg_ui/network_for_good/core/nfg_theme/custom/_redactor.scss

@@ -14,6 +14,10 @@
 }
 .redactor-editor, .redactor-box, .redactor-box textarea { z-index: auto; }
 .redactor-box .redactor-toolbar { z-index: $zindex-dropdown - 10 !important; }
+#redactor-modal-close {
+  border: none;
+  background: none;
+}
 
 body.modal-open  {
   .redactor-toolbar { z-index: $zindex-modal-backdrop - 1 !important; }

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

@@ -14,8 +14,8 @@
 .bootstrap-datetimepicker-widget {
   display: block;
   top: 0 !important;
-  min-width: ($spacer * 10.5);
-  max-width: ($spacer * 10.5);
+  min-width: ($spacer * 10);
+  max-width: ($spacer * 10);
   background-color: $white;
   z-index: 110;
 
@@ -31,6 +31,16 @@
     transform: none;
   }
 
+  //** For when the date and time pickers are side by side.
+  &.timepicker-sbs {
+    @include media-breakpoint-up(md) {
+      min-width: ($spacer * 20);
+      max-width: ($spacer * 20);
+    }
+    .row { align-items: center; }
+    .datepicker { width: ($spacer * 18.125); }
+  }
+
   //** Base date and time styles
   ul { margin: 0; }
   .datepicker, .timepicker {
@@ -136,7 +146,7 @@
   [data-action^='picker'] {
     padding-top: ($spacer * .25);
     padding-bottom: ($spacer * .25);
-    width: ($spacer * 10);
+    width: ($spacer * 7.5);
     border-right: $border-width solid $border-color;
     border-left: $border-width solid $border-color;
     border-top: none;
@@ -214,9 +224,7 @@
   .btn {
     position: relative;
     display: block;
-    padding: ($spacer * .5) 0;
     width: 100%;
-    height: ($spacer * 1.5);
   }
 }
 

data/lib/nfg_ui/components/patterns/tile_header.rb

@@ -17,13 +17,13 @@ module NfgUi
         def render
           super do
             if collapsible && title
-              concat(NfgUi::Components::Elements::Button.new({ traits: [:link, :block], collapse: collapse, class: 'no-link-color p-0 m-0' }, view_context).render {
+              concat(NfgUi::Components::Elements::Button.new({ traits: [:link, :block], collapse: collapse, class: 'no-link-color p-0 m-0', data: { collapse_icon: collapse_icon, collapsed_icon: collapsed_icon } }, view_context).render {
                 content_tag(:div, class: 'row align-items-center') do
                   concat(content_tag(:div, class: 'col-10 text-left') {
                     NfgUi::Components::Foundations::Typeface.new({ heading: title, icon: icon, class: 'h4' }, view_context).render
                   })
                   concat(content_tag(:div, class: 'col-2 text-right') {
-                    NfgUi::Components::Foundations::Icon.new({ traits: ['caret-down fw'], tooltip: 'Show / hide additional information' }, view_context).render
+                    NfgUi::Components::Foundations::Icon.new({ traits: ["#{contextual_collapsible_icon} fw"], tooltip: 'Show / hide additional information' }, view_context).render
                   })
                 end
               })
@@ -34,6 +34,21 @@ module NfgUi
             concat((block_given? ? yield : body))
           end
         end
+
+        private
+
+        def contextual_collapsible_icon
+          return '' unless collapsible
+          collapsed ? collapsed_icon : collapse_icon
+        end
+
+        def collapse_icon
+          'caret-up'
+        end
+
+        def collapsed_icon
+          'caret-down'
+        end
       end
     end
   end

data/lib/nfg_ui/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nfg_ui
 version: !ruby/object:Gem::Version
-  version: 0.12.0.3
+  version: 0.12.3
 platform: ruby
 authors:
 - Jonathan Roehm
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-25 00:00:00.000000000 Z
+date: 2021-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bootstrap
@@ -382,6 +382,7 @@ files:
 - app/assets/images/nfg_ui/email/nfg-logo.png
 - app/assets/javascripts/nfg_ui/application.coffee
 - app/assets/javascripts/nfg_ui/collapsible_toggle.coffee
+- app/assets/javascripts/nfg_ui/datepicker.coffee
 - app/assets/javascripts/nfg_ui/datetimepicker_configuration.js
 - app/assets/javascripts/nfg_ui/document_ready.coffee
 - app/assets/javascripts/nfg_ui/file_inputs.js
@@ -493,6 +494,7 @@ files:
 - app/assets/stylesheets/nfg_ui/network_for_good/core/legacy_browser_support/nfg_theme/mixins/_grid.scss
 - app/assets/stylesheets/nfg_ui/network_for_good/core/legacy_browser_support/nfg_theme/utilities/_display.scss
 - app/assets/stylesheets/nfg_ui/network_for_good/core/legacy_browser_support/nfg_theme/utilities/_flex.scss
+- app/assets/stylesheets/nfg_ui/network_for_good/core/legacy_browser_support/plugins/_datetimepicker.scss
 - app/assets/stylesheets/nfg_ui/network_for_good/core/legacy_browser_support/plugins/_sticky_div.scss
 - app/assets/stylesheets/nfg_ui/network_for_good/core/nfg_theme/_alert.scss
 - app/assets/stylesheets/nfg_ui/network_for_good/core/nfg_theme/_badge.scss