bootstrap-email 1.4.1 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7da7e0b649969d555aa28a146b4dacbae0e92cfb5583cf3a21605cf95a0f6864
-  data.tar.gz: 31483dce9db95acafaed1893f5cc16dd483143dc7400929ba3752fc5b39d5c03
+  metadata.gz: ac25ab6a2479ffc33911f99f6c3400e0afb91281fc8013e727ca7335645a7b4b
+  data.tar.gz: f48b25b611e814365ab86d961b9f8182e927bbe8132505e7b83dfcac2e4585cd
 SHA512:
-  metadata.gz: 16f28e567dc36b6c34e304e9726d24606a01780b033a1d78d843b8e0d5112507e0902ecc95f9a379ebc390c6c4007894173bb307e662d56ad0c1f72c2895015d
-  data.tar.gz: e7e93ae7273e656d958bad0869f3fe951384f073156c3832277c65539d0d568ebc53dd3c97bbd6acf5e0367ab00eb71a2bf384a4789bee37e66a9ee2710f69f9
+  metadata.gz: fa8ed9754a63d81aac1d19e1457901748ab7ab178e1d211128406f5dba104dc2029e8d6762f444089c3d8ff4ef3213796be2273c1b541a0bddb83346ad662a24
+  data.tar.gz: d8864700d3af61fce5b1da58dbe2fe5451173e0e5c311f223caf9620fd5eea6bbfe6a4d65d354fd04990196d095b57bf741ec123efa46ee005703768941ed356

data/VERSION

@@ -1 +1 @@
-1.4.1
+1.5.0

data/core/scss/components/_badge.scss

@@ -10,6 +10,17 @@
   border-radius: 4px;
 }
 
+@each $name, $theme in $btn-themes {
+  .badge-#{$name} td {
+    background-color: map-get($theme, "background-color");
+  }
+  .badge-#{$name} td span {
+    background-color: map-get($theme, "background-color");
+    color: map-get($theme, "color");
+    border-color: map-get($theme, "border-color");
+  }
+}
+
 // Pill badges
 .badge-pill > tbody > tr > td {
   padding-right: .6 * $font-size-base;

data/core/scss/helpers/_functions.scss

@@ -1,9 +1,11 @@
+@use "sass:math";
+
 @function color-contrast($color) {
   $r: red($color);
   $g: green($color);
   $b: blue($color);
 
-  $yiq: (($r * 299) + ($g * 587) + ($b * 114)) / 1000;
+  $yiq: math.div((($r * 299) + ($g * 587) + ($b * 114)), 1000);
 
   @if ($yiq >= 150) {
     @return #111111;
@@ -22,7 +24,7 @@
 
 @function strip-unit($number) {
   @if type-of($number) == 'number' and not unitless($number) {
-    @return $number / ($number * 0 + 1);
+    @return math.div($number, ($number * 0 + 1));
   }
 
   @return $number;

data/core/scss/helpers/_selectors_for_utils.scss

@@ -4,7 +4,9 @@
 @mixin background-color-util($class) {
   #{$class} {
     &,
-    & > tbody > tr > td {
+    & > tbody > tr > td,
+    &.btn td a,
+    &.badge td {
       @content
     }
   }
@@ -17,7 +19,8 @@
   #{$class} {
     &,
     & > tbody > tr > td,
-    &.btn td a {
+    &.btn td a,
+    &.badge td {
       @content
     }
   }
@@ -31,7 +34,8 @@
     &,
     & > tbody > tr > td,
     &.btn td,
-    &.btn td a {
+    &.btn td a,
+    &.badge td {
       @content
     }
   }

data/lib/bootstrap-email/compiler.rb

@@ -14,7 +14,6 @@ module BootstrapEmail
         html = File.read(input)
       end
       html = add_layout(html)
-      sass_load_paths
       build_premailer_doc(html)
     end
 
@@ -51,10 +50,6 @@ module BootstrapEmail
       )
     end
 
-    def sass_load_paths
-      SassC.load_paths << config.sass_load_paths
-    end
-
     def build_premailer_doc(html)
       css_string = BootstrapEmail::SassCache.compile('bootstrap-email', config, style: :expanded)
       self.premailer = Premailer.new(

data/lib/bootstrap-email/config.rb

@@ -29,9 +29,9 @@ module BootstrapEmail
     end
 
     def sass_load_paths
-      paths_array = [SassCache::SASS_DIR]
-      custom_load_paths = config_for_option(:sass_load_paths) || []
-      paths_array.concat(custom_load_paths)
+      library_paths = [SassCache::SASS_DIR]
+      user_paths = config_for_option(:sass_load_paths) || []
+      library_paths + user_paths
     end
 
     def sass_cache_location

data/lib/bootstrap-email/converters/support_url_tokens.rb

@@ -24,11 +24,11 @@ module BootstrapEmail
       end
 
       def self.opening_regex
-        opening_regex = OPEN_BRACKETS.map { |bracket| Regexp.quote(bracket) }.join('|')
+        OPEN_BRACKETS.map { |bracket| Regexp.quote(bracket) }.join('|')
       end
 
       def self.closing_regex
-        closing_regex = CLOSE_BRACKETS.map { |bracket| Regexp.quote(bracket) }.join('|')
+        CLOSE_BRACKETS.map { |bracket| Regexp.quote(bracket) }.join('|')
       end
     end
   end

data/lib/bootstrap-email/sass_cache.rb

@@ -63,11 +63,18 @@ module BootstrapEmail
     end
 
     def compile_and_cache_scss(cache_path)
-      file = sass_config || File.read("#{file_path}.scss")
-      css = SassC::Engine.new(file, style: style).render
+      css = compile_css
       File.write(cache_path, css)
       puts "New css file cached for #{type}" if config.sass_log_enabled?
       css
     end
+
+    def compile_css
+      if sass_config
+        Sass.compile_string(sass_config, load_paths: config.sass_load_paths, style: style).css
+      else
+        Sass.compile("#{file_path}.scss", load_paths: config.sass_load_paths, style: style).css
+      end
+    end
   end
 end

data/lib/bootstrap-email.rb

@@ -4,7 +4,7 @@ require 'nokogiri'
 require 'erb'
 require 'ostruct'
 require 'premailer'
-require 'sassc'
+require 'sass-embedded'
 require 'digest/sha1'
 require 'css_parser'
 require 'fileutils'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap-email
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.5.0
 platform: ruby
 authors:
 - Stuart Yamartino
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-08 00:00:00.000000000 Z
+date: 2024-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlbeautifier
@@ -53,19 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
-  name: sassc
+  name: sass-embedded
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '1.63'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '1.63'
 description:
 email: stu@stuyam.com
 executables:
@@ -181,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: 'Bootstrap 5+ stylesheet, compiler, and inliner for responsive and consistent