Merge pull request #190 from ASCWebServices/canini

fixing image with caption width bug

web/themes/asc_bootstrap/assets/sass/components/_wysiwyg.scss

@@ -87,3 +87,72 @@
     width: 100%;
   }
 }
+
+
+
+//
+// Figure
+// --------------------------------------------------
+
+.wrapper-15 {
+  width: 15%;
+  padding: 0 25px;
+
+  img {
+    margin: 0 auto;
+  }
+}
+
+.wrapper-25 {
+  width: 25%;
+  padding: 0 25px;
+
+  img {
+    margin: 0 auto;
+  }
+}
+
+.wrapper-33 {
+  width: 33%;
+  padding: 0 25px;
+
+  img {
+    margin: 0 auto;
+  }
+}
+
+.wrapper-50 {
+  width: 50%;
+  padding: 0 25px;
+
+  img {
+    margin: 0 auto;
+  }
+}
+
+.wrapper-66 {
+  width: 66%;
+  padding: 0 25px;
+
+  img {
+    margin: 0 auto;
+  }
+}
+
+.wrapper-75 {
+  width: 75%;
+  padding: 0 25px;
+
+  img {
+    margin: 0 auto;
+  }
+}
+
+.wrapper-100 {
+  width: 100%;
+  padding: 0 25px;
+
+  img {
+    margin: 0 auto;
+  }
+}

web/themes/asc_bootstrap/css/style.css

@@ -12696,6 +12696,76 @@ form .js-form-item-date .webform-element-description {
   }
 }
 
+/* line 97, ../assets/sass/components/_wysiwyg.scss */
+.wrapper-15 {
+  width: 15%;
+  padding: 0 25px;
+}
+/* line 101, ../assets/sass/components/_wysiwyg.scss */
+.wrapper-15 img {
+  margin: 0 auto;
+}
+
+/* line 106, ../assets/sass/components/_wysiwyg.scss */
+.wrapper-25 {
+  width: 25%;
+  padding: 0 25px;
+}
+/* line 110, ../assets/sass/components/_wysiwyg.scss */
+.wrapper-25 img {
+  margin: 0 auto;
+}
+
+/* line 115, ../assets/sass/components/_wysiwyg.scss */
+.wrapper-33 {
+  width: 33%;
+  padding: 0 25px;
+}
+/* line 119, ../assets/sass/components/_wysiwyg.scss */
+.wrapper-33 img {
+  margin: 0 auto;
+}
+
+/* line 124, ../assets/sass/components/_wysiwyg.scss */
+.wrapper-50 {
+  width: 50%;
+  padding: 0 25px;
+}
+/* line 128, ../assets/sass/components/_wysiwyg.scss */
+.wrapper-50 img {
+  margin: 0 auto;
+}
+
+/* line 133, ../assets/sass/components/_wysiwyg.scss */
+.wrapper-66 {
+  width: 66%;
+  padding: 0 25px;
+}
+/* line 137, ../assets/sass/components/_wysiwyg.scss */
+.wrapper-66 img {
+  margin: 0 auto;
+}
+
+/* line 142, ../assets/sass/components/_wysiwyg.scss */
+.wrapper-75 {
+  width: 75%;
+  padding: 0 25px;
+}
+/* line 146, ../assets/sass/components/_wysiwyg.scss */
+.wrapper-75 img {
+  margin: 0 auto;
+}
+
+/* line 151, ../assets/sass/components/_wysiwyg.scss */
+.wrapper-100 {
+  width: 100%;
+  padding: 0 25px;
+}
+/* line 155, ../assets/sass/components/_wysiwyg.scss */
+.wrapper-100 img {
+  margin: 0 auto;
+}
+
 /* line 9, ../assets/sass/pages/_basic-page.scss */
 article.page {
   margin-bottom: 44px;

web/themes/asc_bootstrap/js/scripts.js

@@ -169,6 +169,16 @@ jQuery(document).ready(function(){
     jQuery(".btn-wysiwyg").append("<i class='fa fa-angle-right' aria-hidden='true' />");
   }
 
+
+  //adds new class to images that have captions so that they are sized appropriately
+  if (jQuery("figure").length) {
+    jQuery("figure").each(function(){
+      var quickEditName = jQuery(this).find('img').attr('src');
+      var arr= quickEditName.split('/');
+      jQuery(this).addClass( "wrapper-" + arr[5] );
+    });
+  }
+
 });
 
 // window.addEventListener("load", function(event) {