Merge "Minerva should use content-tables ResourceLoaderSkinModule feature"

This commit is contained in:
jenkins-bot 2024-03-26 18:29:57 +00:00 committed by Gerrit Code Review
commit 8df385d08f
3 changed files with 5 additions and 23 deletions

View file

@ -1,7 +1,7 @@
[
{
"resourceModule": "skins.minerva.base.styles",
"maxSize": "9.2KB"
"maxSize": "9.5KB"
},
{
"resourceModule": "skins.minerva.content.styles.images",

View file

@ -3,6 +3,7 @@
@import '../../../minerva.less/minerva.variables.less';
@import '../../../minerva.less/minerva.mixins.less';
// FIXME: Upstream to ResourceLoader/SkinModule content-tables styles [T359888]
// These are only intended for smaller screens.
// This avoids having to undo them from another media query,
// by putting the original in a media query instead.
@ -45,35 +46,15 @@
}
}
// For skinning normal data tables
// Compare with mediawiki.legacy/shared.css
// Move out of .content selector to avoid increased
// specificty conflicts e.g. with tablesorter (T205945)
// FIXME: Replace this with content-tables.
// Overrides for ResourceLoaderSkinModule "content".
.wikitable {
background-color: var( --background-color-base ); // T358449
color: var( --color-base ); // T357998
border: @border-width-base @border-style-base #54595d;
// Note older browsers will fall back to var(--border-color-subtle)
border-color: fade( #54595d, 30 );
border-collapse: collapse;
// We only style cells that are direct children of the wikitable table since
// table tags may be used for non-table purposes within the cells.
> tr > th,
> tr > td,
> * > tr > th,
> * > tr > td {
border: @border-width-base @border-style-base #54595d;
// Note older browsers will fall back to var(--border-color-subtle)
border-color: fade( #54595d, 30 );
// content-tables uses 0.2em 0.4em. Can these be consolidated?
padding: 0.2em;
}
// Make headings distinguishable
> tr > th,
> * > tr > th {
background-color: var( --background-color-interactive );
text-align: center;
}
}

View file

@ -310,6 +310,7 @@
"accessibility",
"i18n-ordered-lists",
"content-body",
"content-tables",
"content-links",
"interface-core"
],