card 1.96.8 → 1.97.0

data/mod/account/spec/set/type/signup_spec.rb

@@ -1,6 +1,6 @@
 # -*- encoding : utf-8 -*-
 
-describe Card::Set::Type::Signup do
+RSpec.describe Card::Set::Type::Signup do
   before do
     Card::Auth.current_id = Card::AnonymousID
   end

data/mod/basic_formats/set/self/head.rb

@@ -12,6 +12,10 @@ format :html do
     end
   end
 
+  view :editor do
+    "Content is can't be edited."
+  end
+
   def escape_in_main
     main? ? (h yield) : yield
   end

data/mod/bootstrap/lib/javascript/script_load_select2.js.coffee

@@ -5,6 +5,8 @@ decko.slotReady (slot) ->
     opts = { dropdownAutoWidth: "true", containerCssClass: ":all:", width: "auto" }
     if $(this).hasClass("tags")
       opts.tags = "true"
+    if $(this).data("minimum-results-for-search")?
+      opts.minimumResultsForSearch = $(this).data("minimum-results-for-search")
     $(this).select2(opts)
 
   # TODO: move to better place

data/mod/bootstrap/lib/stylesheets/style_bootstrap_cards.scss

@@ -22,13 +22,20 @@ header {
   }
 }
 
+.d0-card-header a {
+  color: $body-color;
+}
+.card-menu {
+  color: $text-muted;
+}
+
 @media print {
   header {
     display: none;
   }
 }
 
