wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-11-24 14:33:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Update for changes in OOjs UI (Ib40e3477)"

Browse source
This commit is contained in:
jenkins-bot 2015-04-30 02:19:18 +00:00 committed by Gerrit Code Review
parent 4b660ba983 89b79bb373
commit 6cb513b29c
5 changed files with 35 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-apex.css
View file

@ -9,10 +9,14 @@
margin-top: 0.8em;
}
.ve-ui-overlay-global {
/* Match skin's font-size */
font-size: 0.8em;
}
.ve-init-mw-viewPageTarget-toolbar {
margin: -0.6em -3em 0.8em -3em;
position: relative;
font-size: 1.3em;
}
.ve-init-mw-viewPageTarget-toolbar .oo-ui-toolbar-bar {

33
modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-monobook.css
View file

@ -5,16 +5,28 @@
* @license The MIT License (MIT); see LICENSE.txt
*/
.ve-ui-overlay-global {
/* Enforce different font-size for all UI elements of VisualEditor */
font-size: 1.28em; /* 0.8em / x-small */
}
.ve-init-target {
/* Enforce different font-size for all UI elements of VisualEditor. The difference is tiny, but
enough to make the icon containers 23.813px rather than 24px and thus the icons blurry */
font-size: 1.00787401575em; /* 0.8em / x-small / 127% */
}
.ve-init-target .ve-ce-surface.mw-body-content,
.ve-ui-overlay-global .ve-ce-surface.mw-body-content {
/* Match skin's font-size for the surface content */
font-size: 0.992187499998em; /* 1/1.00787401575 */
}
.ve-init-mw-viewPageTarget-toolbar {
margin: -0.6em -0.8em 1em -0.8em;
/* Correct for Monobook's x-small font on the root toolbar */
font-size: 1.25em;
line-height: 1.5em;
}
.ve-init-target > .ve-ui-debugBar {
/* Correct for Monobook's x-small font */
font-size: 1.25em;
border-top: 1px solid #ccc;
}
@ -27,17 +39,6 @@
margin: 0.8em -0.8em -0.8em -0.8em;
}
.ve-ui-overlay {
/* Mimic #globalWrapper */
font-size: 127%;
}
.ve-ui-overlay-global,
.ve-init-mw-viewPageTarget-windowManager-welcome {
/* Mimic #globalWrapper + Correct for Monobook's x-small font on the root overlay */
font-size: 1.5875em;
}
.ve-ui-overlay-global {
/* So that the overlay always appears over the site logo, search box and personal tools */
z-index: 4;

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

@ -22,10 +22,18 @@
padding: 0 1.143em; /* surface-margin-left (1em) / (mw-body-content font-size) 0.875em */
}
.ve-init-mw-viewPageTarget-surface .oo-ui-menuSelectWidget {
.ve-init-target,
.ve-ui-overlay-global {
/* Enforce different font-size for all UI elements of VisualEditor */
font-size: 0.8em;
}
.ve-init-target .ve-ce-surface.mw-body-content,
.ve-ui-overlay-global .ve-ce-surface.mw-body-content {
/* Match skin's font-size for the surface content */
font-size: 1.09375em; /* 0.875/0.8 */
}
.ve-init-mw-viewPageTarget-toolbar {
margin: -1em -1em 1em -1em;
position: relative;

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

@ -29,7 +29,6 @@
}
.ve-init-mw-viewPageTarget-toolbar-actions {
font-size: 0.8em;
vertical-align: top;
padding: 0.25em;
}

8
modules/ve-mw/ui/themes/vector/ve.ui.MWFormatTool.css
View file

@ -11,19 +11,19 @@
}
.oo-ui-menuToolGroup .oo-ui-tool-name-heading1 .oo-ui-tool-title {
font-size: 144%; /* 0.8 * 180% */
font-size: 180%;
}
.oo-ui-menuToolGroup .oo-ui-tool-name-heading2 .oo-ui-tool-title {
font-size: 120%; /* 0.8 * 150% */
font-size: 150%;
}
.oo-ui-menuToolGroup .oo-ui-tool-name-heading3 .oo-ui-tool-title {
font-size: 94%; /* 0.8 * 117% */
font-size: 117%;
}
.oo-ui-menuToolGroup .oo-ui-tool-name-heading4 .oo-ui-tool-title,
.oo-ui-menuToolGroup .oo-ui-tool-name-heading5 .oo-ui-tool-title,
.oo-ui-menuToolGroup .oo-ui-tool-name-heading6 .oo-ui-tool-title {
font-size: 80%; /* 0.8 * 100% */
font-size: 100%;
}