From: Timo Tijhof Date: Wed, 9 May 2018 19:18:28 +0000 (+0100) Subject: mediawiki.page.gallery.styles: Move files to src/ X-Git-Tag: 1.34.0-rc.0~5469^2 X-Git-Url: http://git.cyclocoop.org/%22%2C%20generer_url_ecrire%28?a=commitdiff_plain;h=bd68ac1601788f8ed41fb34e00c3a5663c2424ca;p=lhc%2Fweb%2Fwiklou.git mediawiki.page.gallery.styles: Move files to src/ The two CSS files belonging to this module are the last ones remaining in src/mediawiki/page. Move them to their own directory in src/ instead. The stylesheets don't reference any images. Bug: T193826 Change-Id: Ic07bbd5b60668a437177b389aa8fee861eb11892 --- diff --git a/resources/Resources.php b/resources/Resources.php index 4ecf89a6c7..1a3d2f049c 100644 --- a/resources/Resources.php +++ b/resources/Resources.php @@ -1687,8 +1687,8 @@ return [ ], 'mediawiki.page.gallery.styles' => [ 'styles' => [ - 'resources/src/mediawiki/page/gallery.css', - 'resources/src/mediawiki/page/gallery.print.css' => [ 'media' => 'print' ], + 'resources/src/mediawiki.page.gallery.styles/gallery.css', + 'resources/src/mediawiki.page.gallery.styles/print.css' => [ 'media' => 'print' ], ], 'targets' => [ 'desktop', 'mobile' ], ], diff --git a/resources/src/mediawiki.page.gallery.styles/gallery.css b/resources/src/mediawiki.page.gallery.styles/gallery.css new file mode 100644 index 0000000000..6a331b6cd7 --- /dev/null +++ b/resources/src/mediawiki.page.gallery.styles/gallery.css @@ -0,0 +1,188 @@ +/* Galleries */ +/* These display attributes look nonsensical, but are needed to support IE and FF2 */ +/* Don't forget to update gallery.print.css */ +li.gallerybox { + vertical-align: top; + display: -moz-inline-box; + display: inline-block; +} + +ul.gallery, +li.gallerybox { + zoom: 1; + *display: inline; +} + +ul.gallery { + margin: 2px; + padding: 2px; + display: block; +} + +li.gallerycaption { + font-weight: bold; + text-align: center; + display: block; + word-wrap: break-word; +} + +li.gallerybox div.thumb { + text-align: center; + margin: 2px; +} + +li.gallerybox div.thumb img { + display: block; + margin: 0 auto; +} + +div.gallerytext { + overflow: hidden; + font-size: 94%; + padding: 2px 4px; + word-wrap: break-word; +} + +.galleryfilename { + display: block; +} + +.galleryfilename-truncate { + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; +} + +/* new gallery stuff */ +ul.mw-gallery-nolines li.gallerybox div.thumb { + background-color: transparent; + border: 0; +} + +ul.mw-gallery-nolines li.gallerybox div.gallerytext { + text-align: center; +} + +/* height constrained gallery */ + +ul.mw-gallery-packed li.gallerybox div.thumb, +ul.mw-gallery-packed-overlay li.gallerybox div.thumb, +ul.mw-gallery-packed-hover li.gallerybox div.thumb { + background-color: transparent; + border: 0; +} + +ul.mw-gallery-packed li.gallerybox div.thumb img, +ul.mw-gallery-packed-overlay li.gallerybox div.thumb img, +ul.mw-gallery-packed-hover li.gallerybox div.thumb img { + margin: 0 auto; +} + +ul.mw-gallery-packed-hover li.gallerybox, +ul.mw-gallery-packed-overlay li.gallerybox { + position: relative; +} + +ul.mw-gallery-packed-hover div.gallerytextwrapper { + overflow: hidden; + height: 0; +} + +ul.mw-gallery-packed-hover li.gallerybox:hover div.gallerytextwrapper, +ul.mw-gallery-packed-overlay li.gallerybox div.gallerytextwrapper, +ul.mw-gallery-packed-hover li.gallerybox.mw-gallery-focused div.gallerytextwrapper { + position: absolute; + background: #fff; + background: rgba( 255, 255, 255, 0.8 ); + padding: 5px 10px; + bottom: 0; + left: 0; /* Needed for IE */ + height: auto; + max-height: 40%; + overflow: hidden; + font-weight: bold; + margin: 2px; /* correspond to style on div.thumb */ +} + +ul.mw-gallery-packed-hover li.gallerybox:hover div.gallerytextwrapper p, +ul.mw-gallery-packed-overlay li.gallerybox div.gallerytextwrapper p, +ul.mw-gallery-packed-hover li.gallerybox.mw-gallery-focused div.gallerytextwrapper p { + text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden; +} + +ul.mw-gallery-packed-hover li.gallerybox div.gallerytextwrapper:hover, +ul.mw-gallery-packed-overlay li.gallerybox div.gallerytextwrapper:hover, +ul.mw-gallery-packed-hover li.gallerybox.mw-gallery-focused div.gallerytextwrapper:hover { + overflow: visible; + max-height: none; +} + +ul.mw-gallery-packed-hover li.gallerybox div.gallerytextwrapper:hover p, +ul.mw-gallery-packed-overlay li.gallerybox div.gallerytextwrapper:hover p, +ul.mw-gallery-packed-hover li.gallerybox.mw-gallery-focused div.gallerytextwrapper:hover p { + text-overflow: clip; + white-space: normal; + overflow: visible; +} + +ul.mw-gallery-packed-hover, +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: 0; + background: transparent; +} + +ul.mw-gallery-slideshow li.gallerycarousel { + display: block; + text-align: center; +} + +.mw-gallery-slideshow-img-container a { + display: block; +} + +@media screen { + /* Background and border colors are defined separately for print mode */ + li.gallerybox div.thumb { + border: 1px solid #c8ccd1; + background-color: #f8f9fa; + } +} diff --git a/resources/src/mediawiki.page.gallery.styles/print.css b/resources/src/mediawiki.page.gallery.styles/print.css new file mode 100644 index 0000000000..047c93364e --- /dev/null +++ b/resources/src/mediawiki.page.gallery.styles/print.css @@ -0,0 +1,59 @@ +li.gallerybox { + vertical-align: top; + display: inline-block; +} + +ul.gallery, +li.gallerybox { + zoom: 1; + *display: inline; +} + +ul.gallery { + margin: 2px; + padding: 2px; + display: block; +} + +li.gallerycaption { + font-weight: bold; + text-align: center; + display: block; + word-wrap: break-word; +} + +li.gallerybox div.thumb { + background-color: #fff; + border: 1px solid #ccc; +} + +div.gallerytext { + overflow: visible; +} + +ul.mw-gallery-packed-hover div.gallerytextwrapper { + overflow: visible; + height: auto; +} + +ul.mw-gallery-packed-hover li.gallerybox:hover div.gallerytextwrapper, +ul.mw-gallery-packed-overlay li.gallerybox div.gallerytextwrapper, +ul.mw-gallery-packed-hover li.gallerybox.mw-gallery-focused div.gallerytextwrapper { + position: static; + background: transparent; + padding: 0; + bottom: 0; + max-height: none; + overflow: visible; + font-weight: normal; + margin: 0; /* correspond to style on div.thumb */ +} + +ul.mw-gallery-packed-hover li.gallerybox:hover div.gallerytextwrapper p, +ul.mw-gallery-packed-overlay li.gallerybox div.gallerytextwrapper p, +ul.mw-gallery-packed-hover li.gallerybox.mw-gallery-focused div.gallerytextwrapper p { + text-overflow: clip; + white-space: normal; + overflow: visible; +} + diff --git a/resources/src/mediawiki/page/gallery.css b/resources/src/mediawiki/page/gallery.css deleted file mode 100644 index 6a331b6cd7..0000000000 --- a/resources/src/mediawiki/page/gallery.css +++ /dev/null @@ -1,188 +0,0 @@ -/* Galleries */ -/* These display attributes look nonsensical, but are needed to support IE and FF2 */ -/* Don't forget to update gallery.print.css */ -li.gallerybox { - vertical-align: top; - display: -moz-inline-box; - display: inline-block; -} - -ul.gallery, -li.gallerybox { - zoom: 1; - *display: inline; -} - -ul.gallery { - margin: 2px; - padding: 2px; - display: block; -} - -li.gallerycaption { - font-weight: bold; - text-align: center; - display: block; - word-wrap: break-word; -} - -li.gallerybox div.thumb { - text-align: center; - margin: 2px; -} - -li.gallerybox div.thumb img { - display: block; - margin: 0 auto; -} - -div.gallerytext { - overflow: hidden; - font-size: 94%; - padding: 2px 4px; - word-wrap: break-word; -} - -.galleryfilename { - display: block; -} - -.galleryfilename-truncate { - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; -} - -/* new gallery stuff */ -ul.mw-gallery-nolines li.gallerybox div.thumb { - background-color: transparent; - border: 0; -} - -ul.mw-gallery-nolines li.gallerybox div.gallerytext { - text-align: center; -} - -/* height constrained gallery */ - -ul.mw-gallery-packed li.gallerybox div.thumb, -ul.mw-gallery-packed-overlay li.gallerybox div.thumb, -ul.mw-gallery-packed-hover li.gallerybox div.thumb { - background-color: transparent; - border: 0; -} - -ul.mw-gallery-packed li.gallerybox div.thumb img, -ul.mw-gallery-packed-overlay li.gallerybox div.thumb img, -ul.mw-gallery-packed-hover li.gallerybox div.thumb img { - margin: 0 auto; -} - -ul.mw-gallery-packed-hover li.gallerybox, -ul.mw-gallery-packed-overlay li.gallerybox { - position: relative; -} - -ul.mw-gallery-packed-hover div.gallerytextwrapper { - overflow: hidden; - height: 0; -} - -ul.mw-gallery-packed-hover li.gallerybox:hover div.gallerytextwrapper, -ul.mw-gallery-packed-overlay li.gallerybox div.gallerytextwrapper, -ul.mw-gallery-packed-hover li.gallerybox.mw-gallery-focused div.gallerytextwrapper { - position: absolute; - background: #fff; - background: rgba( 255, 255, 255, 0.8 ); - padding: 5px 10px; - bottom: 0; - left: 0; /* Needed for IE */ - height: auto; - max-height: 40%; - overflow: hidden; - font-weight: bold; - margin: 2px; /* correspond to style on div.thumb */ -} - -ul.mw-gallery-packed-hover li.gallerybox:hover div.gallerytextwrapper p, -ul.mw-gallery-packed-overlay li.gallerybox div.gallerytextwrapper p, -ul.mw-gallery-packed-hover li.gallerybox.mw-gallery-focused div.gallerytextwrapper p { - text-overflow: ellipsis; - white-space: nowrap; - overflow: hidden; -} - -ul.mw-gallery-packed-hover li.gallerybox div.gallerytextwrapper:hover, -ul.mw-gallery-packed-overlay li.gallerybox div.gallerytextwrapper:hover, -ul.mw-gallery-packed-hover li.gallerybox.mw-gallery-focused div.gallerytextwrapper:hover { - overflow: visible; - max-height: none; -} - -ul.mw-gallery-packed-hover li.gallerybox div.gallerytextwrapper:hover p, -ul.mw-gallery-packed-overlay li.gallerybox div.gallerytextwrapper:hover p, -ul.mw-gallery-packed-hover li.gallerybox.mw-gallery-focused div.gallerytextwrapper:hover p { - text-overflow: clip; - white-space: normal; - overflow: visible; -} - -ul.mw-gallery-packed-hover, -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: 0; - background: transparent; -} - -ul.mw-gallery-slideshow li.gallerycarousel { - display: block; - text-align: center; -} - -.mw-gallery-slideshow-img-container a { - display: block; -} - -@media screen { - /* Background and border colors are defined separately for print mode */ - li.gallerybox div.thumb { - border: 1px solid #c8ccd1; - background-color: #f8f9fa; - } -} diff --git a/resources/src/mediawiki/page/gallery.print.css b/resources/src/mediawiki/page/gallery.print.css deleted file mode 100644 index 047c93364e..0000000000 --- a/resources/src/mediawiki/page/gallery.print.css +++ /dev/null @@ -1,59 +0,0 @@ -li.gallerybox { - vertical-align: top; - display: inline-block; -} - -ul.gallery, -li.gallerybox { - zoom: 1; - *display: inline; -} - -ul.gallery { - margin: 2px; - padding: 2px; - display: block; -} - -li.gallerycaption { - font-weight: bold; - text-align: center; - display: block; - word-wrap: break-word; -} - -li.gallerybox div.thumb { - background-color: #fff; - border: 1px solid #ccc; -} - -div.gallerytext { - overflow: visible; -} - -ul.mw-gallery-packed-hover div.gallerytextwrapper { - overflow: visible; - height: auto; -} - -ul.mw-gallery-packed-hover li.gallerybox:hover div.gallerytextwrapper, -ul.mw-gallery-packed-overlay li.gallerybox div.gallerytextwrapper, -ul.mw-gallery-packed-hover li.gallerybox.mw-gallery-focused div.gallerytextwrapper { - position: static; - background: transparent; - padding: 0; - bottom: 0; - max-height: none; - overflow: visible; - font-weight: normal; - margin: 0; /* correspond to style on div.thumb */ -} - -ul.mw-gallery-packed-hover li.gallerybox:hover div.gallerytextwrapper p, -ul.mw-gallery-packed-overlay li.gallerybox div.gallerytextwrapper p, -ul.mw-gallery-packed-hover li.gallerybox.mw-gallery-focused div.gallerytextwrapper p { - text-overflow: clip; - white-space: normal; - overflow: visible; -} -