Skip to content

Commit 1ff0db8

Browse files
committed
Fixed icons
1 parent 39ee2ae commit 1ff0db8

File tree

11 files changed

+128
-22
lines changed

11 files changed

+128
-22
lines changed

src/Exceptionless.Web/ClientApp/src/lib/assets/google.svg

-1
This file was deleted.

src/Exceptionless.Web/ClientApp/src/lib/assets/microsoft.svg

-1
This file was deleted.

src/Exceptionless.Web/ClientApp/src/lib/assets/slack.svg

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
<script lang="ts">
2+
import type { HTMLAttributes } from 'svelte/elements';
3+
4+
type MicrosoftIconProps = HTMLAttributes<SVGSVGElement> & {
5+
class?: string;
6+
fill?: string;
7+
height?: number;
8+
stroke?: string;
9+
width?: number;
10+
};
11+
12+
const { class: className = '', fill = 'currentColor', height = 24, stroke = '', width = 24, ...rest }: MicrosoftIconProps = $props();
13+
</script>
14+
15+
<svg
16+
xmlns="http://www.w3.org/2000/svg"
17+
viewBox={`0 0 ${width} ${height}`}
18+
{width}
19+
{height}
20+
{fill}
21+
{stroke}
22+
class={className}
23+
aria-label="Google icon"
24+
{...rest}
25+
>
26+
><path
27+
d="M21.35,11.1H12.18V13.83H18.69C18.36,17.64 15.19,19.27 12.19,19.27C8.36,19.27 5,16.25 5,12C5,7.9 8.2,4.73 12.2,4.73C15.29,4.73 17.1,6.7 17.1,6.7L19,4.72C19,4.72 16.56,2 12.1,2C6.42,2 2.03,6.8 2.03,12C2.03,17.05 6.16,22 12.25,22C17.6,22 21.5,18.33 21.5,12.91C21.5,11.76 21.35,11.1 21.35,11.1V11.1Z"
28+
/>
29+
</svg>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<script lang="ts">
2+
import type { HTMLAttributes } from 'svelte/elements';
3+
4+
type MicrosoftIconProps = HTMLAttributes<SVGSVGElement> & {
5+
class?: string;
6+
fill?: string;
7+
height?: number;
8+
stroke?: string;
9+
width?: number;
10+
};
11+
12+
const { class: className = '', fill = 'currentColor', height = 24, stroke = '', width = 24, ...rest }: MicrosoftIconProps = $props();
13+
</script>
14+
15+
<svg
16+
xmlns="http://www.w3.org/2000/svg"
17+
viewBox={`0 0 ${width} ${height}`}
18+
{width}
19+
{height}
20+
{fill}
21+
{stroke}
22+
class={className}
23+
aria-label="Microsoft icon"
24+
{...rest}
25+
>
26+
<path d="M2,3H11V12H2V3M11,22H2V13H11V22M21,3V12H12V3H21M21,22H12V13H21V22Z" />
27+
</svg>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
<script lang="ts">
2+
import type { HTMLAttributes } from 'svelte/elements';
3+
4+
type MicrosoftIconProps = HTMLAttributes<SVGSVGElement> & {
5+
class?: string;
6+
fill?: string;
7+
height?: number;
8+
stroke?: string;
9+
width?: number;
10+
};
11+
12+
const { class: className = '', fill = 'none', height = 24, stroke = 'currentColor', width = 24, ...rest }: MicrosoftIconProps = $props();
13+
</script>
14+
15+
<svg
16+
xmlns="http://www.w3.org/2000/svg"
17+
viewBox={`0 0 ${width} ${height}`}
18+
{width}
19+
{height}
20+
{fill}
21+
{stroke}
22+
class={className}
23+
stroke-width="2"
24+
stroke-linecap="round"
25+
stroke-linejoin="round"
26+
aria-label="Slack icon"
27+
{...rest}
28+
>
29+
<rect width="3" height="8" x="13" y="2" rx="1.5" />
30+
<path d="M19 8.5V10h1.5A1.5 1.5 0 1 0 19 8.5" />
31+
<rect width="3" height="8" x="8" y="14" rx="1.5" /><path d="M5 15.5V14H3.5A1.5 1.5 0 1 0 5 15.5" /><rect width="8" height="3" x="14" y="13" rx="1.5" /><path
32+
d="M15.5 19H14v1.5a1.5 1.5 0 1 0 1.5-1.5"
33+
/><rect width="8" height="3" x="2" y="8" rx="1.5" /><path d="M8.5 5H10V3.5A1.5 1.5 0 1 0 8.5 5" />
34+
</svg>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<script lang="ts">
2+
import type { HTMLAttributes } from 'svelte/elements';
3+
4+
type MicrosoftIconProps = HTMLAttributes<SVGSVGElement> & {
5+
class?: string;
6+
fill?: string;
7+
height?: number;
8+
stroke?: string;
9+
width?: number;
10+
};
11+
12+
const { class: className = '', fill = 'currentColor', height = 16, stroke = '', width = 16, ...rest }: MicrosoftIconProps = $props();
13+
</script>
14+
15+
<svg xmlns="http://www.w3.org/2000/svg" viewBox={`0 0 ${width} ${height}`} {width} {height} {fill} {stroke} class={className} aria-label="X icon" {...rest}>
16+
<path
17+
d="M12.6.75h2.454l-5.36 6.142L16 15.25h-4.937l-3.867-5.07-4.425 5.07H.316l5.733-6.57L0 .75h5.063l3.495 4.633L12.601.75Zm-.86 13.028h1.36L4.323 2.145H2.865z"
18+
/>
19+
</svg>

