diff --git a/core/src/main/java/hudson/model/DirectoryBrowserSupport.java b/core/src/main/java/hudson/model/DirectoryBrowserSupport.java index c6c595becd..1df1e1ab69 100644 --- a/core/src/main/java/hudson/model/DirectoryBrowserSupport.java +++ b/core/src/main/java/hudson/model/DirectoryBrowserSupport.java @@ -659,16 +659,16 @@ public final class DirectoryBrowserSupport implements HttpResponse { public String getIconName() { if (isReadable) - return isFolder ? "folder.png" : "text.png"; + return isFolder ? "folder.svg" : "document.svg"; else - return isFolder ? "folder-error.png" : "text-error.png"; + return isFolder ? "folder-delete.svg" : "document-delete.svg"; } public String getIconClassName() { if (isReadable) - return isFolder ? "icon-folder" : "icon-text"; + return isFolder ? "icon-folder" : "icon-document"; else - return isFolder ? "icon-folder-error" : "icon-text-error"; + return isFolder ? "icon-folder-delete" : "icon-document-delete"; } public long getSize() { diff --git a/core/src/main/java/org/jenkins/ui/icon/IconSet.java b/core/src/main/java/org/jenkins/ui/icon/IconSet.java index 280f010278..fdc1c1edca 100644 --- a/core/src/main/java/org/jenkins/ui/icon/IconSet.java +++ b/core/src/main/java/org/jenkins/ui/icon/IconSet.java @@ -329,7 +329,6 @@ public class IconSet { icons.addIcon(new Icon("icon-edit-delete icon-sm", "16x16/edit-delete.gif", Icon.ICON_SMALL_STYLE)); icons.addIcon(new Icon("icon-edit-select-all icon-sm", "16x16/edit-select-all.gif", Icon.ICON_SMALL_STYLE)); icons.addIcon(new Icon("icon-empty icon-sm", "16x16/empty.gif", Icon.ICON_SMALL_STYLE)); - icons.addIcon(new Icon("icon-folder-error icon-sm", "16x16/folder-error.gif", Icon.ICON_SMALL_STYLE)); icons.addIcon(new Icon("icon-folder-open icon-sm", "16x16/folder-open.gif", Icon.ICON_SMALL_STYLE)); icons.addIcon(new Icon("icon-green icon-sm", "16x16/green.gif", Icon.ICON_SMALL_STYLE)); icons.addIcon(new Icon("icon-green-anime icon-sm", "16x16/green_anime.gif", Icon.ICON_SMALL_STYLE)); @@ -344,8 +343,6 @@ public class IconSet { icons.addIcon(new BuildStatusIcon("icon-nobuilt-anime icon-sm", "build-status/build-status-sprite.svg#never-built", Icon.ICON_SMALL_STYLE, true)); icons.addIcon(new BuildStatusIcon("icon-red icon-sm", "build-status/build-status-sprite.svg#last-failed", Icon.ICON_SMALL_STYLE)); icons.addIcon(new BuildStatusIcon("icon-red-anime icon-sm", "build-status/build-status-sprite.svg#last-failed", Icon.ICON_SMALL_STYLE, true)); - icons.addIcon(new Icon("icon-text-error icon-sm", "16x16/text-error.gif", Icon.ICON_SMALL_STYLE)); - icons.addIcon(new Icon("icon-text icon-sm", "16x16/text.gif", Icon.ICON_SMALL_STYLE)); icons.addIcon(new BuildStatusIcon("icon-yellow icon-sm", "build-status/build-status-sprite.svg#last-unstable", Icon.ICON_SMALL_STYLE)); icons.addIcon(new BuildStatusIcon("icon-yellow-anime icon-sm", "build-status/build-status-sprite.svg#last-unstable", Icon.ICON_SMALL_STYLE, true)); icons.addIcon(new Icon("icon-collapse icon-sm", "16x16/collapse.png", Icon.ICON_SMALL_STYLE)); @@ -355,7 +352,6 @@ public class IconSet { icons.addIcon(new Icon("icon-edit-select-all icon-sm", "16x16/edit-select-all.png", Icon.ICON_SMALL_STYLE)); icons.addIcon(new Icon("icon-empty icon-sm", "16x16/empty.png", Icon.ICON_SMALL_STYLE)); icons.addIcon(new Icon("icon-expand icon-sm", "16x16/expand.png", Icon.ICON_SMALL_STYLE)); - icons.addIcon(new Icon("icon-folder-error icon-sm", "16x16/folder-error.png", Icon.ICON_SMALL_STYLE)); icons.addIcon(new Icon("icon-folder-open icon-sm", "16x16/folder-open.png", Icon.ICON_SMALL_STYLE)); icons.addIcon(new Icon("icon-go-next icon-sm", "16x16/go-next.png", Icon.ICON_SMALL_STYLE)); icons.addIcon(new BuildStatusIcon("icon-grey icon-sm", "build-status/build-status-sprite.svg#never-built", Icon.ICON_SMALL_STYLE)); diff --git a/core/src/main/resources/hudson/model/DirectoryBrowserSupport/dir.jelly b/core/src/main/resources/hudson/model/DirectoryBrowserSupport/dir.jelly index 6ab362f305..d0afa4d630 100644 --- a/core/src/main/resources/hudson/model/DirectoryBrowserSupport/dir.jelly +++ b/core/src/main/resources/hudson/model/DirectoryBrowserSupport/dir.jelly @@ -39,7 +39,7 @@ THE SOFTWARE. / - + diff --git a/core/src/main/resources/hudson/model/Run/artifacts-index.jelly b/core/src/main/resources/hudson/model/Run/artifacts-index.jelly index 67a057e8ea..4a5f41c21b 100644 --- a/core/src/main/resources/hudson/model/Run/artifacts-index.jelly +++ b/core/src/main/resources/hudson/model/Run/artifacts-index.jelly @@ -33,7 +33,7 @@ THE SOFTWARE. - + ${f.displayPath} diff --git a/core/src/main/resources/lib/hudson/artifactList.jelly b/core/src/main/resources/lib/hudson/artifactList.jelly index 59bb5d4a90..d4909b1731 100644 --- a/core/src/main/resources/lib/hudson/artifactList.jelly +++ b/core/src/main/resources/lib/hudson/artifactList.jelly @@ -55,7 +55,7 @@ THE SOFTWARE. - + ${f.displayPath} diff --git a/war/src/main/webapp/images/16x16/folder-error.gif b/war/src/main/webapp/images/16x16/folder-error.gif deleted file mode 100644 index 2ff8d9cf96..0000000000 Binary files a/war/src/main/webapp/images/16x16/folder-error.gif and /dev/null differ diff --git a/war/src/main/webapp/images/16x16/folder-error.png b/war/src/main/webapp/images/16x16/folder-error.png deleted file mode 100644 index 2bb8d12050..0000000000 Binary files a/war/src/main/webapp/images/16x16/folder-error.png and /dev/null differ diff --git a/war/src/main/webapp/images/16x16/text-error.gif b/war/src/main/webapp/images/16x16/text-error.gif deleted file mode 100644 index 6dbdbbdf56..0000000000 Binary files a/war/src/main/webapp/images/16x16/text-error.gif and /dev/null differ diff --git a/war/src/main/webapp/images/16x16/text-error.png b/war/src/main/webapp/images/16x16/text-error.png deleted file mode 100644 index e1c0cbe263..0000000000 Binary files a/war/src/main/webapp/images/16x16/text-error.png and /dev/null differ diff --git a/war/src/main/webapp/images/16x16/text.gif b/war/src/main/webapp/images/16x16/text.gif deleted file mode 100644 index df68a9d5a7..0000000000 Binary files a/war/src/main/webapp/images/16x16/text.gif and /dev/null differ diff --git a/war/src/main/webapp/images/16x16/text.png b/war/src/main/webapp/images/16x16/text.png deleted file mode 100644 index a82aaac503..0000000000 Binary files a/war/src/main/webapp/images/16x16/text.png and /dev/null differ