card 1.96.2 → 1.96.3

data/mod/bootstrap/vendor/bootstrap/{docs → site/docs}/4.1/getting-started/theming.md

@@ -50,7 +50,7 @@ In your `custom.scss`, you'll import Bootstrap's source Sass files. You have two
 // Custom.scss
 // Option A: Include all of Bootstrap
 
-@import "node_modules/bootstrap/scss/bootstrap";
+@import "../node_modules/bootstrap/scss/bootstrap";
 {% endhighlight %}
 
 {% highlight scss %}
@@ -58,16 +58,16 @@ In your `custom.scss`, you'll import Bootstrap's source Sass files. You have two
 // Option B: Include parts of Bootstrap
 
 // Required
-@import "node_modules/bootstrap/scss/functions";
-@import "node_modules/bootstrap/scss/variables";
-@import "node_modules/bootstrap/scss/mixins";
+@import "../node_modules/bootstrap/scss/functions";
+@import "../node_modules/bootstrap/scss/variables";
+@import "../node_modules/bootstrap/scss/mixins";
 
 // Optional
-@import "node_modules/bootstrap/scss/reboot";
-@import "node_modules/bootstrap/scss/type";
-@import "node_modules/bootstrap/scss/images";
-@import "node_modules/bootstrap/scss/code";
-@import "node_modules/bootstrap/scss/grid";
+@import "../node_modules/bootstrap/scss/reboot";
+@import "../node_modules/bootstrap/scss/type";
+@import "../node_modules/bootstrap/scss/images";
+@import "../node_modules/bootstrap/scss/code";
+@import "../node_modules/bootstrap/scss/grid";
 {% endhighlight %}
 
 With that setup in place, you can begin to modify any of the Sass variables and maps in your `custom.scss`. You can also start to add parts of Bootstrap under the `// Optional` section as needed. We suggest using the full import stack from our `bootstrap.scss` file as your starting point.
@@ -88,7 +88,7 @@ $body-bg: #000;
 $body-color: #111;
 
 // Bootstrap and its default variables
-@import "node_modules/bootstrap/scss/bootstrap";
+@import "../node_modules/bootstrap/scss/bootstrap";
 {% endhighlight %}
 
 Repeat as necessary for any variable in Bootstrap, including the global options below.
@@ -126,16 +126,16 @@ To remove colors from `$theme-colors`, or any other map, use `map-remove`. Be aw
 
 {% highlight scss %}
 // Required
-@import "node_modules/bootstrap/scss/functions";
-@import "node_modules/bootstrap/scss/variables";
-@import "node_modules/bootstrap/scss/mixins";
+@import "../node_modules/bootstrap/scss/functions";
+@import "../node_modules/bootstrap/scss/variables";
+@import "../node_modules/bootstrap/scss/mixins";
 
 $theme-colors: map-remove($theme-colors, "info", "light", "dark");
 
 // Optional
-@import "node_modules/bootstrap/scss/root";
-@import "node_modules/bootstrap/scss/reboot";
-@import "node_modules/bootstrap/scss/type";
+@import "../node_modules/bootstrap/scss/root";
+@import "../node_modules/bootstrap/scss/reboot";
+@import "../node_modules/bootstrap/scss/type";
 ...
 {% endhighlight %}
 

data/mod/bootstrap/vendor/bootstrap/{docs → site/docs}/4.1/getting-started/webpack.md

@@ -22,7 +22,7 @@ Alternatively, you may **import plugins individually** as needed:
 
 {% highlight js %}
 import 'bootstrap/js/dist/util';
-import 'bootstrap/js/dist/dropdown';
+import 'bootstrap/js/dist/alert';
 ...
 {% endhighlight %}
 
