card-mod-bootstrap 0.15.0 → 0.15.1

data/assets/style/manifest.yml

@@ -1,10 +1,17 @@
+remote:
+  items:
+    - src: https://fonts.googleapis.com/css2?family=Material+Icons #+Round
+      # see https://stackoverflow.com/questions/50303454/how-to-use-the-new-material-design-icon-themes-outlined-rounded-two-tone-and
+
 bootstrap_decko:
   items:
     - decko_bootstrap.scss
+
 libraries:
   items:
     - font_awesome.css
-    - material_icons.css
+    # - material_icons.css
+    - bootstrap-icons.css
     - bootstrap_colorpicker.scss
     - ../../vendor/bootstrap-colorpicker/src/sass/_colorpicker.scss
 

data/assets/style/material_icons.css

@@ -1,36 +1,36 @@
-@font-face {
-  font-family: 'Material Icons';
-  font-style: normal;
-  font-weight: 400;
-  src: url([[/mod/bootstrap/fonts/MaterialIcons-Regular.eot]]); /* For IE6-8 */
-  src: local('Material Icons'),
-       local('MaterialIcons-Regular'),
-       url([[/mod/bootstrap/fonts/MaterialIcons-Regular.woff2]]) format('woff2'),
-       url([[/mod/bootstrap/fonts/MaterialIcons-Regular.woff]]) format('woff'),
-       url([[/mod/bootstrap/fonts/MaterialIcons-Regular.ttf]]) format('truetype');
-}
+/*@font-face {*/
+/*  font-family: 'Material Icons';*/
+/*  font-style: normal;*/
+/*  font-weight: 400;*/
+/*  src: url([[/mod/bootstrap/fonts/MaterialIcons-Regular.eot]]); !* For IE6-8 *!*/
+/*  src: local('Material Icons'),*/
+/*       local('MaterialIcons-Regular'),*/
+/*       url([[/mod/bootstrap/fonts/MaterialIcons-Regular.woff2]]) format('woff2'),*/
+/*       url([[/mod/bootstrap/fonts/MaterialIcons-Regular.woff]]) format('woff'),*/
+/*       url([[/mod/bootstrap/fonts/MaterialIcons-Regular.ttf]]) format('truetype');*/
+/*}*/
 
-.material-icons {
-  font-family: 'Material Icons';
-  font-weight: normal;
-  font-style: normal;
-  /*font-size: 24px;  !* Preferred icon size *!*/
-  display: inline-block;
-  line-height: 1;
-  text-transform: none;
-  letter-spacing: normal;
-  word-wrap: normal;
-  white-space: nowrap;
-  direction: ltr;
+/*.material-icons {*/
+/*  font-family: 'Material Icons';*/
+/*  font-weight: normal;*/
+/*  font-style: normal;*/
+/*  !*font-size: 24px;  !* Preferred icon size *!*!*/
+/*  display: inline-block;*/
+/*  line-height: 1;*/
+/*  text-transform: none;*/
+/*  letter-spacing: normal;*/
+/*  word-wrap: normal;*/
+/*  white-space: nowrap;*/
+/*  direction: ltr;*/
 
-  /* Support for all WebKit browsers. */
-  -webkit-font-smoothing: antialiased;
-  /* Support for Safari and Chrome. */
-  text-rendering: optimizeLegibility;
+/*  !* Support for all WebKit browsers. *!*/
+/*  -webkit-font-smoothing: antialiased;*/
+/*  !* Support for Safari and Chrome. *!*/
+/*  text-rendering: optimizeLegibility;*/
 
-  /* Support for Firefox. */
-  -moz-osx-font-smoothing: grayscale;
+/*  !* Support for Firefox. *!*/
+/*  -moz-osx-font-smoothing: grayscale;*/
 
-  /* Support for IE. */
-  font-feature-settings: 'liga';
-}
+/*  !* Support for IE. *!*/
+/*  font-feature-settings: 'liga';*/
+/*}*/

data/data/files/mod_bootstrap_script_asset_output/file.js

