bootstrap-email 1.6.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 470d415dd6870a956a17076a8bd4869e10e6c5714c1ced9d4d94c244aa4c807b
-  data.tar.gz: f47493294d7933d1cf6f4ad88bd5b609ab0018351dc5917ac2422a6abf6c71ac
+  metadata.gz: 5dac3404a2b0e1ea4f18290c2275e22dff41c9f04299b02098c9ad7d6558ea93
+  data.tar.gz: 49d3d4a4061fd8c9420cd662340c33b7fc3384b03d497c071c63f99ce56d5dbe
 SHA512:
-  metadata.gz: 6f391d28adc30f2e02abc5bf1a0c8c81281f11bf9901305fef1e1d278ccc9ebb57875a0fba4fe26e2d1f47270065be6deca7671180b71c82ea4d58e033dfa49f
-  data.tar.gz: 1b948ffc86509b61be6b81d2d7903df9af7cf6c18df1a23f0a3d2444181f1cc22d86c6c4bec17f47c1c7610c8cebcc8668b96cd50ff388ab5aa0bed51fb2ed07
+  metadata.gz: 7e4a56cda71b8d97d780c0bdbc5df8338822e0f34772c962a0c067bd379e884d73367d5f153c606ca084b9edcec4a6d52057fe2091c113ae340ddc0c5f638e47
+  data.tar.gz: d3117be6c0a13e0abfa183c52095fe7f383109a7720e461d2af504c8d9471259903916c4f403d8fbd7ff4ecab4914e2fb558cccb733ff675d7560b2c86b67e5d

data/VERSION

@@ -1 +1 @@
-1.6.0
+1.8.0

data/core/scss/components/_alert.scss

@@ -1,5 +1,6 @@
 @use "sass:color";
 @use "../variable";
+@use "../helper";
 
 .alert {
   border-collapse: separate !important;
@@ -7,18 +8,19 @@
   width: 100%;
   & > tbody > tr > td {
     padding: 0.75 * variable.$font-size-base 1.25 * variable.$font-size-base;
-    border: 1px solid transparent;
+    border-width: 1px;
+    border-style: solid;
     border-radius: 0.25 * variable.$font-size-base;
   }
 }
 
 @each $color, $value in variable.$theme-colors {
   .alert-#{$color} td {
-    background-color: color.adjust($value, $lightness: 40%);
-    border-color: color.adjust($value, $lightness: 35%);
-    color: color.adjust($value, $lightness: -30%);
+    background-color: helper.hex(helper.tint-color($value, 85%));
+    border-color: helper.hex(helper.tint-color($value, 75%));
+    color: helper.hex(helper.shade-color($value, 65%));
     .hr > table > tbody > tr > td {
-      border-top: 1px solid color.adjust($value, $lightness: 35%);
+      border-top: 1px solid helper.hex(helper.tint-color($value, 35%));
     }
   }
 }

data/core/scss/components/_badge.scss

@@ -1,5 +1,6 @@
 @use "sass:map";
 @use "../variable";
+@use "../helper";
 
 .badge > tbody > tr > td {
   display: inline-block;
@@ -15,12 +16,12 @@
 
 @each $name, $theme in variable.$btn-themes {
   .badge-#{$name} td {
-    background-color: map.get($theme, "background-color");
+    background-color: helper.hex(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");
+    background-color: helper.hex(map.get($theme, "background-color"));
+    color: helper.hex(map.get($theme, "color"));
+    border-color: helper.hex(map.get($theme, "border-color"));
   }
 }
 

data/core/scss/components/_button.scss

@@ -1,5 +1,6 @@
 @use "sass:map";
 @use "../variable";
+@use "../helper";
 
 .btn {
   border-radius: variable.$btn-border-radius;
@@ -26,12 +27,12 @@
 
 @each $name, $theme in variable.$btn-themes {
   .btn-#{$name} td {
-    background-color: map.get($theme, "background-color");
+    background-color: helper.hex(map.get($theme, "background-color"));
   }
   .btn-#{$name} td a {
-    background-color: map.get($theme, "background-color");
-    color: map.get($theme, "color");
-    border-color: map.get($theme, "border-color");
+    background-color: helper.hex(map.get($theme, "background-color"));
+    color: helper.hex(map.get($theme, "color"));
+    border-color: helper.hex(map.get($theme, "border-color"));
   }
 }
 

data/core/scss/components/_card.scss

@@ -1,14 +1,15 @@
 @use "../variable";
+@use "../helper";
 
 .card {
-  background-color: variable.$white;
+  background-color: helper.hex(variable.$white);
   border-radius: variable.$border-radius;
-  border: 1px solid variable.$border-color;
+  border: 1px solid helper.hex(variable.$border-color);
   border-collapse: separate !important;
   width: 100%;
   overflow: hidden;
   & > tbody > tr > td {
-    background-color: variable.$white;
+    background-color: helper.hex(variable.$white);
     width: 100%;
   }
   .card-body {

data/core/scss/components/_hr.scss

@@ -1,9 +1,10 @@
 @use "../variable";
+@use "../helper";
 
 table.hr {
   width: 100%;
   & > tbody > tr > td {
-    border-top: 1px solid variable.$border-color;
+    border-top: 1px solid helper.hex(variable.$border-color);
     height: 1px;
     width: 100%;
   }

data/core/scss/components/_table.scss

@@ -1,5 +1,6 @@
 @use "sass:color";
 @use "../variable";
+@use "../helper";
 
 //
 // Basic Bootstrap table
@@ -8,7 +9,7 @@
 .table {
   width: 100%;
   max-width: 100%;
-  background-color: variable.$table-background-color; // Reset for nesting within parents with `background-color`.
+  background-color: helper.hex(variable.$table-background-color); // Reset for nesting within parents with `background-color`.
 
   & > thead > tr > th {
     text-align: left;
@@ -55,12 +56,12 @@
 // Add borders all around the table and between all the columns.
 
 .table-bordered {
-  border: variable.$table-border-width solid variable.$table-border-color;
+  border: variable.$table-border-width solid helper.hex(variable.$table-border-color);
 
   & > thead > tr > th,
   & > tbody > tr > td,
   & > tfoot > tr > td {
-    border: variable.$table-border-width solid variable.$table-border-color;
+    border: variable.$table-border-width solid helper.hex(variable.$table-border-color);
   }
 
   & > thead {
@@ -78,7 +79,7 @@
 
 .table-striped {
   & > tbody > tr:nth-of-type(odd) {
-    background-color: variable.$table-accent-bg;
+    background-color: helper.hex(variable.$table-accent-bg);
   }
 }
 
@@ -93,7 +94,7 @@
     &,
     > th,
     > td {
-      background-color: color.adjust($value, $lightness: 40%);
+      background-color: helper.hex(helper.tint-color($value, 85%));
     }
   }
 }
@@ -106,21 +107,21 @@
 
 .thead-dark {
   th {
-    color: variable.$white;
-    background-color: variable.$gray-900;
+    color: helper.hex(variable.$white);
+    background-color: helper.hex(variable.$gray-900);
   }
 }
 
 .thead-light {
   th {
-    color: variable.$gray-700;
-    background-color: variable.$gray-200;
+    color: helper.hex(variable.$gray-700);
+    background-color: helper.hex(variable.$gray-200);
   }
 }
 
 .table-dark {
-  color: variable.$white;
-  background-color: variable.$gray-900;
+  color: helper.hex(variable.$white);
+  background-color: helper.hex(variable.$gray-900);
 
   & > thead > tr > th,
   & > tbody > tr > td,

data/core/scss/helpers/_functions.scss

@@ -1,7 +1,9 @@
 @use "sass:color";
 @use "sass:math";
 @use "sass:meta";
+@use "sass:string";
 
+// Calculate the color contrast for a given color and returns white or black based on the YIQ formula
 @function color-contrast($color) {
   $r: color.channel($color, "red", $space: rgb);
   $g: color.channel($color, "green", $space: rgb);
@@ -16,22 +18,25 @@
   }
 }
 
+// Lighten a color by adding white to it
 @function tint-color($color, $level) {
-  @return remix-color(color.mix(white, $color, $level, $method: rgb));
+  @return color.mix(white, $color, $level);
 }
 
+// Darken a color by adding black to it
 @function shade-color($color, $level) {
-  @return remix-color(color.mix(black, $color, $level, $method: rgb));
+  @return color.mix(black, $color, $level);
 }
 
-@function remix-color($color) {
-  @return rgb(round-color($color, 'red'), round-color($color, 'green'), round-color($color, 'blue'));
-}
-
-@function round-color($color, $channel) {
-  @return math.round(color.channel($color, $channel));
+// Convert a color to a hex string, needed so sass doesn't return an rgb string
+@function hex($color) {
+  @if not meta.type-of($color) == 'color' or $color == null or $color == transparent {
+    @return $color;
+  }
+  @return string.unquote('#' + string.slice(color.ie-hex-str($color), 4));
 }
 
+// Strip the unit from a number
 @function strip-unit($number) {
   @if meta.type-of($number) == 'number' and not math.is-unitless($number) {
     @return math.div($number, ($number * 0 + 1));

data/core/scss/utilities/_background.scss

@@ -3,6 +3,6 @@
 
 @each $name, $color in variable.$all-colors {
   @include helper.background-color-util('.bg-#{$name}') {
-    background-color: $color;
+    background-color: helper.hex($color);
   }
 }

data/core/scss/utilities/_border.scss

@@ -2,15 +2,15 @@
 @use "../variable";
 
 @each $name, $width in variable.$border-widths {
-  .border#{$name}         { border: $width solid variable.$border-color !important; }
-  .border-top#{$name}     { border-top: $width solid variable.$border-color !important; }
-  .border-right#{$name}   { border-right: $width solid variable.$border-color !important; }
-  .border-bottom#{$name}  { border-bottom: $width solid variable.$border-color !important; }
-  .border-left#{$name}    { border-left: $width solid variable.$border-color !important; }
+  .border#{$name}         { border: $width solid helper.hex(variable.$border-color) !important; }
+  .border-top#{$name}     { border-top: $width solid helper.hex(variable.$border-color) !important; }
+  .border-right#{$name}   { border-right: $width solid helper.hex(variable.$border-color) !important; }
+  .border-bottom#{$name}  { border-bottom: $width solid helper.hex(variable.$border-color) !important; }
+  .border-left#{$name}    { border-left: $width solid helper.hex(variable.$border-color) !important; }
 }
 
 @each $name, $color in variable.$all-colors {
   @include helper.border-color-util('.border-#{$name}') {
-    border-color: $color !important;
+    border-color: helper.hex($color) !important;
   }
 }

data/core/scss/utilities/_color.scss

@@ -3,10 +3,10 @@
 
 @each $name, $color in variable.$all-colors {
   @include helper.color-util('.text-#{$name}') {
-    color: $color;
+    color: helper.hex($color);
   }
 }
 
 @include helper.color-util('.text-muted') {
-  color: variable.$gray-600;
+  color: helper.hex(variable.$gray-600);
 }

data/core/scss/utilities/_typography.scss

@@ -8,7 +8,7 @@ h1, h2, h3, h4, h5, h6,
   padding-bottom: variable.$headings-margin-bottom;
   font-family: variable.$headings-font-family;
   font-weight: variable.$headings-font-weight;
-  color: variable.$headings-color;
+  color: helper.hex(variable.$headings-color);
   text-align: left;
   vertical-align: baseline;
 }

data/lib/bootstrap-email/config_store.rb

@@ -10,7 +10,8 @@ module BootstrapEmail
       :sass_load_paths,         # array of directories for loading sass imports
       :sass_cache_location,     # path to tmp folder for sass cache
       :sass_log_enabled,        # turn on or off sass log when caching new sass
-      :generate_rails_text_part # boolean for whether or not to generate the text part in rails, default: true
+      :generate_rails_text_part, # boolean for whether or not to generate the text part in rails, default: true
+      :override_mail_method # method to override the mail method in rails, default: false
     ].freeze
 
     attr_accessor(*OPTIONS)
@@ -28,6 +29,7 @@ module BootstrapEmail
 
     def defaults
       self.generate_rails_text_part = true
+      self.override_mail_method = false
     end
   end
 end

data/lib/bootstrap-email/rails/action_mailer.rb

@@ -2,8 +2,16 @@
 
 ActiveSupport.on_load(:action_mailer, { yield: true }) do |action_mailer|
   action_mailer.class_eval do # To support Rails less than 6
+    # Only override mail method if override_mail_method is enabled
+    if BootstrapEmail.static_config.override_mail_method
+      alias_method :rails_mail, :mail unless method_defined?(:rails_mail)
+      def mail(*args, &block)
+        bootstrap_mail(*args, &block)
+      end
+    end
+
     def bootstrap_mail(*args, &block)
-      message = mail(*args, &block)
+      message = method_defined?(:rails_mail) ? rails_mail(*args, &block) : mail(*args, &block)
       BootstrapEmail::Rails::MailBuilder.perform(message)
     end
     alias_method :bootstrap_email, :bootstrap_mail

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap-email
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.8.0
 platform: ruby
 authors:
 - Stuart Yamartino
@@ -57,14 +57,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.53'
+        version: '1.55'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.53'
+        version: '1.55'
+- !ruby/object:Gem::Dependency
+  name: ostruct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
 email: stu@stuyam.com
 executables:
 - bootstrap-email