diff --git a/.storybook/webpack.config.js b/.storybook/webpack.config.js index 57272395c..824725e9d 100644 --- a/.storybook/webpack.config.js +++ b/.storybook/webpack.config.js @@ -11,13 +11,13 @@ module.exports = { '../resources/skins.vector.styles/Menu.less': '../resources/common/components/Menu.less', '../.storybook/common.less': '../resources/common/common.less', '../resources/skins.vector.styles/MenuDropdown.less': '../resources/common/components/MenuDropdown.less', - '../resources/skins.vector.styles/MenuPortal.less': '../resources/common/components/MenuPortal.less', + '../resources/skins.vector.styles/MenuPortal.less': '../resources/skins.vector.styles/components/MenuPortal.less', '../resources/skins.vector.styles/MenuTabs.less': '../resources/common/components/MenuTabs.less', '../resources/skins.vector.styles/TabWatchstarLink.less': '../resources/common/components/TabWatchstarLink.less', '../resources/skins.vector.styles/SearchBox.less': '../resources/common/components/SearchBox.less', '../resources/skins.vector.styles/Sidebar.less': '../resources/skins.vector.styles/components/Sidebar.less', '../resources/skins.vector.styles/SidebarLogo.less': '../resources/common/components/SidebarLogo.less', - '../resources/skins.vector.styles/MenuPortal.less': '../resources/common/components/MenuPortal.less' + '../resources/skins.vector.styles/MenuPortal.less': '../resources/skins.vector.styles/components/MenuPortal.less' } }, module: { diff --git a/resources/common/common.less b/resources/common/common.less index a75cb43db..6968a51aa 100644 --- a/resources/common/common.less +++ b/resources/common/common.less @@ -16,7 +16,6 @@ @import './components/SiteNotice.less'; @import './components/Menu.less'; @import './components/MenuDropdownCheckbox.less'; - @import './components/MenuPortal.less'; @import './components/SearchBox.less'; @import './components/SidebarLogo.less'; @import './components/Footer.less'; diff --git a/resources/common/components/MenuPortal.less b/resources/common/components/MenuPortal.less deleted file mode 100644 index 9c1f8734b..000000000 --- a/resources/common/components/MenuPortal.less +++ /dev/null @@ -1,46 +0,0 @@ -@import '../variables.less'; -@import 'mediawiki.mixins.less'; - -.vector-menu-portal { - margin: 0 @margin-end-portal 0 @margin-start-portal; - padding: 0.25em 0; - direction: ltr; - - .vector-menu-heading { - display: block; - color: @color-base--subtle; - margin: 0.5em 0 0 ( @margin-start-nav-main-body / @font-size-nav-main-heading ); - border: 0; - padding: 0.25em 0; - font-size: @font-size-nav-main-heading; - font-weight: normal; - cursor: default; - } - - .vector-menu-content { - margin-left: @margin-start-portal-body; - padding-top: 0; - - ul { - list-style: none; - margin: 0; - padding-top: 0.3em; - } - - li { - margin: 0; - padding: 0.25em 0; - font-size: @font-size-portal-list-item; - line-height: @line-height-nav; - word-wrap: break-word; - - a { - color: @color-link; - - &:visited { - color: @color-link--visited; - } - } - } - } -} diff --git a/resources/skins.vector.styles.legacy/components/MenuPortal.less b/resources/skins.vector.styles.legacy/components/MenuPortal.less index 9fb06b948..cdce25bef 100644 --- a/resources/skins.vector.styles.legacy/components/MenuPortal.less +++ b/resources/skins.vector.styles.legacy/components/MenuPortal.less @@ -1,8 +1,50 @@ +@import '../../common/variables.less'; +@import 'mediawiki.mixins.less'; + .vector-menu-portal { + margin: 0 @margin-end-portal 0 @margin-start-portal; + padding: 0.25em 0; + direction: ltr; + .vector-menu-heading { + display: block; + color: @color-base--subtle; + margin: 0.5em 0 0 ( @margin-start-nav-main-body / @font-size-nav-main-heading ); + border: 0; + padding: 0.25em 0; + font-size: @font-size-nav-main-heading; + font-weight: normal; + cursor: default; background-image: linear-gradient( to right, @border-color-portal-heading-transparent 0, @border-color-portal-heading 33%, @border-color-portal-heading 66%, @border-color-portal-heading-transparent 100% ); // Standard (Firefox 16+, IE 10+, Safari 6.1+, Chrome 26+) background-position: center bottom; background-repeat: no-repeat; background-size: 100% @border-width-base; } + + .vector-menu-content { + margin-left: @margin-start-portal-body; + padding-top: 0; + + ul { + list-style: none; + margin: 0; + padding-top: 0.3em; + } + + li { + margin: 0; + padding: 0.25em 0; + font-size: @font-size-portal-list-item; + line-height: @line-height-nav; + word-wrap: break-word; + + a { + color: @color-link; + + &:visited { + color: @color-link--visited; + } + } + } + } } diff --git a/resources/skins.vector.styles/components/MenuPortal.less b/resources/skins.vector.styles/components/MenuPortal.less index 43664c79b..d9d0f0eca 100644 --- a/resources/skins.vector.styles/components/MenuPortal.less +++ b/resources/skins.vector.styles/components/MenuPortal.less @@ -1,5 +1,47 @@ +@import '../../common/variables.less'; +@import 'mediawiki.mixins.less'; + .vector-menu-portal { + margin: 0 @margin-end-portal 0 @margin-start-portal; + padding: 0.25em 0; + direction: ltr; + .vector-menu-heading { + display: block; + color: @color-base--subtle; + margin: 0.5em 0 0 ( @margin-start-nav-main-body / @font-size-nav-main-heading ); + border: 0; + padding: 0.25em 0; + font-size: @font-size-nav-main-heading; + font-weight: normal; + cursor: default; border-bottom: 1px solid @border-color-portal-heading; } + + .vector-menu-content { + margin-left: @margin-start-portal-body; + padding-top: 0; + + ul { + list-style: none; + margin: 0; + padding-top: 0.3em; + } + + li { + margin: 0; + padding: 0.25em 0; + font-size: @font-size-portal-list-item; + line-height: @line-height-nav; + word-wrap: break-word; + + a { + color: @color-link; + + &:visited { + color: @color-link--visited; + } + } + } + } }