diff --git a/resources/screen-desktop.css b/resources/screen-desktop.less similarity index 98% rename from resources/screen-desktop.css rename to resources/screen-desktop.less index c5caa29..7c3ec34 100644 --- a/resources/screen-desktop.css +++ b/resources/screen-desktop.less @@ -2,13 +2,15 @@ ** Desktop-specific styles for MonoBook */ +@import 'variables.less'; + #column-content { float: right; margin: 0 0 0.6em -12.2em; } .mw-body { - margin: 2.8em 0 0 12.2em; + margin: @top-area-height 0 0 12.2em; border-right: 0; } diff --git a/resources/skinStyles/mediawiki.notification.less b/resources/skinStyles/mediawiki.notification.less index 71e0222..7b478c3 100644 --- a/resources/skinStyles/mediawiki.notification.less +++ b/resources/skinStyles/mediawiki.notification.less @@ -1,5 +1,16 @@ /* mediawiki.notification */ +@import '../variables.less'; + +.mw-notification-area { + // To match #globalWrapper (see screen-common.less). + font-size: 127%; +} + +.mw-notification-area-layout { + top: @top-area-height + 0.1em; +} + .mw-notification { border: 1px solid #ccc; border-radius: 3px; diff --git a/resources/variables.less b/resources/variables.less index 0e5f0c6..5bd53b1 100644 --- a/resources/variables.less +++ b/resources/variables.less @@ -1,5 +1,4 @@ // Variables for common colours and things -// Note that this does not affect screen-desktop.css and IEFixes files; update those separately. @import 'mediawiki.mixins'; @@ -14,6 +13,8 @@ @link-visited: #5a3696; @link-new: #c20; +@top-area-height: 2.8em; + // mobile objects @top-position: 5px; @block-size: 35px; diff --git a/skin.json b/skin.json index d7e9fa4..737a3b7 100644 --- a/skin.json +++ b/skin.json @@ -45,7 +45,7 @@ "resources/screen-common.less": { "media": "screen" }, - "resources/screen-desktop.css": { + "resources/screen-desktop.less": { "media": "screen" }, "resources/print-common.less": { @@ -71,7 +71,7 @@ "resources/screen-common.less": { "media": "screen" }, - "resources/screen-desktop.css": { + "resources/screen-desktop.less": { "media": "screen and (min-width: 551px)" }, "resources/screen-mobile.less": {