Index: colibri.css =================================================================== --- colibri.css (revision 30728) +++ colibri.css (working copy) @@ -3,6 +3,7 @@ * 2 spaces indentation for the proprieties -------------------------------------------------------------- */ #template('colorThemeInit.vm') +#template('iconThemeInit.vm') /* @group RESET */ /* -------------------------------------------------------------- * Resets default browser CSS styles. @@ -251,7 +252,7 @@ } .edit_section a { - background: transparent url("$xwiki.getSkinFile('icons/xwiki/edit-section.png')") no-repeat left top; + background: transparent $themeI.editSectionIcon no-repeat left top; margin: 0 -52px 0 0; overflow: hidden; padding: 0 0 0 50px; @@ -278,7 +279,7 @@ } .loading { - background: transparent url("$xwiki.getSkinFile('icons/xwiki/spinner.gif')") no-repeat center; + background: transparent $themeI.spinnerIcon no-repeat center; } .separator { @@ -549,7 +550,7 @@ /* ----------------Changes----------------*/ #changes-info { - background: $theme.backgroundSecondaryColor url("$xwiki.getSkinFile('icons/xwiki/diff-header.png')") no-repeat 50% -30px; + background: $theme.backgroundSecondaryColor $themeI.diffIcon no-repeat 50% -30px; color: $theme.textPrimaryColor; font-size: .9em; text-align: center; @@ -741,7 +742,7 @@ } .xwikirenderingerror { - background: $theme.backgroundSecondaryColor url("$xwiki.getSkinFile('icons/silk/exclamation.gif')") no-repeat 8px 50%; + background: $theme.backgroundSecondaryColor $themeI.errorIcon no-repeat 8px 50%; border: 1px dotted $theme.borderColor; color: #e14726; display: block; @@ -971,132 +972,132 @@ /* Icons */ .actionmenu .tmCreate { - background-image: url("$xwiki.getSkinFile('icons/silk/add.gif')"); + background-image: $!themeI.addIcon; background-position: 10px 3px; } .actionmenu .tmWiki { - background-image: url("$xwiki.getSkinFile('icons/silk/world.gif')"); + background-image: $themeI.wikiIcon; } .actionmenu .tmAdminWiki { - background-image: url("$xwiki.getSkinFile('icons/silk/wrench.gif')"); + background-image: $themeI.administrationIcon; } .actionmenu .tmCreateSpace { - background-image: url("$xwiki.getSkinFile('icons/silk/folder_add.gif')"); + background-image: $themeI.addSpaceIcon; } .actionmenu .tmSpace { - background-image: url("$xwiki.getSkinFile('icons/silk/folder.gif')"); + background-image: $themeI.spaceIcon; } .actionmenu .tmAdminSpace { - background-image: url("$xwiki.getSkinFile('icons/silk/wrench.gif')"); + background-image: $themeI.administrationIcon; } .actionmenu .tmPage { - background-image: url("$xwiki.getSkinFile('icons/silk/page_white_text.gif')"); + background-image: $themeI.pageIcon; } .actionmenu .tmCreatePage, .actionmenu .tmCreatePageFromOffice { - background-image: url("$xwiki.getSkinFile('icons/silk/page_white_add.gif')"); + background-image: $themeI.addPageIcon; } .actionmenu .tmCreateComment { - background-image: url("$xwiki.getSkinFile('icons/silk/comment_add.gif')"); + background-image: $themeI.addCommentIcon; } .actionmenu .tmCreateAttachment{ - background-image: url("$xwiki.getSkinFile('icons/xwiki/attach_add.gif')"); + background-image: $themeI.addAttachmentIcon; } .actionmenu .tmEdit { - background-image: url("$xwiki.getSkinFile('icons/silk/page_white_edit.gif')"); + background-image: $themeI.editWYSIWYGIcon; } .actionmenu .tmEditWiki, .actionmenu .tmViewSource { - background-image: url("$xwiki.getSkinFile('icons/silk/page_white_code.gif')"); + background-image: $themeI.sourceIcon; } .actionmenu .tmEditWysiwyg { - background-image: url("$xwiki.getSkinFile('icons/silk/page_white_edit.gif')"); + background-image: $themeI.editWYSIWYGIcon; } .actionmenu .tmEditInline { - background-image: url("$xwiki.getSkinFile('icons/silk/application_form.gif')"); + background-image: $themeI.editInlineIcon; } .actionmenu .tmEditRights { - background-image: url("$xwiki.getSkinFile('icons/silk/lock.gif')"); + background-image: $themeI.rightsIcon; } .actionmenu .tmEditObject { - background-image: url("$xwiki.getSkinFile('icons/silk/brick.gif')"); + background-image: $themeI.objectsIcon; } .actionmenu .tmEditClass { - background-image: url("$xwiki.getSkinFile('icons/silk/box.gif')"); + background-image: $themeI.classIcon; } .actionmenu .tmExportPdf { - background-image: url("$xwiki.getSkinFile('icons/silk/page_white_acrobat.gif')"); + background-image: $themeI.exportPDFIcon; } .actionmenu .tmExportRtf { - background-image: url("$xwiki.getSkinFile('icons/silk/page_white_word.gif')"); + background-image: $themeI.exportRTFIcon; } .actionmenu .tmExportHtml { - background-image: url("$xwiki.getSkinFile('icons/silk/page_white_world.gif')"); + background-image: $themeI.exportHTMLIcon; } .actionmenu .tmExportXar { - background-image: url("$xwiki.getSkinFile('icons/silk/page_white_compressed.gif')"); + background-image: $themeI.exportXARIcon; } .actionmenu .tmPrintPreview { - background-image: url("$xwiki.getSkinFile('icons/silk/page_white_magnify.gif')"); + background-image: $themeI.actionPrintPreviewIcon; } .actionmenu .tmActionDelete { - background-image: url("$xwiki.getSkinFile('icons/silk/cross.gif')"); + background-image:$themeI.actionDeleteIcon; } .actionmenu .tmActionRename { - background-image: url("$xwiki.getSkinFile('icons/silk/textfield_rename.gif')"); + background-image: $themeI.actionRenameIcon; } .actionmenu .tmActionCopy { - background-image: url("$xwiki.getSkinFile('icons/silk/page_white_copy.gif')"); + background-image: $themeI.actionCopyIcon; } .actionmenu .tmUser { - background-image: url("$xwiki.getSkinFile('icons/silk/user.gif')"); + background-image: $themeI.userIcon; } .actionmenu .tmProfile { - background-image: url("$xwiki.getSkinFile('icons/silk/vcard.gif')"); + background-image: $themeI.profileIcon; } .actionmenu .tmUserPreferences { - background-image: url("$xwiki.getSkinFile('icons/silk/wrench.gif')"); + background-image: $themeI.administrationIcon; } .actionmenu .tmWatchlistManager { - background-image: url("$xwiki.getSkinFile('icons/silk/star.gif')"); + background-image: $themeI.unwatchIcon; } .actionmenu .tmWatchWiki, .actionmenu .tmWatchSpace, .actionmenu .tmWatchDocument { - background-image: url("$xwiki.getSkinFile('icons/xwiki/star-gray.png')"); + background-image: $themeI.watchIcon; } .actionmenu .tmUnwatchWiki, .actionmenu .tmUnwatchSpace, .actionmenu .tmUnwatchDocument { - background-image: url("$xwiki.getSkinFile('icons/xwiki/star-yellow.png')"); + background-image: $themeI.unwatchIcon; } .actionmenu .tmWikiDocumentIndex, .actionmenu .tmSpaceDocumentIndex { - background-image: url("$xwiki.getSkinFile('icons/silk/book_open.gif')"); + background-image: $themeI.indexIcon; } /* @group BUTTONS */ @@ -1272,19 +1273,19 @@ } ul.xlist li.space { - background-image: url("$xwiki.getSkinFile('icons/silk/folder.gif')"); + background-image: $themeI.spaceIcon; } ul.xlist li.page { - background-image: url("$xwiki.getSkinFile('icons/silk/page_white_text.gif')"); + background-image: $themeI.pageIcon; } ul.xlist li.comment { - background-image: url("$xwiki.getSkinFile('icons/silk/comment.gif')"); + background-image: $themeI.commentIcon; } ul.xlist li.attachment { - background-image: url("$xwiki.getSkinFile('icons/silk/attach.gif')"); + background-image: $themeI.attachmentIcon; padding-bottom: 0; } @@ -1328,17 +1329,17 @@ } .infomessage { - background-image: url("$xwiki.getSkinFile('icons/silk/information.gif')"); + background-image: $themeI.infoIcon; color: #369; } .warningmessage { - background-image: url("$xwiki.getSkinFile('icons/silk/error.gif')"); + background-image: $themeI.warningIcon; color: #D5A13D; } .errormessage { - background-image: url("$xwiki.getSkinFile('icons/silk/exclamation.gif')"); + background-image: $themeI.errorIcon; color: #e14726; } @@ -1408,7 +1409,7 @@ /* Note that h6 styling is provided in order to ensure backward compatibility after XSCOLIBRI-160 */ .accordionTabTitleBar h1, .accordionTabTitleBar h6 { display:block; - background: $theme.panelHeaderBackgroundColor url("$xwiki.getSkinFile('icons/xwiki/accordion.png')") no-repeat left; + background: $theme.panelHeaderBackgroundColor $themeI.arrowUpDownIcon no-repeat left; border-bottom: 1px solid $theme.borderColor; border-top: 1px solid $theme.pageContentBackgroundColor; color: $theme.panelHeaderTextColor;