diff --git a/core/themes/bartik/css/components/captions.css b/core/themes/bartik/css/components/captions.css
index a8b1d8f..ff760c0 100755
--- a/core/themes/bartik/css/components/captions.css
+++ b/core/themes/bartik/css/components/captions.css
@@ -1,33 +1,31 @@
-/**
- * @file
- * Bartik styling for captions.
- */
-
+/* -------------- Captions -------------- */
 .caption {
   margin-bottom: 1.2em;
+  max-width: 100% !important;
+  display: inline-block !important;
 }
 .caption > * {
-  background: #f3f3f3;
-  padding: 0.25em;
-  border: 1px solid #ccc;
-  -webkit-box-sizing: border-box;
-  -moz-box-sizing: border-box;
-  box-sizing: border-box;
+  background: #F3F3F3;
+  padding: 0.5em;
+  border: 1px solid #CCC;
+  display:block !important;
+  max-width:calc(100% - 1em - 2px) !important;
 }
 .caption > figcaption {
-  font-size: 0.85em;
-  text-align: center;
-}
-.caption:not(.caption-pre) > figcaption {
+  border: 1px solid #CCC;
   border-top: none;
+  padding-top: 0.5em;
+  font-size: 0.9em;
+  text-align: center;
 }
+
 /* Override Bartik's default blockquote and pre styles when captioned. */
 .caption > pre,
 .caption > blockquote {
   margin: 0;
 }
 .caption-blockquote > figcaption::before {
-  content: "— ";
+  content: "— ";
 }
 .caption-blockquote > figcaption {
   text-align: left; /* LTR */