src/Exceptionless.Web/ClientApp/src/routes/(app)/(components)/layouts/footer.svelte

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<script lang="ts">
2+
import XIcon from '$comp/icons/XIcon.svelte';
23
import { A } from '$comp/typography';
34
import { getAboutQuery } from '$features/status/api.svelte';
45
import Facebook from '@lucide/svelte/icons/facebook';
56
import GitHub from '@lucide/svelte/icons/github';
67
import Web from '@lucide/svelte/icons/globe';
7-
import Twitter from '@lucide/svelte/icons/twitter';
88
99
const currentYear = new Date().getFullYear();
1010
@@ -44,10 +44,10 @@
4444
<A aria-label="Exceptionless Facebook Website" href="https://www.facebook.com/exceptionless/" target="_blank" variant="navigation">
4545
<Facebook class="size-5" />
4646
</A>
47-
<A aria-label="Exceptionless Twitter Website" href="https://x.com/Exceptionless" target="_blank" variant="navigation">
48-
<Twitter class="size-5" />
47+
<A aria-label="Exceptionless X Website" href="https://x.com/Exceptionless" target="_blank" variant="navigation">
48+
<XIcon class="size-5" />
4949
</A>
50-
<A aria-label="Exceptionless GitHub Website" href="https://github.com/exceptionless" target="_blank" variant="navigation">
50+
<A aria-label="Exceptionless GitHub Repository" href="https://github.com/exceptionless" target="_blank" variant="navigation">
5151
<GitHub class="size-5" />
5252
</A>
5353
<A aria-label="Exceptionless Website" href="https://exceptionless.com/" target="_blank" variant="navigation">

