XWIKI-10577: Move wiki.css selectors to colibri.css

xwiki-platform-core/xwiki-platform-colibri/src/main/resources/colibri/colibri.css

@@ -1294,6 +1294,34 @@ div#xwikiobjects input[type="checkbox"], div#xwikiclassproperties input[type="ch
   background-image: url("$xwiki.getSkinFile('icons/silk/application_view_tile.png')");
 }
 
+.actionmenu .tmMainWiki{
+  background-image: url("$xwiki.getSkinFile('icons/silk/house.png')");
+}
+
+.actionmenu .tmAdminMainWiki {
+  background-image: url("$xwiki.getSkinFile('icons/silk/wrench.png')");
+}
+
+.actionmenu .tmWikiIndex {
+  background-image: url("$xwiki.getSkinFile('icons/silk/text_list_bullets.png')");
+}
+
+.actionmenu .tmMainWikiDocumentIndex {
+  background-image: url("$xwiki.getSkinFile('icons/silk/book_open.png')");
+}
+
+.actionmenu .tmMainUserIndex {
+  background-image: url("$xwiki.getSkinFile('icons/silk/group.png')");
+}
+
+.actionmenu .tmDeleteWiki {
+  background-image: url("$xwiki.getSkinFile('icons/silk/cross.png')");
+}
+
+.actionmenu .tmUserWikis {
+  background-image: url("$xwiki.getSkinFile('icons/silk/chart_organisation.png')");
+}
+
 /* Styles for the floating menu, when scrolling down the page. */
 .floating-menu {
   margin-top: -18px;

xwiki-platform-core/xwiki-platform-web/src/main/webapp/resources/uicomponents/wiki/wiki.css

-.actionmenu #tmMainWiki{
-  background-image: url("$xwiki.getSkinFile('icons/silk/house.png')");
-}
-
-.actionmenu #tmAdminMainWiki {
-  background-image: url("$xwiki.getSkinFile('icons/silk/wrench.png')");
-}
-
-.actionmenu #tmWikiIndex {
-  background-image: url("$xwiki.getSkinFile('icons/silk/text_list_bullets.png')");
-}
-
-.actionmenu #tmMainWikiDocumentIndex {
-  background-image: url("$xwiki.getSkinFile('icons/silk/book_open.png')");
-}
-
-.actionmenu #tmMainUserIndex {
-  background-image: url("$xwiki.getSkinFile('icons/silk/group.png')");
-}
-
-.actionmenu #tmWiki {
-  background-image: url("$xwiki.getSkinFile('icons/silk/world.png')");
-}
-
-.actionmenu #tmDeleteWiki {
-  background-image: url("$xwiki.getSkinFile('icons/silk/cross.png')");
-}
-
-.actionmenu #tmUserWikis {
-  background-image: url("$xwiki.getSkinFile('icons/silk/chart_organisation.png')");
-}
\ No newline at end of file

xwiki-platform-core/xwiki-platform-web/src/main/webapp/templates/menuview.vm

@@ -4,7 +4,6 @@
 <div class="componentcontainer">
 <strong id="xwikimenutitle" class="hidden">$services.localization.render('core.menu.main.title')</strong>
 <div class="rightmenu">
-#set ($discard = $xwiki.ssfx.use('uicomponents/wiki/wiki.css', true))
 #set ($isWikiAPIAvailable = ("!$services.wiki" != '') && ("!$services.wiki.user" != ''))
 #set ($mainWikiHomeDocumentReference = $services.model.createDocumentReference($xcontext.mainWikiName, 'Main', 'WebHome'))
 #set ($WikiManagerMainDocReference = $services.model.createDocumentReference($xcontext.mainWikiName, 'WikiManager', 'WebHome'))