comfortable_mexican_sofa 2.0.15 → 2.0.16

data/app/assets/stylesheets/comfy/vendor/bootstrap/bootstrap-grid.scss

@@ -1,5 +1,5 @@
 /*!
- * Bootstrap Grid v4.0.0 (https://getbootstrap.com)
+ * Bootstrap Grid v4.1.1 (https://getbootstrap.com/)
  * Copyright 2011-2018 The Bootstrap Authors
  * Copyright 2011-2018 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)

data/app/assets/stylesheets/comfy/vendor/bootstrap/bootstrap-reboot.scss

@@ -1,5 +1,5 @@
 /*!
- * Bootstrap Reboot v4.0.0 (https://getbootstrap.com)
+ * Bootstrap Reboot v4.1.1 (https://getbootstrap.com/)
  * Copyright 2011-2018 The Bootstrap Authors
  * Copyright 2011-2018 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)

data/app/assets/stylesheets/comfy/vendor/bootstrap/bootstrap.scss

@@ -1,5 +1,5 @@
 /*!
- * Bootstrap v4.0.0 (https://getbootstrap.com)
+ * Bootstrap v4.1.1 (https://getbootstrap.com/)
  * Copyright 2011-2018 The Bootstrap Authors
  * Copyright 2011-2018 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)

data/app/assets/stylesheets/comfy/vendor/bootstrap/mixins/_caret.scss

@@ -14,6 +14,7 @@
 
 @mixin caret-right {
   border-top: $caret-width solid transparent;
+  border-right: 0;
   border-bottom: $caret-width solid transparent;
   border-left: $caret-width solid;
 }

data/app/assets/stylesheets/comfy/vendor/bootstrap/mixins/_forms.scss

@@ -45,7 +45,7 @@
     margin-top: .1rem;
     font-size: .875rem;
     line-height: 1;
-    color: #fff;
+    color: $white;
     background-color: rgba($color, .8);
     border-radius: .2rem;
   }
@@ -68,6 +68,16 @@
     }
   }
 
+  .form-control-file {
+    .was-validated &:#{$state},
+    &.is-#{$state} {
+      ~ .#{$state}-feedback,
+      ~ .#{$state}-tooltip {
+        display: block;
+      }
+    }
+  }
+
   .form-check-input {
     .was-validated &:#{$state},
     &.is-#{$state} {

data/app/assets/stylesheets/comfy/vendor/bootstrap/mixins/_gradients.scss

@@ -11,7 +11,7 @@
 // Horizontal gradient, from left to right
 //
 // Creates two color stops, start and end, by specifying a color and position for each color stop.
-@mixin gradient-x($start-color: #555, $end-color: #333, $start-percent: 0%, $end-percent: 100%) {
+@mixin gradient-x($start-color: $gray-700, $end-color: $gray-800, $start-percent: 0%, $end-percent: 100%) {
   background-image: linear-gradient(to right, $start-color $start-percent, $end-color $end-percent);
   background-repeat: repeat-x;
 }
@@ -19,27 +19,27 @@
 // Vertical gradient, from top to bottom
 //
 // Creates two color stops, start and end, by specifying a color and position for each color stop.
-@mixin gradient-y($start-color: #555, $end-color: #333, $start-percent: 0%, $end-percent: 100%) {
+@mixin gradient-y($start-color: $gray-700, $end-color: $gray-800, $start-percent: 0%, $end-percent: 100%) {
   background-image: linear-gradient(to bottom, $start-color $start-percent, $end-color $end-percent);
   background-repeat: repeat-x;
 }
 
-@mixin gradient-directional($start-color: #555, $end-color: #333, $deg: 45deg) {
+@mixin gradient-directional($start-color: $gray-700, $end-color: $gray-800, $deg: 45deg) {
   background-image: linear-gradient($deg, $start-color, $end-color);
   background-repeat: repeat-x;
 }
-@mixin gradient-x-three-colors($start-color: #00b3ee, $mid-color: #7a43b6, $color-stop: 50%, $end-color: #c3325f) {
+@mixin gradient-x-three-colors($start-color: $blue, $mid-color: $purple, $color-stop: 50%, $end-color: $red) {
   background-image: linear-gradient(to right, $start-color, $mid-color $color-stop, $end-color);
   background-repeat: no-repeat;
 }
-@mixin gradient-y-three-colors($start-color: #00b3ee, $mid-color: #7a43b6, $color-stop: 50%, $end-color: #c3325f) {
+@mixin gradient-y-three-colors($start-color: $blue, $mid-color: $purple, $color-stop: 50%, $end-color: $red) {
   background-image: linear-gradient($start-color, $mid-color $color-stop, $end-color);
   background-repeat: no-repeat;
 }
-@mixin gradient-radial($inner-color: #555, $outer-color: #333) {
+@mixin gradient-radial($inner-color: $gray-700, $outer-color: $gray-800) {
   background-image: radial-gradient(circle, $inner-color, $outer-color);
   background-repeat: no-repeat;
 }
-@mixin gradient-striped($color: rgba(255,255,255,.15), $angle: 45deg) {
+@mixin gradient-striped($color: rgba($white, .15), $angle: 45deg) {
   background-image: linear-gradient($angle, $color 25%, transparent 25%, transparent 50%, $color 50%, $color 75%, transparent 75%, transparent);
 }

data/app/assets/stylesheets/comfy/vendor/bootstrap/mixins/_hover.scss

@@ -1,13 +1,11 @@
-// stylelint-disable indentation
-
 // Hover mixin and `$enable-hover-media-query` are deprecated.
 //
 // Origally added during our alphas and maintained during betas, this mixin was
-// designed to prevent `:hover` stickiness on iOS—an issue where hover styles
+// designed to prevent `:hover` stickiness on iOS-an issue where hover styles
 // would persist after initial touch.
 //
 // For backward compatibility, we've kept these mixins and updated them to
-// always return their regular psuedo-classes instead of a shimmed media query.
+// always return their regular pseudo-classes instead of a shimmed media query.
 //
 // Issue: https://github.com/twbs/bootstrap/issues/25195
 

data/app/assets/stylesheets/comfy/vendor/bootstrap/mixins/_list-group.scss

@@ -12,7 +12,7 @@
       }
 
       &.active {
-        color: #fff;
+        color: $white;
         background-color: $color;
         border-color: $color;
       }

data/app/assets/stylesheets/comfy/vendor/bootstrap/mixins/_nav-divider.scss

@@ -2,9 +2,9 @@
 //
 // Dividers (basically an hr) within dropdowns and nav lists
 
-@mixin nav-divider($color: #e5e5e5) {
+@mixin nav-divider($color: $nav-divider-color, $margin-y: $nav-divider-margin-y) {
   height: 0;
-  margin: ($spacer / 2) 0;
+  margin: $margin-y 0;
   overflow: hidden;
   border-top: 1px solid $color;
 }

data/app/assets/stylesheets/comfy/vendor/bootstrap/mixins/_screen-reader.scss

@@ -1,6 +1,6 @@
 // Only display content to screen readers
 //
-// See: http://a11yproject.com/posts/how-to-hide-content/
+// See: https://a11yproject.com/posts/how-to-hide-content/
 // See: https://hugogiraudel.com/2016/10/13/css-hide-and-seek/
 
 @mixin sr-only {
@@ -11,7 +11,6 @@
   overflow: hidden;
   clip: rect(0, 0, 0, 0);
   white-space: nowrap;
-  clip-path: inset(50%);
   border: 0;
 }
 
@@ -30,6 +29,5 @@
     overflow: visible;
     clip: auto;
     white-space: normal;
-    clip-path: none;
   }
 }

data/app/assets/stylesheets/comfy/vendor/bootstrap/mixins/_text-hide.scss

@@ -1,9 +1,13 @@
 // CSS image replacement
-@mixin text-hide() {
+@mixin text-hide($ignore-warning: false) {
   // stylelint-disable-next-line font-family-no-missing-generic-family-keyword
   font: 0/0 a;
   color: transparent;
   text-shadow: none;
   background-color: transparent;
   border: 0;
+
+  @if ($ignore-warning != true) {
+    @warn "The `text-hide()` mixin has been deprecated as of v4.1.0. It will be removed entirely in v5.";
+  }
 }

data/app/assets/stylesheets/comfy/vendor/bootstrap/mixins/_transition.scss

@@ -6,4 +6,8 @@
       transition: $transition;
     }
   }
+
+  @media screen and (prefers-reduced-motion: reduce) {
+    transition: none;
+  }
 }

data/app/assets/stylesheets/comfy/vendor/bootstrap/utilities/_flex.scss

@@ -16,6 +16,11 @@
     .flex#{$infix}-wrap         { flex-wrap: wrap !important; }
     .flex#{$infix}-nowrap       { flex-wrap: nowrap !important; }
     .flex#{$infix}-wrap-reverse { flex-wrap: wrap-reverse !important; }
+    .flex#{$infix}-fill         { flex: 1 1 auto !important; }
+    .flex#{$infix}-grow-0       { flex-grow: 0 !important; }
+    .flex#{$infix}-grow-1       { flex-grow: 1 !important; }
+    .flex#{$infix}-shrink-0     { flex-shrink: 0 !important; }
+    .flex#{$infix}-shrink-1     { flex-shrink: 1 !important; }
 
     .justify-content#{$infix}-start   { justify-content: flex-start !important; }
     .justify-content#{$infix}-end     { justify-content: flex-end !important; }

data/app/assets/stylesheets/comfy/vendor/bootstrap/utilities/_position.scss

@@ -3,6 +3,7 @@
 // Common values
 
 // Sass list not in variables since it's not intended for customization.
+// stylelint-disable-next-line scss/dollar-variable-default
 $positions: static, relative, absolute, fixed, sticky;
 
 @each $position in $positions {

data/app/assets/stylesheets/comfy/vendor/bootstrap/utilities/_shadows.scss

@@ -0,0 +1,6 @@
+// stylelint-disable declaration-no-important
+
+.shadow-sm { box-shadow: $box-shadow-sm !important; }
+.shadow { box-shadow: $box-shadow !important; }
+.shadow-lg { box-shadow: $box-shadow-lg !important; }
+.shadow-none { box-shadow: none !important; }

data/app/assets/stylesheets/comfy/vendor/bootstrap/utilities/_text.scss

@@ -4,6 +4,8 @@
 // Text
 //
 
+.text-monospace { font-family: $font-family-monospace; }
+
 // Alignment
 
 .text-justify  { text-align: justify !important; }
@@ -37,16 +39,20 @@
 
 // Contextual colors
 
-.text-white { color: #fff !important; }
+.text-white { color: $white !important; }
 
 @each $color, $value in $theme-colors {
   @include text-emphasis-variant(".text-#{$color}", $value);
 }
 
+.text-body { color: $body-color !important; }
 .text-muted { color: $text-muted !important; }
 
+.text-black-50 { color: rgba($black, .5) !important; }
+.text-white-50 { color: rgba($white, .5) !important; }
+
 // Misc
 
 .text-hide {
-  @include text-hide();
+  @include text-hide($ignore-warning: true);
 }

data/app/controllers/comfy/admin/cms/sites_controller.rb

@@ -11,8 +11,8 @@ class Comfy::Admin::Cms::SitesController < Comfy::Admin::Cms::BaseController
 
   def index
     return redirect_to action: :new if ::Comfy::Cms::Site.count.zero?
-    @site = ::Comfy::Cms::Site.find_by_id(session[:site_id])
-    @sites ||= ::Comfy::Cms::Site.all
+    @site   = ::Comfy::Cms::Site.find_by_id(session[:site_id])
+    @sites  = ::Comfy::Cms::Site.all
   end
 
   def new

data/app/controllers/comfy/cms/content_controller.rb

@@ -83,7 +83,7 @@ protected
       @cms_layout = @cms_page.layout
     end
 
-    return @cms_page
+    @cms_page
 
   rescue ActiveRecord::RecordNotFound
     nil

data/app/views/comfy/admin/cms/pages/toggle_branch.js.erb

@@ -5,7 +5,7 @@ li.find('.item .toggle').first().toggleClass('open');
 <% if session[:cms_page_tree].member?(@page.id.to_s) %>
   if(!li.find('ul.children')[0]) {
     li.append('<ul class="children sortable pl-md-3"><%= escape_javascript(render partial: "index_branch", collection: @page.children) %></ul>');
-    CMS.sortableList.destroy();
+    CMS.sortableList.dispose();
     CMS.sortableList.init();
   }
 <% else %>

data/comfortable_mexican_sofa.gemspec

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-$LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
+$LOAD_PATH.unshift File.expand_path("lib", __dir__)
 require "comfortable_mexican_sofa/version"
 
 Gem::Specification.new do |s|
@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
   s.add_dependency "kramdown",              ">= 1.0.0"
   s.add_dependency "mimemagic",             ">= 0.3.2"
   s.add_dependency "mini_magick",           ">= 4.8.0"
-  s.add_dependency "rails",                 ">= 5.2.0.rc1"
+  s.add_dependency "rails",                 ">= 5.2.0"
   s.add_dependency "rails-i18n",            ">= 5.0.0"
   s.add_dependency "sass-rails",            ">= 5.0.0"
 end

data/config/boot.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Set up gems listed in the Gemfile.
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile", __FILE__)
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
 
 require "bundler/setup" if File.exist?(ENV["BUNDLE_GEMFILE"])
 File.exist?(ENV["BUNDLE_GEMFILE"])

data/config/environment.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Load the rails application
-require File.expand_path("../application", __FILE__)
+require File.expand_path("application", __dir__)
 
 # Initialize the rails application
 ComfortableMexicanSofa::Application.initialize!

data/lib/comfortable_mexican_sofa/content/tags/helper.rb

@@ -31,9 +31,9 @@ class ComfortableMexicanSofa::Content::Tag::Helper < ComfortableMexicanSofa::Con
     helper_params = params.map do |p|
       case p
       when Hash
-        p.to_s
+        format("%<arg>s", arg: p)
       else
-        "\"#{p}\""
+        format("%<arg>p", arg: p)
       end
     end.join(",")
     "<%= #{method_name}(#{helper_params}) %>"

data/lib/comfortable_mexican_sofa/content/tags/partial.rb

@@ -26,7 +26,11 @@ class ComfortableMexicanSofa::Content::Tag::Partial < ComfortableMexicanSofa::Co
   end
 
   def content
-    "<%= render partial: \"#{@path}\", locals: #{@locals} %>"
+    format(
+      "<%%= render partial: %<path>p, locals: %<locals>s %%>",
+      path: @path,
+      locals: @locals
+    )
   end
 
   def render

data/lib/comfortable_mexican_sofa/content/tags/template.rb

@@ -25,7 +25,7 @@ class ComfortableMexicanSofa::Content::Tag::Template < ComfortableMexicanSofa::C
   end
 
   def content
-    "<%= render template: \"#{path}\" %>"
+    format("<%%= render template: %<path>p %%>", path: path)
   end
 
   def render

data/lib/comfortable_mexican_sofa/seeds.rb

@@ -90,7 +90,7 @@ module ComfortableMexicanSofa::Seeds
     # Writing to the seed file. Takes in file handler and array of hashes with
     # `header` and `content` keys
     def write_file_content(path, data)
-      open(::File.join(path), "wb") do |f|
+      ::File.open(::File.join(path), "wb") do |f|
         data.each do |item|
           f.write("[#{item[:header]}]\n")
           f.write("#{item[:content]}\n")

data/lib/comfortable_mexican_sofa/seeds/file/exporter.rb

@@ -15,7 +15,7 @@ module ComfortableMexicanSofa::Seeds::File
         file_path = File.join(path, file.attachment.filename.to_s)
 
         # writing attributes
-        open(::File.join(path, "_#{file.attachment.filename}.yml"), "w") do |f|
+        ::File.open(::File.join(path, "_#{file.attachment.filename}.yml"), "w") do |f|
           f.write({
             "label"       => file.label,
             "description" => file.description,
@@ -25,7 +25,7 @@ module ComfortableMexicanSofa::Seeds::File
 
         # writing content
         begin
-          open(::File.join(path, ::File.basename(file_path)), "wb") do |f|
+          ::File.open(::File.join(path, ::File.basename(file_path)), "wb") do |f|
             f.write(file.attachment.download)
           end
         rescue Errno::ENOENT, OpenURI::HTTPError

data/lib/comfortable_mexican_sofa/version.rb

@@ -2,6 +2,6 @@
 
 module ComfortableMexicanSofa
 
-  VERSION = "2.0.15"
+  VERSION = "2.0.16"
 
 end

data/lib/generators/comfy/cms/cms_generator.rb

@@ -9,7 +9,7 @@ module Comfy
       include Rails::Generators::Migration
       include Thor::Actions
 
-      source_root File.expand_path("../../../../..", __FILE__)
+      source_root File.expand_path("../../../..", __dir__)
 
       def generate_migration
         destination   = File.expand_path("db/migrate/01_create_cms.rb", destination_root)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comfortable_mexican_sofa
 version: !ruby/object:Gem::Version
-  version: 2.0.15
+  version: 2.0.16
 platform: ruby
 authors:
 - Oleg Khabarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-30 00:00:00.000000000 Z
+date: 2018-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_link_to
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.0.rc1
+        version: 5.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.0.rc1
+        version: 5.2.0
 - !ruby/object:Gem::Dependency
   name: rails-i18n
   requirement: !ruby/object:Gem::Requirement
@@ -370,7 +370,6 @@ files:
 - app/assets/stylesheets/comfy/vendor/bootstrap/mixins/_list-group.scss
 - app/assets/stylesheets/comfy/vendor/bootstrap/mixins/_lists.scss
 - app/assets/stylesheets/comfy/vendor/bootstrap/mixins/_nav-divider.scss
-- app/assets/stylesheets/comfy/vendor/bootstrap/mixins/_navbar-align.scss
 - app/assets/stylesheets/comfy/vendor/bootstrap/mixins/_pagination.scss
 - app/assets/stylesheets/comfy/vendor/bootstrap/mixins/_reset-text.scss
 - app/assets/stylesheets/comfy/vendor/bootstrap/mixins/_resize.scss
@@ -392,6 +391,7 @@ files:
 - app/assets/stylesheets/comfy/vendor/bootstrap/utilities/_float.scss
 - app/assets/stylesheets/comfy/vendor/bootstrap/utilities/_position.scss
 - app/assets/stylesheets/comfy/vendor/bootstrap/utilities/_screenreaders.scss
+- app/assets/stylesheets/comfy/vendor/bootstrap/utilities/_shadows.scss
 - app/assets/stylesheets/comfy/vendor/bootstrap/utilities/_sizing.scss
 - app/assets/stylesheets/comfy/vendor/bootstrap/utilities/_spacing.scss
 - app/assets/stylesheets/comfy/vendor/bootstrap/utilities/_text.scss