Merge "Truncate gallery caption filenames with CSS"

diff --cc includes/DefaultSettings.php
Simple merge

diff --cc resources/src/mediawiki/page/gallery.css
index 26463fd,d765144..dabf475
--- 1/resources/src/mediawiki/page/gallery.css
--- 2/resources/src/mediawiki/page/gallery.css
+++ b/resources/src/mediawiki/page/gallery.css
@@@ -124,49 -109,3 +134,49 @@@ ul.mw-gallery-packed-overlay
  ul.mw-gallery-packed {
        text-align: center;
  }
- }
 +
 +/* Slideshow */
 +ul.gallery.mw-gallery-slideshow {
 +      display: block;
 +      margin: 4em 0;
 +}
 +
 +ul.gallery.mw-gallery-slideshow .gallerycaption {
 +      font-size: 1.3em;
 +      margin: 0;
 +}
 +
 +ul.gallery.mw-gallery-slideshow .gallerycarousel.mw-gallery-slideshow-thumbnails-toggled {
 +      margin-bottom: 1.3em;
 +}
 +
 +ul.gallery.mw-gallery-slideshow .mw-gallery-slideshow-buttons {
 +      opacity: 0.5;
 +      padding: 1.3em 0;
 +}
 +
 +ul.gallery.mw-gallery-slideshow .mw-gallery-slideshow-buttons .oo-ui-buttonElement {
 +      margin: 0 2em;
 +}
 +
 +.mw-gallery-slideshow li.gallerybox.slideshow-current {
 +      background: #efefef;
 +}
 +
 +.mw-gallery-slideshow .gallerybox > div {
 +      max-width: 120px;
 +}
 +
 +ul.mw-gallery-slideshow li.gallerybox div.thumb {
 +      border: none;
 +      background: transparent;
 +}
 +
 +ul.mw-gallery-slideshow li.gallerycarousel {
 +      display: block;
 +      text-align: center;
 +}
 +
 +.mw-gallery-slideshow-img-container a {
 +      display: block;
++}

diff --cc tests/parser/parserTests.txt
Simple merge