@@ -12,7 +12,7 @@ const i=this._directionToOrder(t),n=Ce.findOne(ai,this._element),s=this._getItem
 // decko_popover.js.coffee
 (function(){$(window).ready(function(){return $("body").on("show.bs.popover","._card-menu-popover",function(){return $(this).closest(".card-menu._show-on-hover").removeClass("_show-on-hover").addClass("_show-on-hover-disabled")}),$("body").on("hide.bs.popover","._card-menu-popover",function(){return $(this).closest(".card-menu._show-on-hover-disabled").removeClass("_show-on-hover-disabled").addClass("_show-on-hover")})}),decko.slot.ready(function(o){return o.find('[data-tooltip="true"]').tooltip(),o.find('[data-bs-toggle="popover"]').popover({html:!0})})}).call(this);
 // script_load_select2.js.coffee
-(function(){$.fn.select2.defaults.set("theme","bootstrap-5"),decko.slot.ready(function(e){return e.find("select:not(._no-select2):not(._no-select2-init)").each(function(){return decko.initSelect2($(this))})}),decko.slot.destroy(function(e){return e.find("select:not(._no-select2)").each(function(){return $(this).deInitSelect2()})}),$.extend(decko,{initSelect2:function(e){var t,n,i,c,o;if(0!==e.length){if(e.length>1){for(c=[],t=0,n=e.length;t<n;t++)o=e[t],c.push(decko.initSelect2($(o)));return c}return i={dropdownAutoWidth:"true",containerCssClass:":all:",width:"auto",dropdownParent:e.parent()},e.attr("id",decko.uniqSelect2Id(e.attr("id"))),e.hasClass("tags")&&(i.tags="true"),e.data("placeholder")&&(i.placeholder=e.data("placeholder")),null!=e.data("minimum-results-for-search")&&(i.minimumResultsForSearch=e.data("minimum-results-for-search")),e.select2(i)}},uniqSelect2Id:function(e){return $("[data-select2-id="+e+"]").length>0?decko.uniqSelect2Id(e+"1"):e}}),$(window).ready(function(){return $("body").on("select2:select","._go-to-selected",function(){var e;if(""!==(e=$(this).val()))return window.location=decko.path(escape(e))}),$("body").on("select2:select","._submit-on-select",function(e){return $(e.target).closest("form").submit()})}),$.fn.extend({cloneSelect2:function(e,t){var n,i;return(i=this.is("select")?this:this.find("select")).deInitSelect2(),n=this.clone(e,t),decko.initSelect2(i),n.is("select")?decko.initSelect2(n):decko.initSelect2(n.find("select")),n},deInitSelect2:function(){if(this.attr("data-select2-id"))return this.select2("destroy"),this.removeAttr("data-select2-id"),this.find("option").removeAttr("data-select2-id")}})}).call(this);
+(function(){$.fn.select2.defaults.set("theme","bootstrap-5"),decko.slot.ready(function(e){return e.find("select:not(._no-select2):not(._no-select2-init)").each(function(){return decko.initSelect2($(this))})}),decko.slot.destroy(function(e){return e.find("select:not(._no-select2)").each(function(){return $(this).deInitSelect2()})}),$.extend(decko,{initSelect2:function(e){var t,n,i,c,o;if(0!==e.length){if(e.length>1){for(c=[],t=0,n=e.length;t<n;t++)o=e[t],c.push(decko.initSelect2($(o)));return c}return i={dropdownAutoWidth:"true",width:"auto",dropdownParent:e.parent()},e.attr("id",decko.uniqSelect2Id(e.attr("id"))),e.hasClass("tags")&&(i.tags="true"),e.data("placeholder")&&(i.placeholder=e.data("placeholder")),null!=e.data("minimum-results-for-search")&&(i.minimumResultsForSearch=e.data("minimum-results-for-search")),e.select2(i)}},uniqSelect2Id:function(e){return $("[data-select2-id="+e+"]").length>0?decko.uniqSelect2Id(e+"1"):e}}),$(window).ready(function(){return $("body").on("select2:select","._go-to-selected",function(){var e;if(""!==(e=$(this).val()))return window.location=decko.path(escape(e))}),$("body").on("select2:select","._submit-on-select",function(e){return $(e.target).closest("form").submit()})}),$.fn.extend({cloneSelect2:function(e,t){var n,i;return(i=this.is("select")?this:this.find("select")).deInitSelect2(),n=this.clone(e,t),decko.initSelect2(i),n.is("select")?decko.initSelect2(n):decko.initSelect2(n.find("select")),n},deInitSelect2:function(){if(this.attr("data-select2-id"))return this.select2("destroy"),this.removeAttr("data-select2-id"),this.find("option").removeAttr("data-select2-id")}})}).call(this);
 // bootstrap-colorpicker.min.js
 /*!
  * Bootstrap Colorpicker v2.5.2

data/lib/card/mod/bootstrap.rb

@@ -0,0 +1,3 @@
+Cardio::Railtie.config.tap do |config|
+  config.icon_libraries = [:material]
+end

data/set/abstract/bs_badge/labeled_badge.haml

@@ -1,5 +1,5 @@
 %span.labeled-badge{ class: klass, title: title }
+  %label
+    = label
   %span.badge{ class: "bg-#{color}" }
     = number_with_delimiter count
-  %label.text-muted
-    = label

data/set/all/bootstrap/accordion.rb

@@ -1,6 +1,6 @@
 format :html do
   def accordion &block
-    wrap_with :div, class: "accordion", &block
+    wrap_with :div, class: classy("accordion"), &block
   end
 
   def accordion_item title, **args

data/set/all/bootstrap/dropdown_button.haml

@@ -1,5 +1,5 @@
 .btn-group{ class: opts[:extra_css_class], role: "group" }
-  %button.btn.btn-outline-secondary.dropdown-toggle{ title: name,
+  %button.btn.btn-outline-secondary.dropdown-toggle{ title: (opts[:title] || name),
     "aria-expanded": "false",
     "aria-haspopup": "true",
     "data-bs-toggle": "dropdown" }

data/set/all/bootstrap/helper.rb

@@ -39,7 +39,7 @@ format :html do
   end
 
   def popover_link text, title=nil, link_text=nil, opts={}
-    link_text ||= fa_icon "question-circle"
+    link_text ||= icon_tag :help
     link_to link_text, popover_opts(text, title, opts)
   end
 

data/set/all/bootstrap/icon.rb

@@ -1,114 +1,138 @@
+basket[:icons] = {
+  material: {
+    plus: :add,
+    pencil: :edit,
+    trash: :delete,
+    new_window: :open_in_new,
+    history: :history,
+    collapse: :expand_less,
+    expand: :expand_more,
+    flag: :flag,
+    remove: :close,
+    close: :close,
+    board: :space_dashboard,
+    warning: :warning,
+    unknown: :add_box,
+    help: :help,
+    modal: :fullscreen,
+    reorder: :reorder,
+    create_action: :add_circle,
+    update_action: :edit,
+    delete_action: :remove_circle,
+    draft: :build,
+    next: :chevron_right,
+    previous: :chevron_left,
+    forward: :arrow_forward,
+    back: :arrow_back,
+    list: :list,
+    search: :search,
+    filter: :filter_alt,
+    quick_filter: :bolt,
+    reset: :restart_alt
+  },
+  #
+  font_awesome: {
+    plus: :plus,
+    pencil: :pencil,
+    trash: :trash,
+    new_window: "external-link-square-alt",
+    close: :times,
+    remove: :times,
+    board: "table-columns",
+    reorder: "align-justify",
+    history: :clock,
+    warning: "exclamation-circle",
+    unknown: "plus-square",
+    help: "question-circle",
+    modal: :expand,
+    next: "arrow-right",
+    previous: "arrow-left",
+    create_action: "circle-plus",
+    update_action: :edit,
+    delete_action: "circle-minus",
+    flag: :flag,
+    collapse: "chevron-up",
+    expand: "chevron-down",
+    list: :list,
+    search: "magnifying-glass",
+    draft: :wrench,
+    filter: :filter,
+    reset: "sync-alt",
+    quick_filter: :bolt
+  },
+  #
+  bootstrap: {
+    plus: "plus-lg",
+    pencil: "pencil-fill",
+    trash: "trash-fill",
+    new_window: "box-arrow-up-right",
+    history: :clock,
+    collapse: "chevron-up",
+    expand: "chevron-down",
+    flag: "flag-fill",
+    reorder: "grip-horizontal"
+  }
+}
+
 format :html do
-  # same for all:
-  # :search,
-  ICON_MAP = {
-    material: {
-      plus: :add,
-      pencil: :edit,
-      trash: :delete,
-      wrench: :build,
-      new_window: :open_in_new,
-      history: :history,
-      triangle_left: :expand_less,
-      triangle_right: :expand_more,
-      flag: :flag,
-      option_horizontal: :more_horiz,
-      option_vertical: :more_vert,
-      pushpin: :pin_drop,
-      baby_formula: :device_hub,
-      log_out: :call_made,
-      log_in: :call_received,
-      explore: :explore,
-      remove: :close,
-      expand: :expand_more,
-      collapse_down: :expand_less,
-      globe: :public,
-      commenting: :comment
-    },
-    font_awesome: {
-      option_horizontal: :ellipsis_h,
-      pushpin: "thumb-tack",
-      globe: :globe,
-      zoom_out: "search-minus",
-      close: :times,
-      check_circle: "check-circle",
-      reorder: "align-justify",
-      commenting: :comments
-    },
-    glyphicon: {
-      option_horizontal: "option-horizontal",
-      option_vertical: "option-vertical",
-      triangle_left: "triangle-left",
-      triangle_right: "triangle-right",
-      baby_formula: "baby-formula",
-      log_out: "log-out",
-      log_in: "log-in",
-      collapse_down: "collapse-down",
-      globe: :globe,
-      zoom_out: "zoom-out",
-      close: :remove,
-      new_window: "new-window",
-      history: :time,
-      check_circle: "ok-sign",
-      reorder: "align-justify"
-    }
+  view :icons, template: :haml
 
-  }.freeze
+  def icon_tag icon_key, opts={}
+    return "" unless icon_key.present?
 
-  def icon_class library, icon
-    ICON_MAP[library][icon] || icon
+    library, icon = icon_lookup icon_key
+    with_icon_tag_opts(opts) do |tag_opts|
+      universal_icon_tag library, icon, tag_opts
+    end
   end
 
-  def material_icon icon, opts={}
-    universal_icon_tag icon, :material, opts
+  def icon_libraries
+    @icon_libraries ||= Cardio.config.icon_libraries
   end
 
-  def glyphicon icon, opts={}
-    universal_icon_tag icon, :glyphicon, opts
+  def glyphicon_icon_tag icon, opts={}
+    prepend_class opts, "glyphicon glyphicon-#{icon}"
+    wrap_with :span, "", opts.merge("aria-hidden": true)
   end
 
-  def fa_icon icon, opts={}
-    universal_icon_tag icon, :font_awesome, opts
+  def font_awesome_icon_tag icon, opts={}
+    prepend_class opts, "fa#{'b' if opts.delete :brand} fa-#{icon}"
+    wrap_with :i, "", opts
   end
 
-  def icon_tag icon, opts={}
-    with_icon_tag_opts(opts) do |tag_opts|
-      library = tag_opts.delete(:library) || default_icon_library
-      universal_icon_tag icon, library, tag_opts
-    end
+  def material_icon_tag icon, opts={}
+    add_class opts, "material-icons"
+    wrap_with :i, icon, opts
   end
 
-  def universal_icon_tag icon, icon_library=default_icon_library, opts={}
-    return "" unless icon.present?
+  def bootstrap_icon_tag icon, opts={}
+    prepend_class opts, "bi-#{icon}"
+    wrap_with :i, "", opts
+  end
 
+  def universal_icon_tag library, icon, opts={}
     with_icon_tag_opts(opts) do |tag_opts|
-      send "#{icon_library}_icon_tag", icon, tag_opts
+      send "#{library}_icon_tag", icon, tag_opts
     end
   end
 
-  def default_icon_library
-    :material
+  def all_icon_keys
+    basket[:icons].values.map(&:keys).flatten.uniq
   end
 
-  def glyphicon_icon_tag icon, opts={}
-    prepend_class opts, "glyphicon glyphicon-#{icon_class(:glyphicon, icon)}"
-    wrap_with :span, "", opts.merge("aria-hidden": true)
-  end
+  private
 
-  def font_awesome_icon_tag icon, opts={}
+  def icon_lookup icon
+    icon = icon.to_sym
 
-    prepend_class opts,
-                  "fa#{'b' if opts.delete :brand} fa-#{icon_class(:font_awesome, icon)}"
-    wrap_with :i, "", opts
-  end
+    icon_libraries.each do |library|
+      found_icon = basket[:icons][library][icon]
+      return [library, found_icon] if found_icon
+    end
 
-  def material_icon_tag icon, opts={}
-    add_class opts, "material-icons"
-    wrap_with :i, icon_class(:material, icon), opts
+    [icon_libraries.last, icon]
   end
 
-  private
-
   def with_icon_tag_opts opts={}
     opts = { class: opts } unless opts.is_a? Hash
     yield opts

data/set/all/bootstrap/icons.haml

@@ -0,0 +1,18 @@
+- libraries = basket[:icons].keys
+%table
+  %tr
+    %th lookup key
+    - libraries.map do |library|
+      %th
+        = library
+  - all_icon_keys.each do |icon_key|
+    %tr
+      %td
+        = icon_key
+      - libraries.each do |library|
+        %td
+          - if (mapping = basket[:icons][library][icon_key])
+            = send "#{library}_icon_tag", mapping
+            = mapping
+          - else
+             

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card-mod-bootstrap
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.15.1
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-04 00:00:00.000000000 Z
+date: 2023-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: card
@@ -18,70 +18,70 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.105.0
+        version: 1.105.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.105.0
+        version: 1.105.1
 - !ruby/object:Gem::Dependency
   name: card-mod-edit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: 0.15.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: 0.15.1
 - !ruby/object:Gem::Dependency
   name: card-mod-bar_and_box
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: 0.15.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: 0.15.1
 - !ruby/object:Gem::Dependency
   name: card-mod-style
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: 0.15.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: 0.15.1
 - !ruby/object:Gem::Dependency
   name: card-mod-script
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: 0.15.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: 0.15.1
 description: ''
 email:
 - info@decko.org
@@ -94,11 +94,14 @@ files:
 - assets/script/manifest.yml
 - assets/script/script_colorpicker.js.coffee
 - assets/script/script_load_select2.js.coffee
+- assets/style/bootstrap-icons.css
 - assets/style/bootstrap_colorpicker.scss
 - assets/style/decko_bootstrap.scss
 - assets/style/font_awesome.css
 - assets/style/manifest.yml
 - assets/style/material_icons.css
+- config/locales/de.yml
+- config/locales/en.yml
 - data/files/cerulean_skin_image/image-icon.png
 - data/files/cerulean_skin_image/image-large.png
 - data/files/cerulean_skin_image/image-medium.png
@@ -244,14 +247,9 @@ files:
 - lib/card/bootstrap/old_component.rb
 - lib/card/bootstrap/tag_method.rb
 - lib/card/bootstrapper.rb
-- locales/de.yml
-- locales/en.yml
-- public/fonts/MaterialIcons-Regular.eot
-- public/fonts/MaterialIcons-Regular.ijmap
-- public/fonts/MaterialIcons-Regular.svg
-- public/fonts/MaterialIcons-Regular.ttf
-- public/fonts/MaterialIcons-Regular.woff
-- public/fonts/MaterialIcons-Regular.woff2
+- lib/card/mod/bootstrap.rb
+- public/fonts/bootstrap-icons.woff
+- public/fonts/bootstrap-icons.woff2
 - public/fonts/fa-brands-400.eot
 - public/fonts/fa-brands-400.svg
 - public/fonts/fa-brands-400.ttf
@@ -287,6 +285,7 @@ files:
 - set/all/bootstrap/form.rb
 - set/all/bootstrap/helper.rb
 - set/all/bootstrap/icon.rb
+- set/all/bootstrap/icons.haml
 - set/all/bootstrap/navbar.rb
 - set/all/bootstrap/navbar/navbar_responsive.haml
 - set/all/bootstrap/table.rb