nfg_ui 0.9.16 → 0.9.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5eff2dbd27f1207470e754379027bd19cb9836c237a56658ab84b30f17cb7f4
-  data.tar.gz: 01aef97bf4e2783e9f3dd6bd29c84e34cb31e0ab6d5c26643033aa5802ca166a
+  metadata.gz: 226f29c2a1065ad0d56011c58f459afea23f1039769e747f7be41815971504f7
+  data.tar.gz: 313e502c3d37a856fd78a692fd87058e0143a49ab95240f5dd258cf05cafc051
 SHA512:
-  metadata.gz: 59fa2d8d00081d85487382b477ced0d9f3ea869697cf7a90a395e3564e3806fe5c052c0005fd83500754ac99740a874eedbbd4a71a095683f453ce3ed8341c99
-  data.tar.gz: b0231f761e74ffffe0284805cea470fcaf04e7b89af05813a4fe5aaa394f11e9fb8f66c4521675252622f2e30cad16220dcd4ff4bfc864c0aab73f28393a544a
+  metadata.gz: 59b163a6c1c1bc685b762228b10ad0b8a42c31dff585941140c128976c6c938480e25c7eccc9a93eef9c8951a8f3f61c99e5cd36b8e3564012ce8de8c6be2026
+  data.tar.gz: 271933966dda44648ded11f1ca90c8c2a41d6184248d790a5ee2ed82376f82f549a045e48a0a3cbd9e57fa289ebe8cd968f3f21eca4a58f4e9e291fca516d092

data/app/assets/stylesheets/nfg_ui/network_for_good/admin/nfg_theme/_button-group.scss

@@ -6,3 +6,17 @@
     border-left-color: rgba(0,0,0,.15);
   }
 }
+
+.btn-group-vertical {
+  > .btn { width: auto; }
+
+  > .btn:not(:first-child),
+  > .btn-group:not(:first-child) { margin-top: 0; }
+
+  // Reset rounded corners
+  > .btn:not(:last-child):not(.dropdown-toggle),
+  > .btn-group:not(:last-child) > .btn { @include border-bottom-radius($btn-border-radius); }
+
+  > .btn:not(:first-child),
+  > .btn-group:not(:first-child) > .btn { @include border-top-radius($btn-border-radius); }
+}

data/app/assets/stylesheets/nfg_ui/network_for_good/public/entity_branding/application.scss

@@ -9,7 +9,7 @@
 @import 'nfg_theme/type';
 @import 'nfg_theme/forms';
 @import 'nfg_theme/buttons';
-@import 'nfg_theme/custom_forms';
+@import 'nfg_theme/custom-forms';
 @import 'nfg_theme/navbar';
 @import 'nfg_theme/badge';
 @import 'nfg_theme/utilities';

data/app/assets/stylesheets/nfg_ui/network_for_good/public/nfg_theme/_button-group.scss

@@ -0,0 +1,22 @@
+// Add visual separator for btn-primary buttons that are in a button group
+.btn-group {
+  > .btn-primary:not(:first-child),
+  > .btn-group:not(:first-child) > .btn-primary {
+    margin-left: 0;
+    border-left-color: rgba(0,0,0,.15);
+  }
+}
+
+.btn-group-vertical {
+  > .btn { width: auto; }
+
+  > .btn:not(:first-child),
+  > .btn-group:not(:first-child) { margin-top: 0; }
+
+  // Reset rounded corners
+  > .btn:not(:last-child):not(.dropdown-toggle),
+  > .btn-group:not(:last-child) > .btn { @include border-bottom-radius($btn-border-radius); }
+
+  > .btn:not(:first-child),
+  > .btn-group:not(:first-child) > .btn { @include border-top-radius($btn-border-radius); }
+}

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

@@ -4,6 +4,12 @@
 // DATEPICKER -- based on http://eonasdan.github.io/bootstrap-daetetimepicker/
 //*****************************//
 
