jenkins-bot has submitted this change and it was merged.
Change subject: Replace ve-init-mw-desktopArticleTarget-* with
ve-init-mw-target-*
......................................................................
Replace ve-init-mw-desktopArticleTarget-* with ve-init-mw-target-*
Except in cases where it is only applied to desktop articles.
Change-Id: I40a9dabcd8454138f94affde809afee9c93732a4
---
M modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-apex.css
M modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-monobook.css
M modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-vector.css
M modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget.css
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
M modules/ve-mw/init/ve.init.mw.Target.js
M modules/ve-mw/tests/browser/features/support/pages/dummy_page.rb
M modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
8 files changed, 24 insertions(+), 24 deletions(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-apex.css
b/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-apex.css
index a2e4e4e..df226d6 100644
--- a/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-apex.css
+++ b/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-apex.css
@@ -14,12 +14,12 @@
font-size: 0.8em;
}
-.ve-init-mw-desktopArticleTarget-toolbar {
+.ve-init-mw-target-toolbar {
margin: -0.6em -3em 0.8em -3em;
position: relative;
}
-.ve-init-mw-desktopArticleTarget-toolbar .oo-ui-toolbar-bar {
+.ve-init-mw-target-toolbar .oo-ui-toolbar-bar {
line-height: 1.5em;
}
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 3b58936..a08114e 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
@@ -22,12 +22,12 @@
font-size: 0.992187499998em; /* 1/1.00787401575 */
}
-.ve-init-mw-desktopArticleTarget-toolbar {
+.ve-init-mw-target-toolbar {
/* 0.6/0.8, 0.8/0.8, 1/0.6 */
margin: -0.75em -1em 1.25em -1em;
}
-.ve-init-mw-desktopArticleTarget-toolbar > .oo-ui-toolbar-bar {
+.ve-init-mw-target-toolbar > .oo-ui-toolbar-bar {
top: -3px;
}
@@ -35,12 +35,12 @@
border-top: 1px solid #ccc;
}
-.ve-init-mw-desktopArticleTarget-surface .ve-ce-documentNode,
-.ve-init-mw-desktopArticleTarget-surface .ve-ui-surface-placeholder {
+.ve-init-mw-target-surface .ve-ce-documentNode,
+.ve-init-mw-target-surface .ve-ui-surface-placeholder {
padding: 0;
}
-.ve-init-mw-desktopArticleTarget-surface .ve-ui-surface-placeholder {
+.ve-init-mw-target-surface .ve-ui-surface-placeholder {
margin-top: -0.45em;
}
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 14570d5..af70b1f 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
@@ -9,7 +9,7 @@
box-shadow: inset 0 -1px 0 #a7d7f9;
}
-.ve-init-mw-desktopArticleTarget-surface {
+.ve-init-mw-target-surface {
/*
In order to allow placing the text cursor to the start or end of the
text by
clicking in the margin area, we expand the outer boundary of the surface
@@ -23,8 +23,8 @@
margin: 1em -1.25em 0 -1.25em;
}
-.ve-init-mw-desktopArticleTarget-surface .ve-ce-documentNode,
-.ve-init-mw-desktopArticleTarget-surface .ve-ui-surface-placeholder {
+.ve-init-mw-target-surface .ve-ce-documentNode,
+.ve-init-mw-target-surface .ve-ui-surface-placeholder {
padding: 0 1.143em; /* surface-margin-left (1em) / (mw-body-content
font-size) 0.875em */
}
@@ -40,14 +40,14 @@
font-size: 1.09375em; /* 0.875/0.8 */
}
-.ve-init-mw-desktopArticleTarget-toolbar {
+.ve-init-mw-target-toolbar {
/* 1/0.8 */
margin: -1.25em -1.25em 1.25em -1.25em;
position: relative;
border-bottom: 1px solid rgba(0,0,0,0.15);
}
-.ve-init-mw-desktopArticleTarget-toolbar > .oo-ui-toolbar-bar {
+.ve-init-mw-target-toolbar > .oo-ui-toolbar-bar {
/* Upstream OOjs UI has 2px. We split this between 1px here
and 1px on the container to allow a smooth collapse transition
where the bottom pixel line sweeps it up. */
@@ -95,17 +95,17 @@
/* 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-surface {
+ .ve-init-mw-target-surface {
/* 0.8/0.8, 1.5/0.8 */
margin: 1em -1.875em 0 -1.875em;
}
- .ve-init-mw-desktopArticleTarget-surface .ve-ce-documentNode,
- .ve-init-mw-desktopArticleTarget-surface .ve-ui-surface-placeholder {
+ .ve-init-mw-target-surface .ve-ce-documentNode,
+ .ve-init-mw-target-surface .ve-ui-surface-placeholder {
padding: 0 1.714em; /* surface-margin-left (1.5em) /
(mw-body-content font-size) 0.875em */
}
- .ve-init-mw-desktopArticleTarget-toolbar {
+ .ve-init-mw-target-toolbar {
/* 1.25/0.8, 1.5/0.8 */
margin: -1.5625em -1.875em 1.875em -1.875em;
}
diff --git a/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget.css
b/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget.css
index f5b190f..e4677e0 100644
--- a/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget.css
+++ b/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget.css
@@ -7,8 +7,8 @@
/* Toolbar */
-.ve-activating .ve-init-mw-desktopArticleTarget-toolbar,
-.ve-deactivating .ve-init-mw-desktopArticleTarget-toolbar {
+.ve-activating .ve-init-mw-target-toolbar,
+.ve-deactivating .ve-init-mw-target-toolbar {
overflow: hidden;
transition: height 0.4s ease;
}
diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
index 5ba005a..7161cb2 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
@@ -214,7 +214,7 @@
this.toolbar.$element
// Set 0 before attach (expanded in #setupToolbar)
.css( 'height', '0' )
- .addClass( 've-init-mw-desktopArticleTarget-toolbar' );
+ .addClass( 've-init-mw-target-toolbar' );
this.$element.prepend( this.toolbar.$element );
}
};
diff --git a/modules/ve-mw/init/ve.init.mw.Target.js
b/modules/ve-mw/init/ve.init.mw.Target.js
index b878191..bf8341c 100644
--- a/modules/ve-mw/init/ve.init.mw.Target.js
+++ b/modules/ve-mw/init/ve.init.mw.Target.js
@@ -1283,7 +1283,7 @@
ve.track( 'trace.createSurface.exit' );
surface.$element
- .addClass(
've-init-mw-desktopArticleTarget-surface' )
+ .addClass( 've-init-mw-target-surface' )
.addClass( target.protectedClasses )
.appendTo( target.$element );
diff --git a/modules/ve-mw/tests/browser/features/support/pages/dummy_page.rb
b/modules/ve-mw/tests/browser/features/support/pages/dummy_page.rb
index 184d9c8..3cb62aa 100644
--- a/modules/ve-mw/tests/browser/features/support/pages/dummy_page.rb
+++ b/modules/ve-mw/tests/browser/features/support/pages/dummy_page.rb
@@ -5,6 +5,6 @@
include URL
page_url('http://<%=params[:site]%>/wiki/asdfdgfghlkj?veaction=edit')
- div(:ve_editing_surface, class: 've-ui-surface
ve-init-mw-desktopArticleTarget-surface')
+ div(:ve_editing_surface, class: 've-ui-surface ve-init-mw-target-surface')
div(:ve_editing_toolbar, class: 'oo-ui-toolbar-bar')
end
diff --git
a/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
b/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
index 1b450b4..a07972d 100644
--- a/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
+++ b/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
@@ -53,7 +53,7 @@
span(:decrease_indentation, class: 'oo-ui-iconElement-icon
oo-ui-icon-outdent')
text_area(:describe_change, index: 0)
div(:diff_view, class: 've-ui-mwSaveDialog-viewer')
- div(:disabled_save_button, css: 'div.ve-init-mw-desktopArticleTarget-toolbar
.oo-ui-toolbar-actions >
div.oo-ui-flaggedElement-progressive.oo-ui-widget-disabled')
+ div(:disabled_save_button, css: 'div.ve-init-mw-target-toolbar
.oo-ui-toolbar-actions >
div.oo-ui-flaggedElement-progressive.oo-ui-widget-disabled')
text_field(:display_title_textbox, css:
'div.oo-ui-fieldLayout-align-inline:nth-child(4) > label:nth-child(1) >
div:nth-child(1) > div:nth-child(1) > input:nth-child(1)')
div(:enable_redirect, class: 've-test-page-settings-enable-redirect')
div(:external_link, class: 've-test-external-link-tab')
@@ -151,7 +151,7 @@
li(:ve_edit_tab, id: 'ca-ve-edit')
li(:edit_source_tab, id: 'ca-edit')
a(:save_page, css: '.oo-ui-flaggedElement-progressive > a:nth-child(1)')
- div(:save_enabled, css: 'div.ve-init-mw-desktopArticleTarget-toolbar
.oo-ui-toolbar-actions >
div.oo-ui-flaggedElement-progressive.oo-ui-widget-enabled')
+ div(:save_enabled, css: 'div.ve-init-mw-target-toolbar
.oo-ui-toolbar-actions >
div.oo-ui-flaggedElement-progressive.oo-ui-widget-enabled')
div(:search_page_link, class: 'oo-ui-optionWidget-selected')
a(:second_reference, text: '[1]', index: 2)
span(:second_save_page, css: '.oo-ui-processDialog-actions-primary >
div:nth-child(1) > a:nth-child(1) > span:nth-child(2)')
@@ -166,7 +166,7 @@
table(:table, class: 've-ce-tableNode')
div(:table_of_contents, class: 've-test-page-settings-table-of-contents')
span(:template_insert_menu, class: 'oo-ui-tool-name-transclusion')
- div(:toolbar, class: 've-init-mw-desktopArticleTarget-toolbar')
+ div(:toolbar, class: 've-init-mw-target-toolbar')
div(:toolbar_actions, class: 'oo-ui-toolbar-actions')
if ENV['BROWSER'] == 'chrome'
div(:tools_menu, class: 'oo-ui-widget oo-ui-widget-enabled oo-ui-toolGroup
oo-ui-iconElement oo-ui-popupToolGroup oo-ui-listToolGroup')
--
To view, visit https://gerrit.wikimedia.org/r/227707
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I40a9dabcd8454138f94affde809afee9c93732a4
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <[email protected]>
Gerrit-Reviewer: Alex Monk <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
