bryce/mediawiki-extensions-UniversalLanguageSelector
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Language button icon/button should be consistent with other buttons"

Browse Source 
This reverts commit 5ca2ccb58a.

Reason for revert: Per Niklas's review (T289630#7324439)
I've also seen a much better way to do this which limits the change
to modern skins so I'll post a follow up shortly.

Change-Id: I99802c60390e23eaa0de21462788da622a35a37a
This commit is contained in:
Jdlrobson
2021-09-01 15:35:05 +00:00
parent 5ca2ccb58a
commit 4c3907e61d
2 changed files with 13 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
includes/UniversalLanguageSelectorHooks.php
View File

@@ -132,10 +132,7 @@ class UniversalLanguageSelectorHooks {
$out->addJsConfigVars( $config ); $out->addJsConfigVars( $config );
if ( $wgULSPosition === 'personal' ) { if ( $wgULSPosition === 'personal' ) {
$out->addModuleStyles( [ $out->addModuleStyles( 'ext.uls.pt' );
'mediawiki.ui.button',
'ext.uls.pt'
] );
} else { } else {
$out->addModuleStyles( 'ext.uls.interlanguage' ); $out->addModuleStyles( 'ext.uls.interlanguage' );
} }
@@ -229,8 +226,7 @@ class UniversalLanguageSelectorHooks {
'uls' => [ 'uls' => [
'text' => Language::fetchLanguageName( $langCode ), 'text' => Language::fetchLanguageName( $langCode ),
'href' => '#', 'href' => '#',
'link-class' => 'mw-ui-icon mw-ui-icon-before', 'class' => 'uls-trigger',
'class' => 'uls-trigger mw-ui-button mw-ui-quiet',
'active' => true 'active' => true
] ]
] + $personal_urls; ] + $personal_urls;

34
resources/css/ext.uls.pt.less
View File

@@ -19,29 +19,23 @@
* A hack to load the icon before the rest of the module is lazy-loaded. * A hack to load the icon before the rest of the module is lazy-loaded.
* Copied from jquery.uls.css with the path changed. * Copied from jquery.uls.css with the path changed.
*/ */
.uls-trigger a:before { .uls-trigger {
background: no-repeat url( ../../lib/jquery.uls/images/language.svg ) left center; background: no-repeat url( ../../lib/jquery.uls/images/language.svg ) left center;
// Let the SVG image fit without cropping or stretch
background-size: contain;
padding-left: 24px;
} }
.vector-user-links {
.uls-trigger {
// Disable additional icon on load.
background-image: none;
// Can be removed when no longer need to override rule in jquery.uls.css
padding-left: 12px;
}
}
// Vector modern = ca-uls
// Other skins = pt-uls
#pt-uls { #pt-uls {
.mw-ui-button { padding-top: 0 !important; // stylelint-disable-line declaration-no-important
display: inline;
padding: 0;
border: 0;
}
.uls-trigger { .uls-trigger {
background-image: none;
// Same values as Vector's `#p-personal li`.
display: inline-block;
padding-top: 0.5em !important; // stylelint-disable-line declaration-no-important
padding-left: 0;
// Putting the icon in before in order to apply `opacity`. // Putting the icon in before in order to apply `opacity`.
&:before { &:before {
content: ''; content: '';
@@ -59,12 +53,6 @@
} }
} }
.skin-vector {
#ca-uls span {
font-size: 0.875em;
}
}
/* Opera for some inexplicable reason confuses right and left padding with */ /* Opera for some inexplicable reason confuses right and left padding with */
/* RTL text direction here (bug T47142). x:-o-prefocus won't match anything, */ /* RTL text direction here (bug T47142). x:-o-prefocus won't match anything, */
/* but will make other browsers ignore this rule. */ /* but will make other browsers ignore this rule. */