src/Exceptionless.Web/ClientApp/src/routes/(app)/account/security/+page.svelte

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
<script lang="ts">
22
import ErrorMessage from '$comp/error-message.svelte';
33
import PasswordInput from '$comp/form/password-input.svelte';
4+
import GoogleIcon from '$comp/icons/GoogleIcon.svelte';
5+
import MicrosoftIcon from '$comp/icons/MicrosoftIcon.svelte';
46
import Loading from '$comp/loading.svelte';
57
import { H3, Muted } from '$comp/typography';
68
import { Button } from '$comp/ui/button';
@@ -17,8 +19,6 @@
1719
microsoftClientId
1820
} from '$features/auth/index.svelte';
1921
import { User } from '$features/users/models';
20-
import Google from '$lib/assets/google.svg';
21-
import Microsoft from '$lib/assets/microsoft.svg';
2222
import { useFetchClientStatus } from '$shared/api/api.svelte';
2323
import { ProblemDetails, useFetchClient } from '@exceptionless/fetchclient';
2424
import Facebook from '@lucide/svelte/icons/facebook';
@@ -115,7 +115,7 @@
115115
{#if !microsoftClientId}
116116
<li class="pb-4">
117117
<div class="flex items-center space-x-4">
118-
<img alt="Microsoft" src={Microsoft} />
118+
<MicrosoftIcon class="size-4" />
119119
<div class="min-w-0 flex-1 font-semibold">Microsoft account</div>
120120
<div class="inline-flex items-center">
121121
{#if true}
@@ -132,7 +132,7 @@
132132
{#if !googleClientId}
133133
<li class="py-4">
134134
<div class="flex items-center space-x-4">
135-
<img alt="Google" src={Google} />
135+
<GoogleIcon class="size-4" />
136136
<div class="min-w-0 flex-1 font-semibold">Google account</div>
137137
<div class="inline-flex items-center">
138138
{#if false}
@@ -149,7 +149,7 @@
149149
{#if !facebookClientId}
150150
<li class="py-4">
151151
<div class="flex items-center space-x-4">
152-
<Facebook />
152+
<Facebook class="size-4" />
153153
<div class="min-w-0 flex-1 font-semibold">Facebook account</div>
154154
<div class="inline-flex items-center">
155155
{#if false}
@@ -166,7 +166,7 @@
166166
{#if !gitHubClientId}
167167
<li class="py-4">
168168
<div class="flex items-center space-x-4">
169-
<GitHub />
169+
<GitHub class="size-4" />
170170
<div class="min-w-0 flex-1 font-semibold">GitHub account</div>
171171
<div class="inline-flex items-center">
172172
{#if true}

src/Exceptionless.Web/ClientApp/src/routes/(app)/project/[projectId]/integrations/+page.svelte

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
import type { NotificationSettings } from '$features/projects/models';
33
44
import { page } from '$app/state';
5+
import SlackIcon from '$comp/icons/SlackIcon.svelte';
56
import { H3, H4, Muted } from '$comp/typography';
67
import { Button } from '$comp/ui/button';
78
import { Separator } from '$comp/ui/separator';
@@ -24,7 +25,6 @@
2425
import { getTableOptions } from '$features/webhooks/components/table/options.svelte';
2526
import WebhooksDataTable from '$features/webhooks/components/table/webhooks-data-table.svelte';
2627
import { NewWebhook, Webhook } from '$features/webhooks/models';
27-
import Slack from '$lib/assets/slack.svg'; // TOOD: Fix the slack icon to be an svg component
2828
import Plus from '@lucide/svelte/icons/plus';
2929
import Zapier from '@lucide/svelte/icons/zap';
3030
import { createTable } from '@tanstack/svelte-table';
@@ -194,9 +194,9 @@
194194
{#if hasSlackIntegration}
195195
<NotificationSettingsForm settings={slackNotificationSettingsQuery.data} save={updateSlackNotificationSettings} />
196196

197-
<Button onclick={() => (showRemoveSlackDialog = true)}><img class="text- mr-2 size-4" alt="Slack" src={Slack} /> Remove Slack</Button>
197+
<Button onclick={() => (showRemoveSlackDialog = true)}><SlackIcon class="mr-2 size-4" /> Remove Slack</Button>
198198
{:else}
199-
<Button onclick={addSlack}><img class="text- mr-2 size-4" alt="Slack" src={Slack} /> Connect Slack</Button>
199+
<Button onclick={addSlack}><SlackIcon class="mr-2 size-4" /> Connect Slack</Button>
200200
{/if}
201201
</section>
202202
{/if}

src/Exceptionless.Web/ClientApp/src/routes/(auth)/login/+page.svelte

+6-6
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
import { goto } from '$app/navigation';
33
import { page } from '$app/state';
44
import ErrorMessage from '$comp/error-message.svelte';
5+
import GoogleIcon from '$comp/icons/GoogleIcon.svelte';
6+
import MicrosoftIcon from '$comp/icons/MicrosoftIcon.svelte';
57
import Loading from '$comp/loading.svelte';
68
import Logo from '$comp/logo.svelte';
79
import { A, Muted, P } from '$comp/typography';
@@ -23,8 +25,6 @@
2325
microsoftClientId
2426
} from '$features/auth/index.svelte';
2527
import { Login } from '$features/auth/models';
26-
import Google from '$lib/assets/google.svg';
27-
import Microsoft from '$lib/assets/microsoft.svg';
2828
import { applyServerSideErrors } from '$shared/validation';
2929
import Facebook from '@lucide/svelte/icons/facebook';
3030
import GitHub from '@lucide/svelte/icons/github';
@@ -117,22 +117,22 @@
117117
<div class="auto-cols-2 grid grid-flow-col grid-rows-2 gap-4">
118118
{#if microsoftClientId}
119119
<Button aria-label="Login with Microsoft" onclick={() => liveLogin(redirectUrl)}>
120-
<img alt="Microsoft" src={Microsoft} /> Microsoft
120+
<MicrosoftIcon class="size-4" /> Microsoft
121121
</Button>
122122
{/if}
123123
{#if googleClientId}
124124
<Button aria-label="Login with Google" onclick={() => googleLogin(redirectUrl)}>
125-
<img alt="Google" src={Google} /> Google
125+
<GoogleIcon class="size-4" /> Google
126126
</Button>
127127
{/if}
128128
{#if facebookClientId}
129129
<Button aria-label="Login with Facebook" onclick={() => facebookLogin(redirectUrl)}>
130-
<Facebook /> Facebook
130+
<Facebook class="size-4" /> Facebook
131131
</Button>
132132
{/if}
133133
{#if gitHubClientId}
134134
<Button aria-label="Login with GitHub" onclick={() => githubLogin(redirectUrl)}>
135-
<GitHub /> GitHub
135+
<GitHub class="size-4" /> GitHub
136136
</Button>
137137
{/if}
138138
</div>

0 commit comments

Comments
 (0)