diff --git a/pom.xml b/pom.xml index cfffb2d3d..a8997bd87 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ jenkinsci/${project.artifactId}-plugin 2.2.0 8 - 2.277.1 + 2.283 true diff --git a/src/main/java/org/jenkinsci/plugins/github_branch_source/GitHubSCMNavigator.java b/src/main/java/org/jenkinsci/plugins/github_branch_source/GitHubSCMNavigator.java index d44adb13e..425bef352 100644 --- a/src/main/java/org/jenkinsci/plugins/github_branch_source/GitHubSCMNavigator.java +++ b/src/main/java/org/jenkinsci/plugins/github_branch_source/GitHubSCMNavigator.java @@ -83,6 +83,7 @@ import net.jcip.annotations.GuardedBy; import org.apache.commons.lang.StringUtils; import org.jenkins.ui.icon.Icon; +import org.jenkins.ui.icon.IconFormat; import org.jenkins.ui.icon.IconSet; import org.jenkins.ui.icon.IconSpec; import org.jenkinsci.Symbol; @@ -1776,65 +1777,77 @@ public List>> getTraitsDefaults() { IconSet.icons.addIcon( new Icon( "icon-github-logo icon-sm", - "plugin/github-branch-source/images/16x16/github-logo.png", - Icon.ICON_SMALL_STYLE)); + "plugin/github-branch-source/images/svgs/sprite-github.svg#github-logo", + Icon.ICON_SMALL_STYLE, + IconFormat.EXTERNAL_SVG_SPRITE)); IconSet.icons.addIcon( new Icon( "icon-github-logo icon-md", - "plugin/github-branch-source/images/24x24/github-logo.png", - Icon.ICON_MEDIUM_STYLE)); + "plugin/github-branch-source/images/svgs/sprite-github.svg#github-logo", + Icon.ICON_MEDIUM_STYLE, + IconFormat.EXTERNAL_SVG_SPRITE)); IconSet.icons.addIcon( new Icon( "icon-github-logo icon-lg", - "plugin/github-branch-source/images/32x32/github-logo.png", - Icon.ICON_LARGE_STYLE)); + "plugin/github-branch-source/images/svgs/sprite-github.svg#github-logo", + Icon.ICON_LARGE_STYLE, + IconFormat.EXTERNAL_SVG_SPRITE)); IconSet.icons.addIcon( new Icon( "icon-github-logo icon-xlg", - "plugin/github-branch-source/images/48x48/github-logo.png", - Icon.ICON_XLARGE_STYLE)); + "plugin/github-branch-source/images/svgs/sprite-github.svg#github-logo", + Icon.ICON_XLARGE_STYLE, + IconFormat.EXTERNAL_SVG_SPRITE)); IconSet.icons.addIcon( new Icon( "icon-github-repo icon-sm", - "plugin/github-branch-source/images/16x16/github-repo.png", - Icon.ICON_SMALL_STYLE)); + "plugin/github-branch-source/images/svgs/sprite-github.svg#github-repo", + Icon.ICON_SMALL_STYLE, + IconFormat.EXTERNAL_SVG_SPRITE)); IconSet.icons.addIcon( new Icon( "icon-github-repo icon-md", - "plugin/github-branch-source/images/24x24/github-repo.png", - Icon.ICON_MEDIUM_STYLE)); + "plugin/github-branch-source/images/svgs/sprite-github.svg#github-repo", + Icon.ICON_MEDIUM_STYLE, + IconFormat.EXTERNAL_SVG_SPRITE)); IconSet.icons.addIcon( new Icon( "icon-github-repo icon-lg", - "plugin/github-branch-source/images/32x32/github-repo.png", - Icon.ICON_LARGE_STYLE)); + "plugin/github-branch-source/images/svgs/sprite-github.svg#github-repo", + Icon.ICON_LARGE_STYLE, + IconFormat.EXTERNAL_SVG_SPRITE)); IconSet.icons.addIcon( new Icon( "icon-github-repo icon-xlg", - "plugin/github-branch-source/images/48x48/github-repo.png", - Icon.ICON_XLARGE_STYLE)); + "github-branch-source/images/svgs/sprite-github.svg#github-repo", + Icon.ICON_XLARGE_STYLE, + IconFormat.EXTERNAL_SVG_SPRITE)); IconSet.icons.addIcon( new Icon( "icon-github-branch icon-sm", - "plugin/github-branch-source/images/16x16/github-branch.png", - Icon.ICON_SMALL_STYLE)); + "plugin/github-branch-source/images/svgs/sprite-github.svg#git-branch", + Icon.ICON_SMALL_STYLE, + IconFormat.EXTERNAL_SVG_SPRITE)); IconSet.icons.addIcon( new Icon( "icon-github-branch icon-md", - "plugin/github-branch-source/images/24x24/github-branch.png", - Icon.ICON_MEDIUM_STYLE)); + "plugin/github-branch-source/images/svgs/sprite-github.svg#git-branch", + Icon.ICON_MEDIUM_STYLE, + IconFormat.EXTERNAL_SVG_SPRITE)); IconSet.icons.addIcon( new Icon( "icon-github-branch icon-lg", - "plugin/github-branch-source/images/32x32/github-branch.png", - Icon.ICON_LARGE_STYLE)); + "plugin/github-branch-source/images/svgs/sprite-github.svg#git-branch", + Icon.ICON_LARGE_STYLE, + IconFormat.EXTERNAL_SVG_SPRITE)); IconSet.icons.addIcon( new Icon( "icon-github-branch icon-xlg", - "plugin/github-branch-source/images/48x48/github-branch.png", - Icon.ICON_XLARGE_STYLE)); + "plugin/github-branch-source/images/svgs/sprite-github.svg#git-branch", + Icon.ICON_XLARGE_STYLE, + IconFormat.EXTERNAL_SVG_SPRITE)); } } diff --git a/src/main/webapp/images/16x16/github-branch.png b/src/main/webapp/images/16x16/github-branch.png deleted file mode 100644 index 50bee5ced..000000000 Binary files a/src/main/webapp/images/16x16/github-branch.png and /dev/null differ diff --git a/src/main/webapp/images/16x16/github-repo.png b/src/main/webapp/images/16x16/github-repo.png deleted file mode 100644 index 8b066c9a6..000000000 Binary files a/src/main/webapp/images/16x16/github-repo.png and /dev/null differ diff --git a/src/main/webapp/images/24x24/github-branch.png b/src/main/webapp/images/24x24/github-branch.png deleted file mode 100644 index 97e02334f..000000000 Binary files a/src/main/webapp/images/24x24/github-branch.png and /dev/null differ diff --git a/src/main/webapp/images/24x24/github-repo.png b/src/main/webapp/images/24x24/github-repo.png deleted file mode 100644 index 3ccfa3b3b..000000000 Binary files a/src/main/webapp/images/24x24/github-repo.png and /dev/null differ diff --git a/src/main/webapp/images/32x32/github-branch.png b/src/main/webapp/images/32x32/github-branch.png deleted file mode 100644 index fcd485ed8..000000000 Binary files a/src/main/webapp/images/32x32/github-branch.png and /dev/null differ diff --git a/src/main/webapp/images/32x32/github-repo.png b/src/main/webapp/images/32x32/github-repo.png deleted file mode 100644 index 9c2102250..000000000 Binary files a/src/main/webapp/images/32x32/github-repo.png and /dev/null differ diff --git a/src/main/webapp/images/48x48/github-branch.png b/src/main/webapp/images/48x48/github-branch.png deleted file mode 100644 index 4a1a94065..000000000 Binary files a/src/main/webapp/images/48x48/github-branch.png and /dev/null differ diff --git a/src/main/webapp/images/48x48/github-repo.png b/src/main/webapp/images/48x48/github-repo.png deleted file mode 100644 index 227787a7d..000000000 Binary files a/src/main/webapp/images/48x48/github-repo.png and /dev/null differ diff --git a/src/main/webapp/images/svgs/sprite-github.svg b/src/main/webapp/images/svgs/sprite-github.svg new file mode 100644 index 000000000..0f41928da --- /dev/null +++ b/src/main/webapp/images/svgs/sprite-github.svg @@ -0,0 +1,12 @@ + + + + + + + + + + \ No newline at end of file