Skip to content

Commit 5ebabfc

Browse files
authored
XWIKI-22816: Icon and edit link aren't on the same line anymore when editing single object (#3851)
* Updated the style of the `edit all objects` link to behave as expected. This means removing customizations that were made to fit a CSS only icon. * Added back a cross in the `remove deprecated property` link.
1 parent e4b10fc commit 5ebabfc

File tree

2 files changed

+5
-6
lines changed
  • xwiki-platform-core
    • xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo
    • xwiki-platform-web/xwiki-platform-web-war/src/main/webapp/resources/js/xwiki/editors

2 files changed

+5
-6
lines changed

xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/editobject.vm

+5-1
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,11 @@
247247
#if ($mustSync)
248248
<div class="box warningmessage deprecatedProperties">
249249
$services.localization.render('core.editors.object.removeDeprecatedProperties.all.info')
250-
<div><a class="syncProperties syncAllProperties" href="$doc.getURL('objectsync')" title="$services.localization.render('core.editors.object.removeDeprecatedProperties.all.link.tooltip')">$services.localization.render('core.editors.object.removeDeprecatedProperties.all.link')</a></div>
250+
<div><a class="syncProperties syncAllProperties" href="$doc.getURL('objectsync')"
251+
title="$services.localization.render('core.editors.object.removeDeprecatedProperties.all.link.tooltip')">
252+
$services.icon.renderHTML('cross')
253+
$services.localization.render('core.editors.object.removeDeprecatedProperties.all.link')
254+
</a></div>
251255
</div>
252256
#end
253257
#end ## checkPropertyDeprecation

xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-war/src/main/webapp/resources/js/xwiki/editors/dataeditors.css

-5
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,6 @@ div#xwikiobjects input[type="radio"], div#xwikiclassproperties input[type="radio
3737
padding: 8px 2px;
3838
}
3939

40-
.more-actions .edit-all {
41-
display: block;
42-
padding: 2px 18px;
43-
}
44-
4540
/* Object editor */
4641
/* XClass */
4742
.xclass-title {

0 commit comments

Comments
 (0)