Esanders has uploaded a new change for review. https://gerrit.wikimedia.org/r/268922
Change subject: Move generic VE desktop styles into a separate module ...................................................................... Move generic VE desktop styles into a separate module Here they can be re-used by other VE desktop targets, e.g. Flow. Change-Id: I18431ff73fc1c6ab5639a579e85b0f0cc48cb9ce --- M extension.json M modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-monobook.css M modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-vector.css A modules/ve-mw/init/styles/ve.init.mw.DesktopTarget-monobook.css A modules/ve-mw/init/styles/ve.init.mw.DesktopTarget-vector.css 5 files changed, 50 insertions(+), 23 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/22/268922/1 diff --git a/extension.json b/extension.json index adb016e..dc94409 100644 --- a/extension.json +++ b/extension.json @@ -315,6 +315,16 @@ "mobile" ] }, + "ext.visualEditor.desktopTarget": { + "skinStyles": { + "vector": [ + "modules/ve-mw/init/styles/ve.init.mw.DesktopTarget-vector.css" + ], + "monobook": [ + "modules/ve-mw/init/styles/ve.init.mw.DesktopTarget-monobook.css" + ] + } + }, "ext.visualEditor.desktopArticleTarget": { "scripts": [ "modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js" @@ -337,6 +347,7 @@ "ext.visualEditor.base", "ext.visualEditor.mediawiki", "ext.visualEditor.core.desktop", + "ext.visualEditor.desktopTarget", "jquery.cookie", "mediawiki.jqueryMsg", "mediawiki.util" diff --git a/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-monobook.css b/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-monobook.css index 9de0d03..219c837 100644 --- a/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-monobook.css +++ b/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-monobook.css @@ -50,10 +50,3 @@ /* Placeholder doesn't need a border as well */ border: 0; } - -.mw-body a.external.ve-ce-linkAnnotation-active { - /* Reset -2px from VE-core */ - margin-right: 0; - /* Monobook sets a background:url(); rule which overrides the colour. TODO: Fix upstream */ - background-color: #E6F1FF; -} diff --git a/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-vector.css b/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-vector.css index 96370cc..4535a2c 100644 --- a/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-vector.css +++ b/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-vector.css @@ -35,8 +35,7 @@ border: 0; } -.ve-init-mw-desktopArticleTarget, -.ve-ui-overlay-global { +.ve-init-mw-desktopArticleTarget { /* Enforce different font-size for all UI elements of VisualEditor */ font-size: 0.8em; } @@ -85,20 +84,6 @@ margin: 0; } /*csslint ids:true */ - -/* Slug animation needs more specific rules and skin-specific target margins */ -.mw-body p.ve-ce-branchNode-newSlug { - margin: -0.3em 0 -0.1em 0; -} - -.mw-body p.ve-ce-branchNode-newSlug-open { - margin: 0.5em 0; -} - -.mw-body .external.ve-ce-linkAnnotation-active { - /* Reset -2px from VE-core */ - margin-right: 0; -} /* High-definition-specific styles (because Vector adds 1em to the leftNav if width is 982px+ */ @media screen and (min-width: 982px) { diff --git a/modules/ve-mw/init/styles/ve.init.mw.DesktopTarget-monobook.css b/modules/ve-mw/init/styles/ve.init.mw.DesktopTarget-monobook.css new file mode 100644 index 0000000..c3cb905 --- /dev/null +++ b/modules/ve-mw/init/styles/ve.init.mw.DesktopTarget-monobook.css @@ -0,0 +1,13 @@ +/*! + * VisualEditor MediaWiki Initialization desktop target Monobook skin styles. + * + * @copyright 2011-2016 VisualEditor Team and others; see AUTHORS.txt + * @license The MIT License (MIT); see LICENSE.txt + */ + +.mw-body a.external.ve-ce-linkAnnotation-active { + /* Reset -2px from VE-core */ + margin-right: 0; + /* Monobook sets a background:url(); rule which overrides the colour. TODO: Fix upstream */ + background-color: #E6F1FF; +} diff --git a/modules/ve-mw/init/styles/ve.init.mw.DesktopTarget-vector.css b/modules/ve-mw/init/styles/ve.init.mw.DesktopTarget-vector.css new file mode 100644 index 0000000..d471c07 --- /dev/null +++ b/modules/ve-mw/init/styles/ve.init.mw.DesktopTarget-vector.css @@ -0,0 +1,25 @@ +/*! + * VisualEditor MediaWiki Initialization desktop target Vector skin styles. + * + * @copyright 2011-2016 VisualEditor Team and others; see AUTHORS.txt + * @license The MIT License (MIT); see LICENSE.txt + */ + +.ve-ui-overlay-global { + /* Enforce different font-size for all UI elements of VisualEditor */ + font-size: 0.8em; +} + +/* Slug animation needs more specific rules and skin-specific target margins */ +.mw-body p.ve-ce-branchNode-newSlug { + margin: -0.3em 0 -0.1em 0; +} + +.mw-body p.ve-ce-branchNode-newSlug-open { + margin: 0.5em 0; +} + +.mw-body .external.ve-ce-linkAnnotation-active { + /* Reset -2px from VE-core */ + margin-right: 0; +} -- To view, visit https://gerrit.wikimedia.org/r/268922 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I18431ff73fc1c6ab5639a579e85b0f0cc48cb9ce Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Esanders <esand...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits