jenkins-bot has submitted this change and it was merged.
Change subject: Update VE core submodule to master (1f82a47)
......................................................................
Update VE core submodule to master (1f82a47)
New changes:
5d063a2 Don't use three different coordinate systems in getSelectionRect()
feeb1ae Only focus the paste target if focusedNode has changed
2c1bb97 Update OOjs UI to v0.1.0-pre (4cef83f702)
Local changes:
* Update references to renamed classes
* Update calling patterns element mixins
Change-Id: I330c0e308807597dec31dad8dbf713eb29fdc290
---
M lib/ve
M modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.css
M modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
M modules/ve-mw/ui/styles/dialogs/ve.ui.MWTransclusionDialog.css
M modules/ve-mw/ui/styles/widgets/ve.ui.MWCategoryItemWidget.css
M modules/ve-mw/ui/styles/widgets/ve.ui.MWCategoryPopupWidget.css
M modules/ve-mw/ui/styles/widgets/ve.ui.MWMediaResultWidget.css
M modules/ve-mw/ui/styles/widgets/ve.ui.MWReferenceResultWidget.css
M modules/ve-mw/ui/widgets/ve.ui.MWCategoryItemWidget.js
M modules/ve-mw/ui/widgets/ve.ui.MWCategoryWidget.js
M modules/ve-mw/ui/widgets/ve.ui.MWTocItemWidget.js
11 files changed, 65 insertions(+), 65 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/ve b/lib/ve
index 7004717..1f82a47 160000
--- a/lib/ve
+++ b/lib/ve
-Subproject commit 7004717af52f20732cac8b481bc0bcdbf21d490f
+Subproject commit 1f82a47146628463f9b5e4ab03cd0215875eab54
diff --git a/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.css
b/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.css
index 4e6e446..6457d43 100644
--- a/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.css
+++ b/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.css
@@ -42,12 +42,12 @@
padding: 0.25em;
}
-.ve-init-mw-viewPageTarget-toolbar-utilites > .oo-ui-buttonedElement-frameless
{
+.ve-init-mw-viewPageTarget-toolbar-utilites > .oo-ui-buttonElement-frameless {
margin-right: 0.2em;
margin-top: 0.2em;
}
-.ve-init-mw-viewPageTarget-toolbar-actions > .oo-ui-buttonedElement-framed {
+.ve-init-mw-viewPageTarget-toolbar-actions > .oo-ui-buttonElement-framed {
margin-left: 0.25em;
margin-right: 0.25em;
margin-top: 0.2em;
@@ -77,12 +77,12 @@
margin-top: 0.8em;
}
-.ve-ui-mwHelpPopupTool-item > .oo-ui-buttonedElement-frameless {
+.ve-ui-mwHelpPopupTool-item > .oo-ui-buttonElement-frameless {
display: block;
margin: 0.5em 0;
}
-.ve-ui-mwHelpPopupTool-item > .oo-ui-buttonedElement-frameless:first-child {
+.ve-ui-mwHelpPopupTool-item > .oo-ui-buttonElement-frameless:first-child {
margin-top: 0;
}
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 57d1219..057b57b 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
@@ -3,26 +3,26 @@
include URL
page_url
URL.url("User:#{ENV['MEDIAWIKI_USER']}/#{ENV['BROWSER']}?vehidebetadialog=true&veaction=edit")
- span(:bullet_number_selector, class: "oo-ui-iconedElement-icon
oo-ui-icon-bullet-list")
+ span(:bullet_number_selector, class: "oo-ui-iconElement-icon
oo-ui-icon-bullet-list")
span(:cite_button, text: "Cite")
div(:cite_select, css: "div.oo-ui-widget:nth-child(5) > div:nth-child(2)")
a(:cite_book, css: ".oo-ui-tool-name-cite-book > a:nth-child(1)")
a(:cite_journal, css: ".oo-ui-tool-name-cite-journal > a:nth-child(1)")
a(:cite_news, css: ".oo-ui-tool-name-cite-news > a:nth-child(1)")
span(:cite_website, css: ".oo-ui-icon-ref-cite-web")
- div(:container_disabled, class: "oo-ui-widget oo-ui-widget-disabled
oo-ui-flaggableElement-constructive oo-ui-.oo-ui-buttonedElement-framed")
+ div(:container_disabled, class: "oo-ui-widget oo-ui-widget-disabled
oo-ui-flaggedElement-constructive oo-ui-.oo-ui-buttonElement-framed")
div(:content, class: "ve-ce-branchNode")
- span(:decrease_indentation, class: "oo-ui-iconedElement-icon
oo-ui-icon-outdent-list")
- span(:downarrow, class: "oo-ui-indicatedElement-indicator
oo-ui-indicator-down")
+ span(:decrease_indentation, class: "oo-ui-iconElement-icon
oo-ui-icon-outdent-list")
+ span(:downarrow, class: "oo-ui-indicatorElement-indicator
oo-ui-indicator-down")
a(:edit_ve, title: /Edit this page with VisualEditor/)
a(:edit_wikitext, title: /You can edit this page\./)
a(:heading, text: /Heading/)
span(:hamburger_menu, css: "div.oo-ui-listToolGroup:nth-child(2) >
span:nth-child(1) > span:nth-child(3)")
- span(:increase_indentation, class: "oo-ui-iconedElement-icon
oo-ui-icon-indent-list")
+ span(:increase_indentation, class: "oo-ui-iconElement-icon
oo-ui-icon-indent-list")
span(:insert_menu, class: "oo-ui-popupToolGroup-handle", index: 4)
div(:insert_references, class: "oo-ui-processDialog-location")
div(:ip_warning, class: "ve-ui-mwNoticesPopupTool-item")
- span(:looks_good, class: "oo-ui-labeledElement-label", text: "Looks good to
me")
+ span(:looks_good, class: "oo-ui-labelElement-label", text: "Looks good to
me")
div(:medium_dialog, class: "oo-ui-window oo-ui-dialog oo-ui-dialog-open
oo-ui-dialog-medium")
span(:options_in_hamburger, class: "oo-ui-tool-title", text: "Options")
div(:page_text, id: "mw-content-text")
@@ -30,21 +30,21 @@
a(:paragraph, text: /Paragraph/)
a(:preformatted, text: /Preformatted/)
span(:refs_link, text: "Reference")
- div(:save_disabled, class: "oo-ui-widget oo-ui-widget-disabled
oo-ui-flaggableElement-constructive oo-ui-.oo-ui-buttonedElement-framed")
- a(:save_page, css: "div.ve-init-mw-viewPageTarget-toolbar-actions >
div.oo-ui-flaggableElement-constructive > a")
- div(:save_enabled, css: "div.ve-init-mw-viewPageTarget-toolbar-actions >
div.oo-ui-flaggableElement-constructive.oo-ui-widget-enabled")
+ div(:save_disabled, class: "oo-ui-widget oo-ui-widget-disabled
oo-ui-flaggedElement-constructive oo-ui-.oo-ui-buttonElement-framed")
+ a(:save_page, css: "div.ve-init-mw-viewPageTarget-toolbar-actions >
div.oo-ui-flaggedElement-constructive > a")
+ div(:save_enabled, css: "div.ve-init-mw-viewPageTarget-toolbar-actions >
div.oo-ui-flaggedElement-constructive.oo-ui-widget-enabled")
a(:subheading1, text: /Sub-heading 1/)
a(:subheading2, text: /Sub-heading 2/)
a(:subheading3, text: /Sub-heading 3/)
a(:subheading4, text: /Sub-heading 4/)
- span(:switch_to_source_editing, class: "oo-ui-iconedElement-icon
oo-ui-icon-source")
+ span(:switch_to_source_editing, class: "oo-ui-iconElement-icon
oo-ui-icon-source")
div(:heading_dropdown_menus, class: "oo-ui-toolGroup-tools
oo-ui-clippableElement-clippable")
div(:formatting_option_menus, class: "oo-ui-toolGroup-tools
oo-ui-clippableElement-clippable", index: 1)
- span(:page_settings, class: "oo-ui-iconedElement-icon oo-ui-icon-settings")
+ span(:page_settings, class: "oo-ui-iconElement-icon oo-ui-icon-settings")
div(:indentation_pull_down, class: "oo-ui-toolGroup-tools
oo-ui-clippableElement-clippable", index: 3)
div(:insert_pull_down, class: "oo-ui-toolGroup-tools
oo-ui-clippableElement-clippable", index: 4)
div(:page_option_menu, class: "oo-ui-toolGroup-tools
oo-ui-clippableElement-clippable", index: 5)
- span(:special_character, class: "oo-ui-iconedElement-icon
oo-ui-icon-special-character")
+ span(:special_character, class: "oo-ui-iconElement-icon
oo-ui-icon-special-character")
div(:iframe, class: "oo-ui-window-frame")
figure(:media_image, index: 0)
unordered_list(:media_caption, class: "ve-ui-contextMenuWidget")
@@ -53,32 +53,32 @@
div(:right_navigation, id: "p-views")
div(:left_navigation, id: "left-navigation")
div(:toolbar, class: "ve-init-mw-viewPageTarget-toolbar")
- span(:category_link, class: "oo-ui-iconedElement-icon oo-ui-icon-tag")
+ span(:category_link, class: "oo-ui-iconElement-icon oo-ui-icon-tag")
a(:formula_link, css: "span.oo-ui-tool-name-math > a.oo-ui-tool-link")
img(:formula_image, class: "mwe-math-fallback-png-inline")
if ENV["BROWSER"] == "chrome"
- div(:tools_menu, class: "oo-ui-widget oo-ui-widget-enabled oo-ui-toolGroup
oo-ui-iconedElement oo-ui-popupToolGroup oo-ui-listToolGroup")
+ div(:tools_menu, class: "oo-ui-widget oo-ui-widget-enabled oo-ui-toolGroup
oo-ui-iconElement oo-ui-popupToolGroup oo-ui-listToolGroup")
else
- span(:tools_menu, class: "oo-ui-iconedElement-icon oo-ui-icon-menu")
+ span(:tools_menu, class: "oo-ui-iconElement-icon oo-ui-icon-menu")
end
- span(:ve_bold_text, class: "oo-ui-iconedElement-icon oo-ui-icon-bold-b")
- span(:ve_bullets, class: "oo-ui-iconedElement-icon oo-ui-icon-bullet-list",
index: 1)
- span(:ve_computer_code, class: "oo-ui-iconedElement-icon oo-ui-icon-code")
- div(:ve_heading_menu, class: "oo-ui-iconedElement-icon oo-ui-icon-down")
- span(:ve_link_icon, class: "oo-ui-iconedElement-icon oo-ui-icon-link")
- span(:ve_italics, class: "oo-ui-iconedElement-icon oo-ui-icon-italic-i")
- span(:ve_media_menu, class: "oo-ui-iconedElement-icon oo-ui-icon-picture")
- span(:ve_references, class: "oo-ui-iconedElement-icon oo-ui-icon-references")
- span(:ve_numbering, class: "oo-ui-iconedElement-icon oo-ui-icon-number-list")
- span(:ve_strikethrough, class: "oo-ui-iconedElement-icon
oo-ui-icon-strikethrough-s")
- span(:ve_subscript, class: "oo-ui-iconedElement-icon oo-ui-icon-subscript")
- span(:ve_superscript, class: "oo-ui-iconedElement-icon
oo-ui-icon-superscript")
- span(:ve_text_style, class: "oo-ui-iconedElement-icon oo-ui-icon-text-style")
- span(:ve_underline, class: "oo-ui-iconedElement-icon oo-ui-icon-underline-u")
+ span(:ve_bold_text, class: "oo-ui-iconElement-icon oo-ui-icon-bold-b")
+ span(:ve_bullets, class: "oo-ui-iconElement-icon oo-ui-icon-bullet-list",
index: 1)
+ span(:ve_computer_code, class: "oo-ui-iconElement-icon oo-ui-icon-code")
+ div(:ve_heading_menu, class: "oo-ui-iconElement-icon oo-ui-icon-down")
+ span(:ve_link_icon, class: "oo-ui-iconElement-icon oo-ui-icon-link")
+ span(:ve_italics, class: "oo-ui-iconElement-icon oo-ui-icon-italic-i")
+ span(:ve_media_menu, class: "oo-ui-iconElement-icon oo-ui-icon-picture")
+ span(:ve_references, class: "oo-ui-iconElement-icon oo-ui-icon-references")
+ span(:ve_numbering, class: "oo-ui-iconElement-icon oo-ui-icon-number-list")
+ span(:ve_strikethrough, class: "oo-ui-iconElement-icon
oo-ui-icon-strikethrough-s")
+ span(:ve_subscript, class: "oo-ui-iconElement-icon oo-ui-icon-subscript")
+ span(:ve_superscript, class: "oo-ui-iconElement-icon oo-ui-icon-superscript")
+ span(:ve_text_style, class: "oo-ui-iconElement-icon oo-ui-icon-text-style")
+ span(:ve_underline, class: "oo-ui-iconElement-icon oo-ui-icon-underline-u")
div(:visual_editor_toolbar, class: "oo-ui-toolbar-tools")
- a(:transclusion, css:
"span.oo-ui-widget.oo-ui-iconedElement.oo-ui-tool.oo-ui-tool-name-transclusion.oo-ui-widget-enabled
> a")
+ a(:transclusion, css:
"span.oo-ui-widget.oo-ui-iconElement.oo-ui-tool.oo-ui-tool-name-transclusion.oo-ui-widget-enabled
> a")
text_area(:wikitext_editor, id: "wpTextbox1")
a(:first_reference, text: "[1]", index: 1)
a(:second_reference, text: "[1]", index: 2)
@@ -86,7 +86,7 @@
a(:new_link, class: "ve-ce-linkAnnotation ve-ce-mwInternalLinkAnnotation
new")
a(:internal_link, class: "ve-ce-linkAnnotation
ve-ce-mwInternalLinkAnnotation")
unordered_list(:popup_icon, class: "ve-ui-context-menu")
- span(:basic_reference, class: "oo-ui-iconedElement-icon
oo-ui-icon-reference")
+ span(:basic_reference, class: "oo-ui-iconElement-icon oo-ui-icon-reference")
div(:toolbar_action, class: "oo-ui-toolbar-actions")
span(:media_insert_menu, class: "oo-ui-tool-name-media")
span(:template_insert_menu, class: "oo-ui-tool-name-transclusion")
@@ -118,7 +118,7 @@
span(:insert_citation, text: "Insert", frame: frame)
span(:links_done, text: "Done", frame: frame)
text_field(:link_textfield, index: 0, frame: frame)
- span(:another_save_page, class: "oo-ui-labeledElement-label", text: "Save
page", frame: frame)
+ span(:another_save_page, class: "oo-ui-labelElement-label", text: "Save
page", frame: frame)
div(:options_page_title, class: "oo-ui-processDialog-location", text:
"Options", frame: frame)
div(:ve_link_ui, class: "oo-ui-window-head", frame: frame)
end
@@ -143,10 +143,10 @@
div(:parameter_icon, text: "q", frame: frame)
a(:remove_parameter, title: "Remove field", frame: frame)
a(:remove_template, title: "Remove template", frame: frame)
- span(:return_to_save, class: "oo-ui-labeledElement-label", text: "Return
to save form", frame: frame)
- span(:review_changes, class: "oo-ui-labeledElement-label", text: "Review
your changes", frame: frame)
+ span(:return_to_save, class: "oo-ui-labelElement-label", text: "Return to
save form", frame: frame)
+ span(:review_changes, class: "oo-ui-labelElement-label", text: "Review
your changes", frame: frame)
div(:review_failed, class: "oo-ui-window-head", frame: frame)
- span(:second_save_page, class: "oo-ui-labeledElement-label", text: "Save
page", frame: frame)
+ span(:second_save_page, class: "oo-ui-labelElement-label", text: "Save
page", frame: frame)
div(:suggestion_list, class: "ve-ui-mwTitleInputWidget-menu", frame: frame)
div(:template_header, class: "ve-ui-mwTransclusionDialog-single", frame:
frame)
li(:template_list_item, text: "S", frame: frame)
@@ -155,16 +155,16 @@
text_field(:transclusion_textfield, index: 0, frame: frame)
span(:existing_reference, text: "Use an existing reference", frame: frame)
div(:extension_reference, class: "ve-ui-mwReferenceResultWidget-shield",
frame: frame)
- div(:page_settings_heading, class: "oo-ui-labeledElement-label", frame:
frame)
- div(:redirect_page_option, class: "oo-ui-layout oo-ui-labeledElement
oo-ui-fieldLayout oo-ui-fieldLayout-align-inline", frame: frame)
+ div(:page_settings_heading, class: "oo-ui-labelElement-label", frame:
frame)
+ div(:redirect_page_option, class: "oo-ui-layout oo-ui-labelElement
oo-ui-fieldLayout oo-ui-fieldLayout-align-inline", frame: frame)
div(:target_redirect, class: "oo-ui-layout oo-ui-fieldLayout
oo-ui-fieldLayout-align-top oo-ui-fieldLayout-disabled", frame: frame)
- div(:prevent_redirect, class: "oo-ui-layout oo-ui-labeledElement
oo-ui-fieldLayout oo-ui-fieldLayout-align-inline oo-ui-fieldLayout-disabled",
frame: frame)
- div(:table_of_contents, class: "oo-ui-layout oo-ui-labeledElement
oo-ui-fieldLayout oo-ui-fieldLayout-align-top", frame: frame)
- div(:page_settings_editlinks, class: "oo-ui-layout oo-ui-labeledElement
oo-ui-fieldLayout oo-ui-fieldLayout-align-inline", frame: frame)
+ div(:prevent_redirect, class: "oo-ui-layout oo-ui-labelElement
oo-ui-fieldLayout oo-ui-fieldLayout-align-inline oo-ui-fieldLayout-disabled",
frame: frame)
+ div(:table_of_contents, class: "oo-ui-layout oo-ui-labelElement
oo-ui-fieldLayout oo-ui-fieldLayout-align-top", frame: frame)
+ div(:page_settings_editlinks, class: "oo-ui-layout oo-ui-labelElement
oo-ui-fieldLayout oo-ui-fieldLayout-align-inline", frame: frame)
text_field(:media_alternative_text, css:
"div.oo-ui-widget.oo-ui-widget-enabled.oo-ui-inputWidget.oo-ui-textInputWidget.ve-ui-mwMediaDialog-altText
> input", frame: frame)
- div(:media_alternative_block, class: "oo-ui-layout oo-ui-iconedElement
oo-ui-labeledElement oo-ui-fieldsetLayout", index: 1, frame: frame)
- list_item(:media_advanced_settings, class: "oo-ui-widget
oo-ui-widget-enabled oo-ui-optionWidget oo-ui-decoratedOptionWidget
oo-ui-outlineItemWidget oo-ui-outlineItemWidget-level-0 oo-ui-iconedElement
oo-ui-labeledElement", frame: frame)
- a(:insert_media, css: "div.oo-ui-processDialog-actions-primary >
div.oo-ui-buttonedElement-frameless > a", frame: frame)
+ div(:media_alternative_block, class: "oo-ui-layout oo-ui-iconElement
oo-ui-labelElement oo-ui-fieldsetLayout", index: 1, frame: frame)
+ list_item(:media_advanced_settings, class: "oo-ui-widget
oo-ui-widget-enabled oo-ui-optionWidget oo-ui-decoratedOptionWidget
oo-ui-outlineItemWidget oo-ui-outlineItemWidget-level-0 oo-ui-iconElement
oo-ui-labelElement", frame: frame)
+ a(:insert_media, css: "div.oo-ui-processDialog-actions-primary >
div.oo-ui-buttonElement-frameless > a", frame: frame)
text_area(:formula_area, class: "oo-ui-ltr", frame: frame)
div(:settings_apply_button, class: "oo-ui-processDialog-actions-primary",
frame: frame)
div(:page_settings_gap, class: "oo-ui-layout oo-ui-panelLayout
oo-ui-panelLayout-scrollable oo-ui-panelLayout-expanded oo-ui-stackLayout
oo-ui-bookletLayout-stackLayout", frame: frame)
@@ -173,7 +173,7 @@
# not having beta warning makes iframes off by one
in_iframe(index: 1) do |frame|
div(:links_diff_view, class: "ve-ui-mwSaveDialog-viewer", frame: frame)
- span(:links_review_changes, class: "oo-ui-labeledElement-label", text:
"Review your changes", frame: frame)
+ span(:links_review_changes, class: "oo-ui-labelElement-label", text:
"Review your changes", frame: frame)
div(:media_diff_view, class: "ve-ui-mwSaveDialog-viewer", frame: frame)
span(:media_exit, text: "Return to save form", frame: frame)
end
diff --git a/modules/ve-mw/ui/styles/dialogs/ve.ui.MWTransclusionDialog.css
b/modules/ve-mw/ui/styles/dialogs/ve.ui.MWTransclusionDialog.css
index 28e5425..8006db0 100644
--- a/modules/ve-mw/ui/styles/dialogs/ve.ui.MWTransclusionDialog.css
+++ b/modules/ve-mw/ui/styles/dialogs/ve.ui.MWTransclusionDialog.css
@@ -9,7 +9,7 @@
display: inline-block;
}
-.ve-ui-mwTransclusionDialog-addTemplateFieldset .oo-ui-buttonedElement-framed {
+.ve-ui-mwTransclusionDialog-addTemplateFieldset .oo-ui-buttonElement-framed {
margin-left: 0.5em;
}
@@ -35,8 +35,8 @@
top: 1.5em;
}
-.ve-ui-mwTransclusionDialog.ve-ui-mwTemplateDialog-ready .oo-ui-bookletLayout
.oo-ui-fieldsetLayout > .oo-ui-labeledElement-label,
-.ve-ui-mwTransclusionDialog.ve-ui-mwTemplateDialog-ready .oo-ui-bookletLayout
.oo-ui-fieldsetLayout > .oo-ui-iconedElement-icon,
+.ve-ui-mwTransclusionDialog.ve-ui-mwTemplateDialog-ready .oo-ui-bookletLayout
.oo-ui-fieldsetLayout > .oo-ui-labelElement-label,
+.ve-ui-mwTransclusionDialog.ve-ui-mwTemplateDialog-ready .oo-ui-bookletLayout
.oo-ui-fieldsetLayout > .oo-ui-iconElement-icon,
.ve-ui-mwTransclusionDialog.ve-ui-mwTemplateDialog-ready .oo-ui-bookletLayout
.ve-ui-mwTransclusionDialog-removeButton,
.ve-ui-mwTransclusionDialog.ve-ui-mwTemplateDialog-ready .oo-ui-bookletLayout
.ve-ui-mwTemplatePage-more,
.ve-ui-mwTransclusionDialog.ve-ui-mwTemplateDialog-ready .oo-ui-bookletLayout
.ve-ui-mwParameterPage-more,
@@ -47,12 +47,12 @@
transition: all 250ms ease-in-out;
}
-.ve-ui-mwTransclusionDialog .oo-ui-bookletLayout .oo-ui-fieldsetLayout >
.oo-ui-labeledElement-label {
+.ve-ui-mwTransclusionDialog .oo-ui-bookletLayout .oo-ui-fieldsetLayout >
.oo-ui-labelElement-label {
height: 1.5em;
overflow: hidden;
}
-.ve-ui-mwTransclusionDialog-single .oo-ui-bookletLayout .oo-ui-fieldsetLayout
> .oo-ui-labeledElement-label {
+.ve-ui-mwTransclusionDialog-single .oo-ui-bookletLayout .oo-ui-fieldsetLayout
> .oo-ui-labelElement-label {
opacity: 0;
height: 0;
padding-top: 0;
@@ -60,7 +60,7 @@
margin-bottom: 0;
}
-.ve-ui-mwTransclusionDialog-single .oo-ui-bookletLayout .oo-ui-fieldsetLayout
> .oo-ui-iconedElement-icon,
+.ve-ui-mwTransclusionDialog-single .oo-ui-bookletLayout .oo-ui-fieldsetLayout
> .oo-ui-iconElement-icon,
.ve-ui-mwTransclusionDialog-single .oo-ui-bookletLayout
.ve-ui-mwTransclusionDialog-removeButton,
.ve-ui-mwTransclusionDialog-multiple .oo-ui-bookletLayout
.ve-ui-mwTemplatePage-more,
.ve-ui-mwTransclusionDialog-multiple .oo-ui-bookletLayout
.ve-ui-mwParameterPage-more {
diff --git a/modules/ve-mw/ui/styles/widgets/ve.ui.MWCategoryItemWidget.css
b/modules/ve-mw/ui/styles/widgets/ve.ui.MWCategoryItemWidget.css
index a1f380e..2b43810 100644
--- a/modules/ve-mw/ui/styles/widgets/ve.ui.MWCategoryItemWidget.css
+++ b/modules/ve-mw/ui/styles/widgets/ve.ui.MWCategoryItemWidget.css
@@ -61,7 +61,7 @@
color: black;
}
-.ve-ui-mwCategoryItemWidget.oo-ui-indicatedElement
.oo-ui-indicatedElement-indicator {
+.ve-ui-mwCategoryItemWidget.oo-ui-indicatorElement
.oo-ui-indicatorElement-indicator {
position: absolute;
right: 0;
top: 0;
diff --git a/modules/ve-mw/ui/styles/widgets/ve.ui.MWCategoryPopupWidget.css
b/modules/ve-mw/ui/styles/widgets/ve.ui.MWCategoryPopupWidget.css
index 627a5f9..ab66e51 100644
--- a/modules/ve-mw/ui/styles/widgets/ve.ui.MWCategoryPopupWidget.css
+++ b/modules/ve-mw/ui/styles/widgets/ve.ui.MWCategoryPopupWidget.css
@@ -14,7 +14,7 @@
padding: 0.75em 0.5em;
}
-.ve-ui-mwCategoryPopupWidget .oo-ui-buttonedElement-frameless {
+.ve-ui-mwCategoryPopupWidget .oo-ui-buttonElement-frameless {
display: block;
float: left;
}
diff --git a/modules/ve-mw/ui/styles/widgets/ve.ui.MWMediaResultWidget.css
b/modules/ve-mw/ui/styles/widgets/ve.ui.MWMediaResultWidget.css
index c30f7fe..c551c04 100644
--- a/modules/ve-mw/ui/styles/widgets/ve.ui.MWMediaResultWidget.css
+++ b/modules/ve-mw/ui/styles/widgets/ve.ui.MWMediaResultWidget.css
@@ -58,7 +58,7 @@
background-repeat: no-repeat;
}
-.ve-ui-mwMediaResultWidget .oo-ui-labeledElement-label {
+.ve-ui-mwMediaResultWidget .oo-ui-labelElement-label {
position: absolute;
bottom: 0;
left: 0;
@@ -72,11 +72,11 @@
text-overflow: ellipsis;
}
-.ve-ui-mwMediaResultWidget.oo-ui-optionWidget-highlighted
.oo-ui-labeledElement-label {
+.ve-ui-mwMediaResultWidget.oo-ui-optionWidget-highlighted
.oo-ui-labelElement-label {
background-color: rgba(0,0,0,0.75);
}
-.ve-ui-mwMediaResultWidget.oo-ui-optionWidget-selected
.oo-ui-labeledElement-label {
+.ve-ui-mwMediaResultWidget.oo-ui-optionWidget-selected
.oo-ui-labelElement-label {
background-color: #000;
}
diff --git a/modules/ve-mw/ui/styles/widgets/ve.ui.MWReferenceResultWidget.css
b/modules/ve-mw/ui/styles/widgets/ve.ui.MWReferenceResultWidget.css
index 4092b00..d3c5c58 100644
--- a/modules/ve-mw/ui/styles/widgets/ve.ui.MWReferenceResultWidget.css
+++ b/modules/ve-mw/ui/styles/widgets/ve.ui.MWReferenceResultWidget.css
@@ -11,7 +11,7 @@
border-bottom: solid 1px #eee;
}
-.ve-ui-mwReferenceResultWidget .oo-ui-labeledElement-label {
+.ve-ui-mwReferenceResultWidget .oo-ui-labelElement-label {
white-space: normal;
}
diff --git a/modules/ve-mw/ui/widgets/ve.ui.MWCategoryItemWidget.js
b/modules/ve-mw/ui/widgets/ve.ui.MWCategoryItemWidget.js
index c241ce7..08905e1 100644
--- a/modules/ve-mw/ui/widgets/ve.ui.MWCategoryItemWidget.js
+++ b/modules/ve-mw/ui/widgets/ve.ui.MWCategoryItemWidget.js
@@ -11,7 +11,7 @@
* @class
* @abstract
* @extends OO.ui.Widget
- * @mixins OO.ui.IndicatedElement
+ * @mixins OO.ui.IndicatorElement
*
* @constructor
* @param {Object} [config] Configuration options
@@ -27,7 +27,7 @@
OO.ui.Widget.call( this, config );
// Mixin constructors
- OO.ui.IndicatedElement.call( this, this.$( '<span>' ), config );
+ OO.ui.IndicatorElement.call( this, config );
// Properties
this.name = config.item.name;
@@ -61,7 +61,7 @@
OO.inheritClass( ve.ui.MWCategoryItemWidget, OO.ui.Widget );
-OO.mixinClass( ve.ui.MWCategoryItemWidget, OO.ui.IndicatedElement );
+OO.mixinClass( ve.ui.MWCategoryItemWidget, OO.ui.IndicatorElement );
/* Events */
diff --git a/modules/ve-mw/ui/widgets/ve.ui.MWCategoryWidget.js
b/modules/ve-mw/ui/widgets/ve.ui.MWCategoryWidget.js
index 4dc66a0..151ede8 100644
--- a/modules/ve-mw/ui/widgets/ve.ui.MWCategoryWidget.js
+++ b/modules/ve-mw/ui/widgets/ve.ui.MWCategoryWidget.js
@@ -24,7 +24,7 @@
OO.ui.Widget.call( this, config );
// Mixin constructors
- OO.ui.GroupElement.call( this, this.$( '<div>' ), config );
+ OO.ui.GroupElement.call( this, config );
// Properties
this.categories = {};
diff --git a/modules/ve-mw/ui/widgets/ve.ui.MWTocItemWidget.js
b/modules/ve-mw/ui/widgets/ve.ui.MWTocItemWidget.js
index c5356d4..fb079b1 100644
--- a/modules/ve-mw/ui/widgets/ve.ui.MWTocItemWidget.js
+++ b/modules/ve-mw/ui/widgets/ve.ui.MWTocItemWidget.js
@@ -26,7 +26,7 @@
OO.ui.Widget.call( this, config );
// Mixin Constructor
- OO.ui.GroupElement.call( this, this.$( '<ul>' ), config );
+ OO.ui.GroupElement.call( this, $.extend( {}, config, { $group: this.$(
'<ul>' ) } ) );
config = config || {};
--
To view, visit https://gerrit.wikimedia.org/r/157285
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I330c0e308807597dec31dad8dbf713eb29fdc290
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Trevor Parscal <[email protected]>
Gerrit-Reviewer: Catrope <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
