diff --git a/resources/common/common.less b/resources/common/common.less index 8cd586e..e3d0d05 100644 --- a/resources/common/common.less +++ b/resources/common/common.less @@ -22,7 +22,6 @@ @import './components/SearchBox.less'; @import './components/SidebarLogo.less'; @import './components/Footer.less'; - @import './components/UserLinks.less'; } @media print { diff --git a/resources/common/components/UserLinks.less b/resources/common/components/UserLinks.less deleted file mode 100644 index 8140688..0000000 --- a/resources/common/components/UserLinks.less +++ /dev/null @@ -1,23 +0,0 @@ -// Common styles for the UserLinks component. - -@import '../variables.less'; -@import 'mediawiki.mixins.less'; - -/* Personal Menu */ -#p-personal .vector-menu-content-list { - display: flex; - flex-wrap: wrap; - flex-grow: 1; - justify-content: flex-end; - align-items: baseline; -} - -/* Icon for registered user names & anonymous message */ -#pt-anonuserpage, -.vector-user-menu-legacy #pt-userpage a { - background-image: url( images/user-avatar.svg ); - background-repeat: no-repeat; - background-size: @background-size-nav-personal-icon @background-size-nav-personal-icon; - padding-top: 0; - padding-left: 1.5em; -} diff --git a/resources/skins.vector.styles.legacy/components/UserLinks.less b/resources/skins.vector.styles.legacy/components/UserLinks.less index 7de2290..e7580ee 100644 --- a/resources/skins.vector.styles.legacy/components/UserLinks.less +++ b/resources/skins.vector.styles.legacy/components/UserLinks.less @@ -10,7 +10,11 @@ #pt-anonuserpage, #pt-userpage a { background-position: @background-position-nav-personal-icon; + background-image: url( images/user-avatar.svg ); + background-repeat: no-repeat; + background-size: @background-size-nav-personal-icon @background-size-nav-personal-icon; padding-top: 0.5em; + padding-left: 1.5em; } #pt-userpage { @@ -25,4 +29,12 @@ #pt-anonuserpage { color: #54595d; } + + .vector-menu-content-list { + display: flex; + flex-wrap: wrap; + flex-grow: 1; + justify-content: flex-end; + align-items: baseline; + } } diff --git a/resources/common/images/user-avatar.svg b/resources/skins.vector.styles.legacy/images/user-avatar.svg similarity index 100% rename from resources/common/images/user-avatar.svg rename to resources/skins.vector.styles.legacy/images/user-avatar.svg diff --git a/resources/skins.vector.styles/layouts/screen.less b/resources/skins.vector.styles/layouts/screen.less index 32a6472..c3bb551 100644 --- a/resources/skins.vector.styles/layouts/screen.less +++ b/resources/skins.vector.styles/layouts/screen.less @@ -46,10 +46,6 @@ @margin-horizontal-search: unit( 40px / @font-size-browser / @font-size-base, em ); // 2.85714286em @ 16 & 0.875em @margin-end-search: 12px; -// Personal menu - -@min-width-personal-tools: unit( 300px / @font-size-browser, em ); // 18.75 @ 16 - // Sidebar @margin-top-sidebar: 0.5em; @@ -232,15 +228,6 @@ body { } } -// When ConsolidateUserLinks is off, "vector-user-menu-legacy" is used in modern Vector -.vector-user-menu-legacy { - flex-grow: 1; - flex-basis: @min-width-personal-tools; - margin-left: @margin-horizontal-search; - // Support IE9: This is reset in @support query below if Flexbox is available. - float: right; -} - #mw-sidebar-button { float: left; // Browser: IE9 support - button as flex-child fallback. margin-left: -@margin-horizontal-sidebar-button-icon;