X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=resources%2Fsrc%2Fmediawiki.skinning%2Fcontent.parsoid.less;h=7a7df7a30f5db96a599f4a1860c7512fbebf365b;hb=d86cdfcf3a371770db7513a9b5d122faccfefb47;hp=4ac86c92b6227e6d461c1e030961864ab6a9c5d4;hpb=386c6ae9c5a5e9fe133a333b653b4d080dff1718;p=lhc%2Fweb%2Fwiklou.git

diff --git a/resources/src/mediawiki.skinning/content.parsoid.less b/resources/src/mediawiki.skinning/content.parsoid.less
index 4ac86c92b6..7a7df7a30f 100644
--- a/resources/src/mediawiki.skinning/content.parsoid.less
+++ b/resources/src/mediawiki.skinning/content.parsoid.less
@@ -46,7 +46,9 @@ sub {
 /**
  * Block media items
  */
-figure[typeof*='mw:Image'] {
+figure[typeof*='mw:Image'],
+figure[typeof*='mw:Video'],
+figure[typeof*='mw:Audio'] {
 	margin: 0;
 
 	a {
@@ -88,18 +90,18 @@ figure[typeof*='mw:Image'] {
 		display: table-caption;
 		caption-side: bottom;
 		/* In mw-core the font-size is duplicated, 94% in thumbiner
-		 * and again 94% in thumbcaption. 88% for font size of the
+		 * and again 94% in thumbcaption. 88.4% for font size of the
 		 * caption results in the same behavior. */
 		font-size: 88.4%;
 		line-height: 1.4em;
 		text-align: left;
 
-		border: 1px solid #ccc;
+		border: 1px solid #c8ccd1;
 		border-top: 0;
 
 		/* taken from .thumbcaption, plus .thumbinner */
 		padding: 0 6px 6px 6px;
-		background-color: #f9f9f9;
+		background-color: #f8f9fa;
 
 		table {
 			/* reset caption side for tables inside figcaptions */
@@ -109,31 +111,50 @@ figure[typeof*='mw:Image'] {
 }
 
 figure[typeof~='mw:Image/Thumb'],
-figure[typeof~='mw:Image/Frame'] {
+figure[typeof~='mw:Video/Thumb'],
+figure[typeof~='mw:Audio/Thumb'],
+figure[typeof~='mw:Image/Frame'],
+figure[typeof~='mw:Video/Frame'],
+figure[typeof~='mw:Audio/Frame'] {
 	display: table;
 	overflow: auto;
 	text-align: center;
-	border: 1px solid #ccc;
+	border: 1px solid #c8ccd1;
 	border-bottom: 0; // No border to caption
 	border-collapse: collapse;
-	background-color: #f9f9f9;
+	background-color: #f8f9fa;
 	// Default to right alignment. This is needed since Parsoid only specifies the
 	// alignment class when the alignment is explicitly set.
 	margin: 0.5em 0 1.3em 1.4em;
 	clear: right;
 	float: right;
+
+	> *:first-child {
+		> img,
+		> video {
+			border: 1px solid #c8ccd1;
+			margin: 3px;
+			background: #fff;
+		}
+	}
 }
 
-figure[typeof~='mw:Image/Thumb'] > *:first-child > img,
-figure[typeof~='mw:Image/Frame'] > *:first-child > img,
-.mw-image-border > *:first-child > img {
-	border: 1px solid #ccc;
-	margin: 3px;
-	background: #fff;
+/* Same as img.thumbborder in content.css */
+.mw-image-border > *:first-child {
+	> img,
+	> video {
+		border: 1px solid #eaecf0;
+	}
 }
 
 /* Hide the caption for frameless and plain floated images */
-figure[typeof~='mw:Image/Frameless'] > figcaption,
-figure[typeof~='mw:Image'] > figcaption {
-	display: none;
+figure[typeof~='mw:Image/Frameless'],
+figure[typeof~='mw:Video/Frameless'],
+figure[typeof~='mw:Audio/Frameless'],
+figure[typeof~='mw:Image'],
+figure[typeof~='mw:Video'],
+figure[typeof~='mw:Audio'] {
+	> figcaption {
+		display: none;
+	}
 }