wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-09-25 03:08:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Get rid of ve.init.mw.ViewPageTarget-vector-hd.css and use a media query instead"

Browse source
This commit is contained in:
jenkins-bot 2014-07-01 21:13:49 +00:00 committed by Gerrit Code Review
parent 84b63310f4 e1b9f9c745
commit 28fc207aeb
3 changed files with 23 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
VisualEditor.php
View file

@ -190,9 +190,6 @@ $wgResourceModules += array(
'vector' => array(
'modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-shared.css',
'modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-vector.css',
'modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-vector-hd.css' => array(
'media' => 'screen and (min-width: 982px)'
),
),
'apex' => array(
'modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-shared.css',

23
modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-vector-hd.css
View file

@ -1,23 +0,0 @@
/*!
* VisualEditor MediaWiki Initialization ViewPageTarget Vector skin high-definition styles.
*
* @copyright 2011-2014 VisualEditor Team and others; see AUTHORS.txt
* @license The MIT License (MIT); see LICENSE.txt
*/
.ve-init-mw-viewPageTarget-surface {
margin: 0.8em -1.5em 0 -1.5em;
}
.ve-init-mw-viewPageTarget-surface .ve-ce-documentNode {
padding: 0 1.714em; /* surface-margin-left (1.5em) / (mw-body-content font-size) 0.875em */
}
.ve-init-mw-viewPageTarget-toolbar {
margin: -1.25em -1.5em 1.5em -1.5em;
}
.ve-ui-debugBar {
padding: 1.5em;
margin: 1em -1.5em -1.5em -1.5em;
}

28
modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-vector.css
View file

@ -50,11 +50,29 @@
z-index: 101; /* #p-personal is z-index 100 in vector :( */
}
/*
Margin override in ve.ce.TableCellnode.css doesn't work due
to more specific rule in Vector (div#content p)
*/
/* ve.ce.TableCellnode.css's margin replaced by more specific rule in Vector (div#content p) */
/*csslint ids:false */
#content .ve-ce-tableCellNode .ve-ce-paragraphNode {
margin: 0;
}
}
/*csslint ids:true */
/* High-definition-specific styles (because Vector adds 1em to the leftNav if width is 982px+ */
@media screen and (min-width: 982px) {
.ve-init-mw-viewPageTarget-surface {
margin: 0.8em -1.5em 0 -1.5em;
}
.ve-init-mw-viewPageTarget-surface .ve-ce-documentNode {
padding: 0 1.714em; /* surface-margin-left (1.5em) / (mw-body-content font-size) 0.875em */
}
.ve-init-mw-viewPageTarget-toolbar {
margin: -1.25em -1.5em 1.5em -1.5em;
}
.ve-ui-debugBar {
padding: 1.5em;
margin: 1em -1.5em -1.5em -1.5em;
}
}