-.card-menu  a {
+.card-menu a {
   color: inherit;
 }
 
@@ -61,6 +68,11 @@ form {
   padding: 0px;
 }
 
+.form-group > label {
+  color: $dark;
+  font-weight: bold;
+}
+
 .link-muted {
   color: $text-muted;
   &:hover {
@@ -94,6 +106,16 @@ body.mceContentBody {
 }
 
 
+/*----------- Navbox --------------*/
+
+.select2-navbox-dropdown > .select2-results > .select2-results__options {
+  max-height: none !important;
+}
+
+.navbox-form .select2-container {
+  width: 100%
+}
+
 /*----------- Sidebar -------------*/
 
 .row.row-offcanvas {
@@ -140,19 +162,23 @@ body.mceContentBody {
 /*---------- Card menu ------------*/
 
 @include media-breakpoint-up(xs) {
-  .card-slot > .d0-card-frame, .card-slot {
-    > .menu-slot > .vertical-card-menu._show-on-hover {
-      .btn-group.slotter {
-        display: none;
-        &.open {
-          display: inline-block;
-        }
-      }
+  .card-slot > .d0-card-frame > .d0-card-header,
+  .card-slot > .d0-card-header,
+  .card-slot.labeled-view > .labeled-content > .d0-card-body,
+  .card-slot.content-view,
+  .card > .card-body,
+  .card > .card-header {
+    > .card-menu._show-on-hover > a {
+      display: none;
     }
   }
-
-  .card-slot:hover > .d0-card-frame, .card-slot:hover {
-    > .menu-slot > .vertical-card-menu._show-on-hover .btn-group.slotter {
+  .card-slot:hover > .d0-card-frame > .d0-card-header,
+  .card-slot:hover > .d0-card-header,
+  .card-slot.labeled-view:hover > .labeled-content > .d0-card-body,
+  .card-slot.content-view:hover,
+  .card:hover > .card-body,
+  .card:hover > .card-header{
+    > .card-menu._show-on-hover > a {
       display: inline-block;
     }
   }
@@ -172,7 +198,9 @@ body.mceContentBody {
 }
 
 .titled-view > .d0-card-header {
-  font-size: 1.3em;
+  > .d0-card-header-title {
+    font-size: 1.3em;
+  }
   margin: 3px 0
 }
 
@@ -239,8 +267,7 @@ body.mceContentBody {
 /*---------- comments -------------------------------------- */
 
 .comment-box {
-  padding: 8px;
-  margin: 0px;
+  padding-top: 8px;
   input {
     padding: 0px;
   }
@@ -284,10 +311,15 @@ body.mceContentBody {
 
 .modal-menu .close{
   font-size: 16px;
-  margin-left: 10px;
+  // margin-left: 10px;
+}
 
+.modal-dialog.modal-full {
+  max-width: 99%;
+  margin: 1%;
 }
 
+
 /*-------- Help Texts --------*/
  .alert-info p:last-child {
    margin-bottom: 0;
@@ -394,14 +426,37 @@ body.mceContentBody {
 .bar {
   border-left: 3px solid $bar_stripe_color !important;
   .bar-nav {
-    min-width: 36px;
+    min-width: 20px;
   }
 }
 
-.box {
-  border-top: 3px solid $box_stripe_color !important;
-}
-
 .badge {
   vertical-align: text-top!important;
 }
+
+/*----------- Tweak tabs -------------*/
+
+.nav-tabs .nav-item {
+  margin-left: -1px; // remove double border on tabs
+}
+
+/*----------- Slim Select2 -------------*/
+
+.slim-select2 {
+  .select2-container--bootstrap {
+    .select2-selection, &.select2-container--open .select2-selection {
+      padding-top: 2px;
+      height: 1.5rem;
+    }
+
+    .select2-selection--single .select2-selection__rendered {
+      font-size: 80%;
+    }
+
+    .select2-results__option {
+      font-size: 80%;
+    }
+  }
+}
+
+

data/mod/bootstrap/lib/stylesheets/style_select2_bootstrap.scss

@@ -1,5 +1,3 @@
-
-
 // The original select2 bootstrap is overriden here to make it work with bootstrap 4
 // using this
 // https://github.com/angel-vladov/select2-bootstrap-theme/blob/master/src/select2-bootstrap.scss
@@ -7,6 +5,7 @@
 // We used this gist before:
 // https://gist.github.com/DaleMckeown/82995dcc482650f130a708f11a66a2a6
 
+//
 // Functions
 // --------------------------------------------------
 
@@ -54,6 +53,25 @@ $s2bs-dropdown-link-hover-color: $dropdown-link-hover-color !default;
 $s2bs-font-size-base: $font-size-base !default;
 $s2bs-font-size-large: $font-size-lg !default;
 $s2bs-font-size-small: $font-size-sm !default;
+
+@if variable-exists(input-font-size) {
+  // Added in Bootstrap 4.2
+  //noinspection SassScssUnresolvedVariable
+  $s2bs-font-size-base: $input-font-size !default;
+}
+
+@if variable-exists(input-font-size-lg) {
+  // Added in Bootstrap 4.2
+  //noinspection SassScssUnresolvedVariable
+  $s2bs-font-size-large: $input-font-size-lg !default;
+}
+
+@if variable-exists(input-font-size-sm) {
+  // Added in Bootstrap 4.2
+  //noinspection SassScssUnresolvedVariable
+  $s2bs-font-size-small: $input-font-size-sm !default;
+}
+
 $s2bs-padding-base-horizontal: $input-btn-padding-x !default;
 $s2bs-padding-large-horizontal: $input-btn-padding-x-lg !default;
 $s2bs-padding-small-horizontal: $input-btn-padding-x-sm !default;
@@ -70,9 +88,9 @@ $s2bs-input-color-placeholder: $input-placeholder-color !default;
 $s2bs-input-border: $input-border-color !default;
 $s2bs-input-border-focus: $input-focus-border-color !default;
 $s2bs-input-border-radius: $input-border-radius !default;
-$s2bs-input-height-base: calc(#{$input-btn-padding-y * 2 + $input-btn-line-height * $font-size-base} + #{$border-width * 2}) !default;
-$s2bs-input-height-large: calc(#{$input-btn-padding-y-lg * 2 + $input-btn-line-height * $font-size-lg} + #{$border-width * 2}) !default;
-$s2bs-input-height-small: calc(#{$input-btn-padding-y-sm * 2 + $input-btn-line-height * $font-size-sm} + #{$border-width * 2}) !default;
+$s2bs-input-height-base: $input-height !default;
+$s2bs-input-height-large: $input-height-lg !default;
+$s2bs-input-height-small: $input-height-sm !default;
 $s2bs-state-warning-text: theme-color("warning") !default;
 $s2bs-state-danger-text: $form-feedback-invalid-color !default;
 $s2bs-state-success-text: $form-feedback-valid-color !default;
@@ -879,4 +897,4 @@ $s2bs-form-control-transition: $input-transition !default;
   @include media-breakpoint-up(sm) {
     display: inline-block;
   }
-}
+}

data/mod/bootstrap/set/abstract/bootswatch_theme/html_views.rb

@@ -12,11 +12,12 @@ format :html do
 
   view :bar_left do
     class_up "card-title", "my-0 ml-2"
-    class_up "media-left", "m-0", true
+    class_up "media-left", "m-0"
     text_with_image size: :small, title: "", text: _render_title,
                     media_opts: { class: "align-items-center" }
     # field_nest(:image, view: :core) + wrap_with(:h4, render(:title))
   end
+  view :bar_expanded_left, :bar_left
 
   view :bar_right do
     customize_button text: "Customize"

data/mod/bootstrap/set/type/customized_bootswatch_skin/core.haml

@@ -1,5 +1,5 @@
 %h5
   Skin configuration from simplest to most advanced
 = field_nest :colors, view: :bar, title: "Palette and uses of colors"
-= field_nest :variables, view: :bar, title: "Additional SCSS variables", show: :edit_button
-= field_nest :stylesheets, view: :bar, title: "SCSS and CSS stylesheets", show: :edit_button
+= field_nest :variables, view: :bar, title: "Additional SCSS variables", show: [:edit_button, :bar_middle]
+= field_nest :stylesheets, view: :bar, title: "SCSS and CSS stylesheets", show: :edit_button

data/mod/bootstrap/set/type/customized_bootswatch_skin/html_views.rb

@@ -2,35 +2,35 @@ include_set Abstract::Media
 include_set Abstract::BsBadge
 
 format :html do
-  view :bar_middle do
-    labeled_badge card.item_count, "items"
+  view :menu do
+    ""
   end
 
-  view :core, template: :haml do
+  def short_content
+    ""
+    # labeled_badge card.item_count, "items"
+    # "#{card.item_count} items"
   end
 
-  view :bar_right do
-    ""
+  view :core, template: :haml do
   end
 
   before :bar do
     super()
     voo.show :edit_button
     class_up "bar-middle",
-             "col-3 d-none d-md-flex p-3 border-left d-flex align-items-center p-0",
-             true
+             "col-3 d-none d-md-flex p-3 border-left d-flex align-items-center p-0"
   end
 
-  view :bar_left do
-    class_up "card-title", "mb-0"
-    render :title
+  view :bar_right do
+    render(:short_content)
   end
 
-  view :bar_bottom do
-    render_core
+  before :bar_expanded_nav do
+    voo.hide :edit_link
   end
 
-  def edit_slot
-    haml :edit_slot
+  view :bar_bottom do
+    render_core
   end
 end

data/mod/bootstrap/set/type_plus_right/customized_bootswatch_skin/colors.rb

@@ -74,6 +74,10 @@ format :html do
     voo.show :edit_button
   end
 
+  view :core, template: :haml do
+    @colors = card.theme_colors.reject { |k, _v| k.in? %i[body-bg body-color] }
+  end
+
   view :bar_middle do
     <<-HTML
       <div class="colorpicker-element">

data/mod/bootstrap/set/type_plus_right/customized_bootswatch_skin/colors/core.haml

@@ -0,0 +1,10 @@
+.colorpicker-element
+  .input-group-addon
+    - colors.each do |name, color|
+      %div
+        %span.labeled-badge
+        %i{class: "bg-#{name}"}
+        -#%span.badge{ class: "badge-#{name}" }
+
+        %label.text-muted
+          = name

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

@@ -255,8 +255,8 @@ module CarrierWave
       File.join model.tmp_upload_dir, filename
     end
 
-    def create_versions? _new_file
-      model.create_versions?
+    def create_versions? new_file
+      model.create_versions? new_file
     end
 
     # paperclip compatibility used in type/file.rb#core (base format)

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

@@ -68,7 +68,7 @@ def attachment_before_act
   send "#{attachment_name}_before_act"
 end
 
-def create_versions?
+def create_versions? _new_file
   true
 end
 

data/mod/carrierwave/set/type/file.rb

@@ -28,6 +28,10 @@ format do
     end
   end
 
+  def short_content
+    number_to_human_size card.attachment.size
+  end
+
   def handle_source
     source = _render_source
     return "" if source.blank?

data/mod/carrierwave/set/type/image.rb

@@ -2,6 +2,14 @@ attachment :image, uploader: CarrierWave::ImageCardUploader
 
 include File::SelectedAction
 
+def create_versions? new_file
+  new_file.extension != "svg"
+end
+
+def svg?
+  image&.extension == ".svg"
+end
+
 format do
   include File::Format
 
@@ -9,6 +17,10 @@ format do
     _render_core size: :icon
   end
 
+  def short_content
+    render_core size: :icon
+  end
+
   view :source do
     return card.content if card.web?
     image = selected_version
@@ -59,6 +71,7 @@ format :html do
 
   # core HTML image view.
   view :core do
+    return card.attachment.read if card.svg?
     with_valid_source do |source|
       image_tag source, alt: card.name
     end

data/mod/carrierwave/spec/lib/carrier_wave/file_card_uploader_spec.rb

@@ -25,13 +25,13 @@ describe CarrierWave::FileCardUploader do
 
       it "returns correct identifier" do
         expect(subject.attachment.db_content)
-          .to eq ":logo/standard.png"
+          .to eq ":logo/standard.svg"
       end
 
       it "handles storage options" do
         subject.last_action_id
         expect(subject.attachment.db_content(storage_type: :local))
-          .to eq "~#{subject.id}/#{subject.last_action_id}.png"
+          .to eq "~#{subject.id}/#{subject.last_action_id}.svg"
       end
     end
 

data/mod/carrierwave/spec/set/type/file_spec.rb

@@ -33,7 +33,7 @@ RSpec.describe Card::Set::Type::File do
   let(:unprotected_file) do
     create_file_card :local, test_file(2), codename: nil
   end
-  let(:coded_file) { Card[:logo] }
+  let(:coded_file) { Card[:yeti_skin_image] }
   let(:web_file) do
     Card::Auth.as_bot do
       Card.create! name: "file card", type_id: Card::FileID,
@@ -91,9 +91,9 @@ RSpec.describe Card::Set::Type::File do
     context "storage type: coded" do
       subject { source_view coded_file }
 
-      it "renders protected url to be processed by wagn" do
+      it "renders protected url to be processed by decko" do
         is_expected.to(
-          eq "/files/:#{coded_file.codename}/standard-medium.png"
+          eq "/files/:#{coded_file.codename}/bootstrap-medium.png"
         )
       end
     end
@@ -469,7 +469,7 @@ RSpec.describe Card::Set::Type::File do
           subject.update! storage_type: :local
         end
         expect(subject.db_content)
-          .to eq "~#{subject.id}/#{subject.last_action_id}.png"
+          .to eq "~#{subject.id}/#{subject.last_action_id}.svg"
       end
     end