mirror of
https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor
synced 2024-11-24 06:24:08 +00:00
Merge "Only apply toolbar negative margins on vector"
This commit is contained in:
commit
504f712ebc
|
@ -18,22 +18,6 @@
|
|||
background: #36c;
|
||||
}
|
||||
|
||||
.ve-init-mw-desktopArticleTarget-toolbar,
|
||||
.ve-init-mw-desktopArticleTarget-toolbarPlaceholder {
|
||||
font-size: 0.875em;
|
||||
/* 1/0.875 */
|
||||
margin: -1.14em -1.14em 1.14em -1.14em;
|
||||
/* High-definition-specific styles (because Vector adds 1em to the leftNav if width is 982px+ */
|
||||
}
|
||||
|
||||
@media screen and ( min-width: 982px ) {
|
||||
.ve-init-mw-desktopArticleTarget-toolbar,
|
||||
.ve-init-mw-desktopArticleTarget-toolbarPlaceholder {
|
||||
/* 1.25/0.875, 1.5/0.875 */
|
||||
margin: -1.43em -1.71em 1.43em -1.71em;
|
||||
}
|
||||
}
|
||||
|
||||
.ve-init-mw-desktopArticleTarget-toolbarPlaceholder {
|
||||
border-bottom: 1px solid #c8ccd1;
|
||||
box-shadow: 0 1px 1px 0 rgba( 0, 0, 0, 0.1 );
|
||||
|
@ -42,3 +26,20 @@
|
|||
.ve-init-mw-desktopArticleTarget-toolbarPlaceholder-open {
|
||||
height: 40px;
|
||||
}
|
||||
|
||||
/* Toolbar margins only apply to vector */
|
||||
.skin-vector .ve-init-mw-desktopArticleTarget-toolbar,
|
||||
.skin-vector .ve-init-mw-desktopArticleTarget-toolbarPlaceholder {
|
||||
font-size: 0.875em;
|
||||
/* 1/0.875 */
|
||||
margin: -1.14em -1.14em 1.14em -1.14em;
|
||||
/* High-definition-specific styles (because Vector adds 1em to the leftNav if width is 982px+ */
|
||||
}
|
||||
|
||||
@media screen and ( min-width: 982px ) {
|
||||
.skin-vector .ve-init-mw-desktopArticleTarget-toolbar,
|
||||
.skin-vector .ve-init-mw-desktopArticleTarget-toolbarPlaceholder {
|
||||
/* 1.25/0.875, 1.5/0.875 */
|
||||
margin: -1.43em -1.71em 1.43em -1.71em;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue