StarCitizenTools/mediawiki-skins-Citizen
1
0
Fork 0
mirror of https://github.com/StarCitizenTools/mediawiki-skins-Citizen.git synced 2024-11-24 22:35:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: move ULS button back to personal menu

Browse source
This commit is contained in:
alistair3149 2021-03-11 21:09:24 -05:00
parent 1a72f99dd5
commit 4fb5005bd0
2 changed files with 37 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
includes/Partials/Header.php
View file

@ -53,16 +53,13 @@ final class Header extends Partial {
); );
$user = $this->skin->getUser(); $user = $this->skin->getUser();
// Move the Echo badges and ULS out of default list // Move the Echo badges out of default list
if ( isset( $personalTools['notifications-alert'] ) ) { if ( isset( $personalTools['notifications-alert'] ) ) {
unset( $personalTools['notifications-alert'] ); unset( $personalTools['notifications-alert'] );
} }
if ( isset( $personalTools['notifications-notice'] ) ) { if ( isset( $personalTools['notifications-notice'] ) ) {
unset( $personalTools['notifications-notice'] ); unset( $personalTools['notifications-notice'] );
} }
if ( isset( $personalTools['uls'] ) ) {
unset( $personalTools['uls'] );
}
if ( $user->isLoggedIn() ) { if ( $user->isLoggedIn() ) {
$personalTools = $this->addUserInfoToMenu( $personalTools, $user ); $personalTools = $this->addUserInfoToMenu( $personalTools, $user );
@ -79,7 +76,7 @@ final class Header extends Partial {
} }
/** /**
* Echo notification badges and ULS button * Echo notification badges button
* *
* @return array * @return array
*/ */
@ -88,7 +85,7 @@ final class Header extends Partial {
$this->skin->buildPersonalUrlsPublic() $this->skin->buildPersonalUrlsPublic()
); );
// Create the Echo badges and ULS // Create the Echo badges
$extraTools = []; $extraTools = [];
if ( isset( $personalTools['notifications-alert'] ) ) { if ( isset( $personalTools['notifications-alert'] ) ) {
$extraTools['notifications-alert'] = $personalTools['notifications-alert']; $extraTools['notifications-alert'] = $personalTools['notifications-alert'];
@ -96,9 +93,6 @@ final class Header extends Partial {
if ( isset( $personalTools['notifications-notice'] ) ) { if ( isset( $personalTools['notifications-notice'] ) ) {
$extraTools['notifications-notice'] = $personalTools['notifications-notice']; $extraTools['notifications-notice'] = $personalTools['notifications-notice'];
} }
if ( isset( $personalTools['uls'] ) ) {
$extraTools['uls'] = $personalTools['uls'];
}
$html = $this->skin->getMenuData( 'personal-extra', $extraTools ); $html = $this->skin->getMenuData( 'personal-extra', $extraTools );

45
skinStyles/extensions/UniversalLanguageSelector/ext.uls.pt.less
View file

@ -4,29 +4,46 @@
*/ */
@import '../../../resources/variables.less'; @import '../../../resources/variables.less';
@import '../../../resources/mixins.less';
.skin-citizen {
// Styles for ULS icon // Styles for ULS icon
#pt-uls a.uls-trigger, #pt-uls a.uls-trigger {
#pt-uls a.uls-trigger:before { flex-direction: row-reverse;
display: block; padding-top: 10px !important; // override
width: var( --width-button-base );
height: var( --height-header ); &:before {
padding: 0 !important; .resource-loader-list-icon;
background-position: center; display: block;
background-size: @icon-box-size; padding: 0;
color: transparent; // Hide text margin-left: @icon-padding;
opacity: 0.6; // Replicate color of other icons background-size: contain;
transition: @transition-opacity-quick; opacity: var( --opacity-icon-base );
transition: @transition-opacity-quick;
}
&:hover {
&:before {
opacity: var( --opacity-icon-base--hover );
}
}
&:hover,
&:focus,
&:active { &:active {
opacity: 0.8; &:before {
opacity: var( --opacity-icon-base--active );
}
}
&:after {
content: none !important;
}
} }
} }
.skin-citizen-dark { .skin-citizen-dark {
#pt-uls a.uls-trigger { #pt-uls a.uls-trigger {
&:before {
filter: invert( 1 ); filter: invert( 1 );
} }
} }
}