@@ -30,11 +30,6 @@ Bootstrap is dependent on [jQuery](https://jquery.com/) and [Popper](https://pop
 these are defined as `peerDependencies`, this means that you will have to make sure to add both of them
 to your `package.json` using `npm install --save jquery popper.js`.
 
-{% capture callout %}
-Notice that if you chose to **import plugins individually**, you must also install [exports-loader](https://github.com/webpack-contrib/exports-loader)
-{% endcapture %}
-{% include callout.html content=callout type="warning" %}
-
 ## Importing Styles
 
 ### Importing Precompiled Sass

data/mod/bootstrap/vendor/bootstrap/{docs → site/docs}/4.1/layout/grid.md

@@ -761,7 +761,7 @@ Using our built-in grid Sass variables and maps, it's possible to completely cus
 
 ### Columns and gutters
 
-The number of grid columns can be modified via Sass variables. `$grid-columns` is used to generate the widths (in percent) of each individual column while `$grid-gutter-width` allows breakpoint-specific widths that are divided evenly across `padding-left` and `padding-right` for the column gutters.
+The number of grid columns can be modified via Sass variables. `$grid-columns` is used to generate the widths (in percent) of each individual column while `$grid-gutter-width` sets the width for the column gutters.
 
 {% highlight scss %}
 $grid-columns: 12 !default;

data/mod/bootstrap/vendor/bootstrap/{docs → site/docs}/4.1/utilities/colors.md

@@ -19,7 +19,7 @@ toc: true
 {% endcapture %}
 {% include example.html content=example %}
 
-Contextual text classes also work well on anchors with the provided hover and focus states. **Note that the `.text-white` and `.text-muted` class has no link styling.**
+Contextual text classes also work well on anchors with the provided hover and focus states. **Note that the `.text-white` and `.text-muted` class has no additional link styling beyond underline.**
 
 {% capture example %}
 {% for color in site.data.theme-colors %}

data/mod/bootstrap/vendor/bootstrap/{docs → site/docs}/4.1/utilities/image-replacement.md

@@ -28,6 +28,6 @@ Utilize the `.text-hide` class or mixin to help replace an element's text conten
 Use the `.text-hide` class to maintain the accessibility and SEO benefits of heading tags, but want to utilize a `background-image` instead of text.
 
 {% capture example %}
-<h1 class="text-hide" style="background-image: url('/assets/brand/bootstrap-solid.svg'); width: 50px; height: 50px;">Bootstrap</h1>
+<h1 class="text-hide" style="background-image: url('/docs/{{ site.docs_version }}/assets/brand/bootstrap-solid.svg'); width: 50px; height: 50px;">Bootstrap</h1>
 {% endcapture %}
 {% include example.html content=example %}

data/mod/bootstrap/vendor/bootstrap/{docs → site/docs}/4.1/utilities/shadows.md

@@ -1,7 +1,7 @@
 ---
 layout: docs
 title: Shadows
-description:  Add or remove shadows to elements with `box-shadow` utilities.
+description: Add or remove shadows to elements with box-shadow utilities.
 group: utilities
 toc: false
 ---

data/mod/bootstrap/vendor/bootstrap/{docs → site/docs}/4.1/utilities/visibility.md

@@ -5,7 +5,7 @@ description: Control the visibility, without modifying the display, of elements
 group: utilities
 ---
 
-Set the `visibility` of elements with our visibility utilities. These do not modify the `display` value at all and are helpful for hiding content from most users, but still keeping them for screen readers.
+Set the `visibility` of elements with our visibility utilities. These utility classes do not modify the `display` value at all and do not affect layout – `.invisible` elements still take up space in the page. Content will be hidden both visually and for assistive technology/screen reader users.
 
 Apply `.visible` or `.invisible` as needed.
 

data/mod/bootstrap/vendor/bootstrap/{index.html → site/index.html}

@@ -6,7 +6,7 @@ layout: home
   <div class="container">
     <div class="row align-items-center">
       <div class="col-6 mx-auto col-md-6 order-md-2">
-        <img class="img-fluid mb-3 mb-md-0" src="{{ site.baseurl }}/assets/img/bootstrap-stack.png" alt="" width="1024" height="860">
+        <img class="img-fluid mb-3 mb-md-0" src="{{ site.baseurl }}/docs/{{ site.docs_version }}/assets/img/bootstrap-stack.png" alt="" width="1024" height="860">
       </div>
       <div class="col-md-6 order-md-1 text-center text-md-left pr-md-5">
         <h1 class="mb-3 bd-text-purple-bright">Bootstrap</h1>
@@ -76,7 +76,7 @@ gem install bootstrap -v {{ site.current_ruby_version }}
     <p>
       Take Bootstrap 4 to the next level with official premium themes—toolkits built on Bootstrap with new components and plugins, docs, and build tools.
     </p>
-    <img class="img-fluid mt-3 mx-auto" src="{{ site.baseurl }}/assets/img/bootstrap-themes.png" alt="Bootstrap Themes" width="1024" height="388">
+    <img class="img-fluid mt-3 mx-auto" src="{{ site.baseurl }}/docs/{{ site.docs_version }}/assets/img/bootstrap-themes.png" alt="Bootstrap Themes" width="1024" height="388">
     <hr class="half-rule">
     <a href="{{ site.themes }}" class="btn btn-outline-primary">Browse themes</a>
   </div>

data/mod/bootstrap/vendor/bootstrap/{sw.js → site/sw.js}

@@ -1,5 +1,5 @@
 /* global workbox:false */
 
-self.importScripts('/assets/js/vendor/{fileName}')
+self.importScripts('docs/4.1/assets/js/vendor/{fileName}')
 
 workbox.precaching.precacheAndRoute([])

data/mod/carrierwave/lib/carrier_wave/file_card_uploader.rb

@@ -207,7 +207,7 @@ module CarrierWave
 
     def url opts={}
       if model.cloud?
-        file.url
+        file&.url
       elsif model.web?
         model.content
       else

data/mod/carrierwave/set/abstract/attachment/upload_cache.rb

@@ -5,8 +5,7 @@ def actionable?
   super || preliminary_upload?
 end
 
-event :upload_attachment, :prepare_to_validate,
-      on: :save, when: proc { |c| c.preliminary_upload? } do
+event :prepare_attachment, :prepare_to_validate, on: :save, when: :preliminary_upload? do
   save_original_filename  # save original filename as comment in action
   write_identifier        # set db_content
   # (needs original filename to determine extension)
@@ -26,8 +25,7 @@ event :upload_attachment, :prepare_to_validate,
 end
 
 event :assign_attachment_on_create, :initialize,
-      after: :assign_action, on: :create,
-      when: proc { |c| c.save_preliminary_upload? } do
+      after: :assign_action, on: :create, when: :save_preliminary_upload? do
   return unless  (action = Card::Action.fetch(@action_id_of_cached_upload))
   upload_cache_card.selected_action_id = action.id
   upload_cache_card.select_file_revision
@@ -35,8 +33,7 @@ event :assign_attachment_on_create, :initialize,
 end
 
 event :assign_attachment_on_update, :initialize,
-      after: :assign_action, on: :update,
-      when:  proc { |c| c.save_preliminary_upload? } do
+      after: :assign_action, on: :update, when: :save_preliminary_upload? do
   return unless (action = Card::Action.fetch(@action_id_of_cached_upload))
   uploaded_file = with_selected_action_id(action.id) { attachment.file }
   assign_attachment uploaded_file, action.comment
@@ -49,7 +46,7 @@ def assign_attachment file, original_filename
 end
 
 event :delete_cached_upload_file_on_create, :integrate,
-      on: :create, when: proc { |c| c.save_preliminary_upload? } do
+      on: :create, when: :save_preliminary_upload? do
   return unless (action = Card::Action.fetch(@action_id_of_cached_upload))
   upload_cache_card.delete_files_for_action action
   action.delete
@@ -63,7 +60,7 @@ event :clear_draft_files, :integrate_with_delay,
 end
 
 event :delete_cached_upload_file_on_update, :integrate,
-      on: :update, when: proc { |c| c.save_preliminary_upload? } do
+      on: :update, when: :save_preliminary_upload? do
   return unless  (action = Card::Action.fetch(@action_id_of_cached_upload))
   delete_files_for_action action
   action.delete

data/mod/carrierwave/template/type/file/file_chooser.haml

@@ -1,6 +1,6 @@
 .choose-file
   = preview
-  %span.btn.btn-success.fileinput-button
+  %span.btn.btn-secondary.fileinput-button
     = icon_tag "cloud_upload"
     %span<
       = action_text

data/mod/core/set/abstract/code_file.rb

@@ -59,6 +59,10 @@ format :html do
     "Content is stored in file and can't be edited."
   end
 
+  view :file_size do
+    "#{card.name}: #{number_to_human_size card.content.bytesize}"
+  end
+
   view :bar_middle do
     fa_icon("exclamation-circle", class: "text-muted pr-2") +
       wrap_with(:span, "file", class: "text-muted")

data/mod/core/set/all/haml.rb

@@ -63,8 +63,8 @@ format do
     with_template_path path do
       haml_to_html ::File.read(path), locals
     end
-  rescue => e
-    raise Card::Error, "HAML error #{template_name}: #{e.message}\n#{e.backtrace}"
+    # rescue => e
+    #   raise Card::Error, "HAML error #{template_name}: #{e.message}\n#{e.backtrace}"
   end
 
   def identify_template_path view, locals={}

data/mod/follow/spec/set/all/notify_spec.rb

@@ -129,7 +129,8 @@ RSpec.describe Card::Set::All::Notify do
 
     it "creates well formatted text message" do
       path = File.expand_path "../notify_email.txt", __FILE__
-      expect(notification_email_for("card with fields")).to eq(File.read(path))
+      email = notification_email_for("card with fields").gsub /\r/, ""
+      expect(email).to eq(File.read(path))
     end
   end
 

data/mod/google_analytics/set/all/google_analytics.rb

@@ -20,13 +20,15 @@ format :html do
 
   def google_analytics_snippet_vars_string
     google_analytics_snippet_vars.map do |array|
-      "_gaq.push([#{array.map { |i| "'#{i}'" }.join ', '}]);"
-    end.join " "
+      <<-JAVASCRIPT
+      _gaq.push([#{array.map { |i| "'#{i}'" }.join ', '}]);
+      JAVASCRIPT
+    end.join
   end
 
   def google_analytics_snippet_javascript
     <<-JAVASCRIPT
-      var _gaq = _gaq || []; #{google_analytics_snippet_vars_string}
+      var _gaq = _gaq || [];#{"\n" + google_analytics_snippet_vars_string}
       (function() {
         var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
         ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';

data/mod/item/set/all/bar.haml

@@ -1,4 +1,6 @@
-.bar.border.left-stripe.d-flex.justify-content-between.p-0.double-border-fix-bottom.with-fancy-border
+- bar_classes = css_classes classy("bar"), card.safe_set_keys, "with-fancy-border",
+                            "justify-content-between", "double-border-fix-bottom"
+.collapsed-bar.d-flex.border.nodblclick.p-0{class: bar_classes}
   - if voo.show? :bar_left
     %div{class: classy("bar-left")}
       = render :bar_left
@@ -8,5 +10,6 @@
   - if voo.show? :bar_right
     %div{class: classy("bar-right")}
       = render :bar_right
-      = render :bar_page_link
-      = render :bar_expand_link
+      .bar-nav.d-flex
+        = render :bar_page_link
+        = render :bar_expand_link

data/mod/item/set/all/bar.rb

@@ -1,15 +1,22 @@
 include_set Abstract::BsBadge
 
 format :html do
-  view :thin_bar do
+  view :mini_bar do
     render_bar hide: :bar_middle
   end
 
   view :bar do
+    class_up_bar_sides(*bar_side_cols(voo.show?(:bar_middle)))
+    # note: above cannot be in `before`, because before blocks run before viz processing
     wrap { haml :bar }
   end
 
+  def bar_side_cols middle=true
+    middle ? [5, 3] : [7, 5]
+  end
+
   view :expanded_bar do
+    class_up_bar_sides(*bar_side_cols(false))
     wrap { haml :expanded_bar }
   end
 
@@ -17,14 +24,22 @@ format :html do
     _render_expanded_bar!
   end
 
-  before :bar do
+  before(:bar) { bar_classes }
+  before(:expanded_bar) { bar_classes }
+
+  def bar_classes
     shared = "align-items-center"
     class_up "bar-left", "p-2 font-weight-bold d-flex grow-2 #{shared}"
-    class_up "bar-middle", "col-3 d-none d-md-flex p-3 border-left #{shared}"
+    class_up "bar-middle", "col-4 d-none d-md-flex p-3 border-left #{shared}"
     class_up "bar-right",
              "p-3 border-left d-flex justify-content-end text-align-right #{shared}"
   end
 
+  def class_up_bar_sides left, right
+    class_up "bar-left", "col-#{left}", true
+    class_up "bar-right", "col-#{right}", true
+  end
+
   view :bar_left do
     class_up "card-title", "mb-0"
     render :title
@@ -35,7 +50,7 @@ format :html do
   end
 
   view :bar_middle do
-    labeled_badge stat_number, stat_label
+    ""
   end
 
   view :bar_bottom do
@@ -46,16 +61,16 @@ format :html do
     end
   end
 
-  def stat_number
-    card.content.lines.count
-  end
-
-  def stat_label
-    stat_number == 1 ? "line" : "lines"
-  end
+  # def stat_number
+  #   card.content.lines.count
+  # end
+  #
+  # def stat_label
+  #   stat_number == 1 ? "line" : "lines"
+  # end
 
   view :bar_page_link do
-    link_to_card card, icon_tag(:open_in_new), class: "text-muted"
+    link_to_card card, icon_tag(:open_in_new), class: "text-muted pl-2"
   end
 
   def toggle_class

data/mod/item/set/all/box.haml

@@ -1,10 +1,11 @@
-.card.p-0.drop-shadow.rounded-0.top-border-default.mb-4{class: classy("box")}
+- box_classes = css_classes classy("box"), card.safe_set_keys
+.card.p-0.drop-shadow.rounded-0.mb-4.nodblclick{class: box_classes}
   - if voo.show? :box_top
-    .card-header{class: classy("box-top")}
+    .card-header.text-center{class: classy("box-top")}
       = render :box_top
   - if voo.show? :box_middle
     .card-body{class: classy("box-middle")}
       = render :box_middle
   - if voo.show? :box_bottom
-    .card-footer{class: classy("box-bottom")}
+    .card-footer.text-center{class: classy("box-bottom")}
       = render :box_bottom

data/mod/item/set/all/box.rb

@@ -1,7 +1,7 @@
 view :box, template: :haml
 
 view :box_top do
-  render_title
+  render_title_link
 end
 
 view_for_override :box_middle

data/mod/item/set/all/expanded_bar.haml

@@ -1,10 +1,12 @@
-.expanded-bar.with-fancy-border
-  .bar-top.border.left-stripe.d-flex.justify-content-between.p-0
-    .bar-left.p-2.d-flex.align-items-center.font-weight-bold
+- bar_classes = css_classes classy("bar"), card.safe_set_keys
+.expanded-bar.border.with-fancy-border.nodblclick
+  .bar-top.border.d-flex.justify-content-between.p-0{class: bar_classes}
+    %div{class: classy("bar-left")}
       = render :bar_left
-    .bar-right.p-3.border-left.text-align-right
+    %div{class: classy("bar-right")}
       = render :bar_right
-      = render :bar_page_link
-      = render :bar_collapse_link
+      .bar-nav.d-flex
+        = render :bar_page_link
+        = render :bar_collapse_link
   .bar-bottom.col-12.border.border-top-0.mb-3.pl-5.pt-2
     = render :bar_bottom