nfg_ui 0.12.0.1 → 0.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a0f938a61999c6996a42d1995c0b693f1e66f55cf06e6d38910e20180f6ec73
-  data.tar.gz: 2e225440e4eb9fa98d5770f7476df92e6fc4bfbf13259c1da1978997d0a9d6f9
+  metadata.gz: b62469b35f0e75a5a06f1e751c6cd5d42cb7f40e4df50090a3a47ac6c2ccd5f5
+  data.tar.gz: 6bc7fce5d15b31c0ed7c2cf7d59f10d8c5cf852a663707e98cafb3a517698f83
 SHA512:
-  metadata.gz: 8f601fe243044247a1f9bcf8efefccb22a852698f90b056e494026ec5e3a3f55d13d396c1f1cee85be80796f713e5e9c3625cb2d9dede8139dc907510bf0f9c1
-  data.tar.gz: a0c3e89863c2d5bcf745f621a92743f37095f497ce0b8494a60e3a71ce63f2d13cce07f60e9945c9b726973d4ee5c41379321459c07462f0e35641fcddcc7d83
+  metadata.gz: c742c34a9f8e100bd7aa271295974b0a93facd5f896758114567cf59e6c524066dfd6d84a773ea52d4301840cf16c9353351b9e32cf3122fba70690533f14595
+  data.tar.gz: a7bffe8ab7cb2fcf83314136a3ea0fd71b574339393f92fa19e3eb828ae7fcc4f00308a8b45b0fba728939758f5690fabe39c401691bbc8aaf679250fd24e025

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/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/core/entity_branding/nfg_theme/_buttons.scss

@@ -12,6 +12,11 @@
   &.focus {
     box-shadow: 0 0 0 $input-btn-focus-width transparentize($primary, 0.8);
   }
+  &.disabled, &:disabled {
+    color: color-yiq($primary);
+    background-color: $primary;
+    border-color: $primary;
+  }
   &:not(:disabled):not(.disabled):active,
   &:not(:disabled):not(.disabled).active,
   .show > &.dropdown-toggle {
@@ -36,6 +41,7 @@
 .btn-link {
   color: color-yiq($primary, $yiq-text-dark, $primary);
   &:hover { color: color-yiq(darken($primary, 15%), $yiq-text-dark, darken($primary, 15%)); }
+  &:focus { box-shadow: 0 0 0 $input-btn-focus-width transparentize($primary, 0.8); }
 }
 
 .bg-dark {

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,15 @@
     transform: none;
   }
 
+  //** For when the date and time pickers are side by side.
+  &.timepicker-sbs {
+    @include media-breakpoint-up(md) {
+      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 +145,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 +223,7 @@
   .btn {
     position: relative;
     display: block;
-    padding: ($spacer * .5) 0;
     width: 100%;
-    height: ($spacer * 1.5);
   }
 }
 

data/lib/nfg_ui/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nfg_ui
 version: !ruby/object:Gem::Version
-  version: 0.12.0.1
+  version: 0.12.1
 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-06-23 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