diff --git a/core/themes/bartik/css/components/captions.css b/core/themes/bartik/css/components/captions.css
index cd24809..fe171cc 100644
--- a/core/themes/bartik/css/components/captions.css
+++ b/core/themes/bartik/css/components/captions.css
@@ -1,23 +1,28 @@
-/* -------------- Captions -------------- */
+/**
+ * @file
+ * Bartik styling for Captions.
+ */
+
 .caption {
   margin-bottom: 1.2em;
 }
 .caption > * {
-  background: #F3F3F3;
-  padding: 0.5ex;
-  border: 1px solid #CCC;
+  background: #f3f3f3;
+  padding: 0.25em;
+  border: 1px solid #ccc;
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  box-sizing: border-box;
 }
 .caption > figcaption {
-  border: 1px solid #CCC;
   border-top: none;
-  padding-top: 0.5ex;
-  font-size: small;
+  font-size: 0.85em;
   text-align: center;
 }
 
 /* Override Bartik's default blockquote and pre styles when captioned. */
-.caption-pre > pre,
-.caption-blockquote > blockquote {
+.caption > pre,
+.caption > blockquote {
   margin: 0;
 }
 .caption-blockquote > figcaption::before {