Browse Source

SONAR-12807 Put all ALM icons in a single location

tags/9.4.0.54424
Wouter Admiraal 2 years ago
parent
commit
28c665b012

+ 1
- 1
server/sonar-auth-github/src/main/java/org/sonar/auth/github/GitHubIdentityProvider.java View File

@@ -62,7 +62,7 @@ public class GitHubIdentityProvider implements OAuth2IdentityProvider {
@Override
public Display getDisplay() {
return Display.builder()
.setIconPath("/images/github.svg")
.setIconPath("/images/alm/github-white.svg")
.setBackgroundColor("#444444")
.build();
}

+ 1
- 1
server/sonar-auth-github/src/test/java/org/sonar/auth/github/GitHubIdentityProviderTest.java View File

@@ -43,7 +43,7 @@ public class GitHubIdentityProviderTest {
public void check_fields() {
assertThat(underTest.getKey()).isEqualTo("github");
assertThat(underTest.getName()).isEqualTo("GitHub");
assertThat(underTest.getDisplay().getIconPath()).isEqualTo("/images/github.svg");
assertThat(underTest.getDisplay().getIconPath()).isEqualTo("/images/alm/github-white.svg");
assertThat(underTest.getDisplay().getBackgroundColor()).isEqualTo("#444444");
}


+ 1
- 1
server/sonar-auth-gitlab/src/main/java/org/sonar/auth/gitlab/GitLabIdentityProvider.java View File

@@ -65,7 +65,7 @@ public class GitLabIdentityProvider implements OAuth2IdentityProvider {
@Override
public Display getDisplay() {
return Display.builder()
.setIconPath("/images/gitlab-icon-rgb.svg")
.setIconPath("/images/alm/gitlab.svg")
.setBackgroundColor("#6a4fbb")
.build();
}

+ 1
- 1
server/sonar-auth-gitlab/src/test/java/org/sonar/auth/gitlab/GitLabIdentityProviderTest.java View File

@@ -42,7 +42,7 @@ public class GitLabIdentityProviderTest {
assertThat(gitLabIdentityProvider.getKey()).isEqualTo("gitlab");
assertThat(gitLabIdentityProvider.getName()).isEqualTo("GitLab");
Display display = gitLabIdentityProvider.getDisplay();
assertThat(display.getIconPath()).isEqualTo("/images/gitlab-icon-rgb.svg");
assertThat(display.getIconPath()).isEqualTo("/images/alm/gitlab.svg");
assertThat(display.getBackgroundColor()).isEqualTo("#6a4fbb");
assertThat(gitLabIdentityProvider.isEnabled()).isTrue();
assertThat(gitLabIdentityProvider.allowsUsersToSignUp()).isTrue();

server/sonar-web/public/images/github.svg → server/sonar-web/public/images/alm/github-white.svg View File


+ 0
- 1
server/sonar-web/public/images/gitlab-icon-rgb.svg View File

@@ -1 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" data-name="logo art" width="342.95477391269446" height="318.78894492590746" style=""><rect id="backgroundrect" width="100%" height="100%" x="0" y="0" fill="none" stroke="none"/><defs><style>.cls-1{fill:#fc6d26;}.cls-2{fill:#e24329;}.cls-3{fill:#fca326;}</style></defs><title>gitlab-icon-rgb</title><g class="currentLayer" style=""><title>Layer 1</title><g id="g44" class=""><path id="path46" class="cls-1" d="M339.56196038246156,180.72447212219237 l-18.91,-58.12 L283.2319603824615,7.32447212219239 a6.47,6.47 0 0 0 -12.27,0 L233.54196038246153,122.53447212219237 H109.21196038246154 L71.79196038246155,7.32447212219239 a6.46,6.46 0 0 0 -12.26,0 L22.17196038246155,122.53447212219237 l-18.91,58.19 a12.88,12.88 0 0 0 4.66,14.39 L171.39196038246155,313.8944721221924 L334.83196038246155,195.1144721221924 a12.9,12.9 0 0 0 4.73,-14.39 "/></g><g id="g48" class=""><path id="path50" class="cls-2" d="M171.39196038246155,313.8044721221924 h0 l62.16,-191.28 H109.26196038246155 L171.39196038246155,313.8044721221924 z"/></g><g id="g56" class=""><path id="path58" class="cls-1" d="M171.39196038246155,313.8044721221924 L109.21196038246154,122.52447212219238 h-87 L171.39196038246155,313.8044721221924 z"/></g><g id="g64" class=""><path id="path66" class="cls-3" d="M22.141960382461548,122.58447212219238 h0 l-18.91,58.12 a12.88,12.88 0 0 0 4.66,14.39 L171.39196038246155,313.8944721221924 L22.141960382461548,122.58447212219238 z"/></g><g id="g72" class=""><path id="path74" class="cls-2" d="M22.17196038246155,122.58447212219238 h87.11 L71.79196038246155,7.384472122192392 a6.47,6.47 0 0 0 -12.27,0 l-37.35,115.2 z"/></g><g id="g76" class=""><path id="path78" class="cls-1" d="M171.39196038246155,313.8044721221924 l62.16,-191.28 H320.69196038246156 L171.39196038246155,313.8044721221924 z"/></g><g id="g80" class=""><path id="path82" class="cls-3" d="M320.63196038246156,122.58447212219238 h0 l18.91,58.12 a12.85,12.85 0 0 1 -4.66,14.39 L171.39196038246155,313.8044721221924 l149.2,-191.22 z"/></g><g id="g84" class=""><path id="path86" class="cls-2" d="M320.6719603824615,122.58447212219238 h-87.1 l37.42,-115.2 a6.46,6.46 0 0 1 12.26,0 l37.42,115.2 z"/></g></g></svg>

+ 1
- 1
server/sonar-web/src/main/js/apps/account/profile/__tests__/UserExternalIdentity-test.tsx View File

@@ -28,7 +28,7 @@ jest.mock('../../../../api/users', () => ({
identityProviders: [
{
backgroundColor: '#444444',
iconPath: '/images/github.svg',
iconPath: '/images/alm/github-white.svg',
key: 'github',
name: 'GitHub'
}

+ 1
- 1
server/sonar-web/src/main/js/apps/account/profile/__tests__/__snapshots__/UserExternalIdentity-test.tsx.snap View File

@@ -21,7 +21,7 @@ exports[`should render correctly 1`] = `
alt="GitHub"
className="little-spacer-right"
height="14"
src="/images/github.svg"
src="/images/alm/github-white.svg"
width="14"
/>

Loading…
Cancel
Save