+//** form style that clears out readonly styles
+.form-control[data-datetimepicker] {
+  background-color: $input-bg;
+  cursor: pointer;
+}
+
 //** Base styles
 .bootstrap-datetimepicker-widget {
   display: block;

data/lib/nfg_ui/bootstrap/components/button_group.rb

@@ -5,7 +5,6 @@ module NfgUi
     module Components
       # Bootstrap Button Group Component
       # An optional parent of the Button component
-      # https://getbootstrap.com/docs/4.1/components/breadcrumb/
       class ButtonGroup < NfgUi::Bootstrap::Components::Base
         include Bootstrap::Utilities::DropdownDirectionable
         include Bootstrap::Utilities::Sizable
@@ -17,18 +16,21 @@ module NfgUi
         private
 
         def assistive_html_attributes
-          super.merge!(role: 'group', aria: { label: 'action buttons' })
+          # Prevent overwriting supplied aria attributes in the component's :options
+          aria = options[:aria].present? ? options[:aria] : {}
+          aria.merge!(label: 'action buttons')
+
+          super.merge!(role: 'group', aria: aria)
         end
 
+        # Bootstrap does not stack btn-group and btn-group-vertical together
+        # When a button group is set as vertical, it is only `btn-group-vertical`
         def component_css_class
-          'btn-group'
+          "btn-group#{'-vertical' if vertical}"
         end
 
-        def css_classes
-          [
-            super,
-            ("#{component_css_class}-vertical" if vertical)
-          ].join(' ').squish
+        def non_html_attribute_options
+          super.push(:vertical)
         end
       end
     end

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

@@ -3,9 +3,6 @@
 module NfgUi
   module Components
     module Patterns
-      # Button Group doesn't have any customizations unique to the design system yet
-      # As such, the NFG UI button group is simply a bootstrap button group behind the scenes.
-      # Traits will eventually be connected here.
       class ButtonGroup < NfgUi::Bootstrap::Components::ButtonGroup
         include NfgUi::Components::Utilities::Traitable
         include NfgUi::Components::Utilities::Describable
@@ -13,10 +10,6 @@ module NfgUi
 
         include NfgUi::Components::Traits::Size
         include NfgUi::Components::Traits::Vertical
-
-        # TODO It's not clear to me whether the traits listed above actually do anything
-        # I think the note above implies that they don't, but then why include them? If they don't
-        # actually do anything yet, they should be removed, or at least commented out
       end
     end
   end

data/lib/nfg_ui/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nfg_ui
 version: !ruby/object:Gem::Version
-  version: 0.9.16
+  version: 0.9.17
 platform: ruby
 authors:
 - Jonathan Roehm
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-28 00:00:00.000000000 Z
+date: 2019-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bootstrap
@@ -143,6 +143,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.11.1
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.10.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.10.4
 - !ruby/object:Gem::Dependency
   name: browser
   requirement: !ruby/object:Gem::Requirement
@@ -375,8 +389,8 @@ files:
 - app/assets/stylesheets/nfg_ui/network_for_good/admin/nfg_theme/_button-group.scss
 - app/assets/stylesheets/nfg_ui/network_for_good/admin/nfg_theme/_buttons.scss
 - app/assets/stylesheets/nfg_ui/network_for_good/admin/nfg_theme/_card.scss
+- app/assets/stylesheets/nfg_ui/network_for_good/admin/nfg_theme/_custom-forms.scss
 - app/assets/stylesheets/nfg_ui/network_for_good/admin/nfg_theme/_custom.scss
-- app/assets/stylesheets/nfg_ui/network_for_good/admin/nfg_theme/_custom_forms.scss
 - app/assets/stylesheets/nfg_ui/network_for_good/admin/nfg_theme/_dropdown.scss
 - app/assets/stylesheets/nfg_ui/network_for_good/admin/nfg_theme/_forms.scss
 - app/assets/stylesheets/nfg_ui/network_for_good/admin/nfg_theme/_media.scss
@@ -421,8 +435,8 @@ files:
 - app/assets/stylesheets/nfg_ui/network_for_good/public/entity_branding/application.scss
 - app/assets/stylesheets/nfg_ui/network_for_good/public/entity_branding/nfg_theme/_badge.scss
 - app/assets/stylesheets/nfg_ui/network_for_good/public/entity_branding/nfg_theme/_buttons.scss
+- app/assets/stylesheets/nfg_ui/network_for_good/public/entity_branding/nfg_theme/_custom-forms.scss
 - app/assets/stylesheets/nfg_ui/network_for_good/public/entity_branding/nfg_theme/_custom.scss
-- app/assets/stylesheets/nfg_ui/network_for_good/public/entity_branding/nfg_theme/_custom_forms.scss
 - app/assets/stylesheets/nfg_ui/network_for_good/public/entity_branding/nfg_theme/_forms.scss
 - app/assets/stylesheets/nfg_ui/network_for_good/public/entity_branding/nfg_theme/_functions.scss
 - app/assets/stylesheets/nfg_ui/network_for_good/public/entity_branding/nfg_theme/_navbar.scss
@@ -463,11 +477,12 @@ files:
 - app/assets/stylesheets/nfg_ui/network_for_good/public/legacy_browser_support/nfg_theme/utilities/_flex.scss
 - app/assets/stylesheets/nfg_ui/network_for_good/public/legacy_browser_support/plugins/_sticky_div.scss
 - app/assets/stylesheets/nfg_ui/network_for_good/public/nfg_theme/_alert.scss
+- app/assets/stylesheets/nfg_ui/network_for_good/public/nfg_theme/_button-group.scss
 - app/assets/stylesheets/nfg_ui/network_for_good/public/nfg_theme/_buttons.scss
 - app/assets/stylesheets/nfg_ui/network_for_good/public/nfg_theme/_card.scss
 - app/assets/stylesheets/nfg_ui/network_for_good/public/nfg_theme/_carousel.scss
+- app/assets/stylesheets/nfg_ui/network_for_good/public/nfg_theme/_custom-forms.scss
 - app/assets/stylesheets/nfg_ui/network_for_good/public/nfg_theme/_custom.scss
-- app/assets/stylesheets/nfg_ui/network_for_good/public/nfg_theme/_custom_forms.scss
 - app/assets/stylesheets/nfg_ui/network_for_good/public/nfg_theme/_dropdown.scss
 - app/assets/stylesheets/nfg_ui/network_for_good/public/nfg_theme/_event.scss
 - app/assets/stylesheets/nfg_ui/network_for_good/public/nfg_theme/_forms.scss
@@ -733,7 +748,6 @@ files:
 - lib/nfg_ui/ui/utilities.rb
 - lib/nfg_ui/ui/utilities/initializer.rb
 - lib/nfg_ui/version.rb
-- lib/nfg_ui/version.rb.orig
 - lib/tasks/nfg_ui_tasks.rake
 homepage: https://github.com/network-for-good/nfg_ui
 licenses:

data/lib/nfg_ui/version.rb.orig

@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-module NfgUi
-<<<<<<< HEAD
-  VERSION = '0.9.15.1'
-=======
-  VERSION = '0.9.16'
->>>>>>> master
-end