Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change default icon size to 20 #4458

Merged
merged 5 commits into from
Nov 26, 2024
Merged

Change default icon size to 20 #4458

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a308a19
Change default icon size to 20
xoxys Nov 24, 2024
823719d
Merge branch 'main' into default-icon-size
xoxys Nov 25, 2024
8e24204
Merge branch 'main' into default-icon-size
xoxys Nov 25, 2024
df1288c
Merge branch 'main' into default-icon-size
pat-s Nov 26, 2024
3021858
Merge branch 'main' into default-icon-size
xoxys Nov 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 34 additions & 34 deletions web/src/components/atomic/Icon.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,56 +1,56 @@
<!-- cSpell:ignore radiobox timelapse -->
<template>
<SvgIcon v-if="name === 'duration'" :path="mdiTimelapse" size="24" />
<SvgIcon v-else-if="name === 'since'" :path="mdiClockTimeEightOutline" size="24" />
<SvgIcon v-else-if="name === 'push'" :path="mdiSourceBranch" size="24" />
<SvgIcon v-else-if="name === 'pull-request'" :path="mdiSourcePull" size="24" />
<SvgIcon v-else-if="name === 'pull-request-closed'" :path="mdiSourceMerge" size="24" />
<SvgIcon v-else-if="name === 'manual-pipeline'" :path="mdiGestureTap" size="24" />
<SvgIcon v-else-if="name === 'tag'" :path="mdiTagOutline" size="24" />
<SvgIcon v-else-if="name === 'deployment'" :path="mdiPackageVariant" size="24" />
<SvgIcon v-else-if="name === 'commit'" :path="mdiSourceCommit" size="24" />
<SvgIcon v-else-if="name === 'back'" :path="mdiArrowLeft" size="24" />
<SvgIcon v-if="name === 'duration'" :path="mdiTimelapse" size="20" />
<SvgIcon v-else-if="name === 'since'" :path="mdiClockTimeEightOutline" size="20" />
<SvgIcon v-else-if="name === 'push'" :path="mdiSourceBranch" size="20" />
<SvgIcon v-else-if="name === 'pull-request'" :path="mdiSourcePull" size="20" />
<SvgIcon v-else-if="name === 'pull-request-closed'" :path="mdiSourceMerge" size="20" />
<SvgIcon v-else-if="name === 'manual-pipeline'" :path="mdiGestureTap" size="20" />
<SvgIcon v-else-if="name === 'tag'" :path="mdiTagOutline" size="20" />
<SvgIcon v-else-if="name === 'deployment'" :path="mdiPackageVariant" size="20" />
<SvgIcon v-else-if="name === 'commit'" :path="mdiSourceCommit" size="20" />
<SvgIcon v-else-if="name === 'back'" :path="mdiArrowLeft" size="20" />
<SvgIcon v-else-if="name === 'github'" :path="mdiGithub" size="32" />
<SvgIcon v-else-if="name === 'repo'" :path="mdiGit" size="32" />
<SvgIcon v-else-if="name === 'settings'" :path="mdiCog" size="32" />
<SvgIcon v-else-if="name === 'trash'" :path="mdiTrashCanOutline" size="24" />
<SvgIcon v-else-if="name === 'status-blocked'" :path="mdiPlayCircleOutline" size="24" />
<SvgIcon v-else-if="name === 'status-declined'" :path="mdiStopCircleOutline" size="24" />
<SvgIcon v-else-if="name === 'trash'" :path="mdiTrashCanOutline" size="20" />
<SvgIcon v-else-if="name === 'status-blocked'" :path="mdiPlayCircleOutline" size="20" />
<SvgIcon v-else-if="name === 'status-declined'" :path="mdiStopCircleOutline" size="20" />
<SvgIcon
v-else-if="name === 'status-failure' || name === 'status-error' || name === 'status-killed'"
type="mdi"
:path="mdiCloseCircleOutline"
size="24"
size="20"
/>
<SvgIcon v-else-if="name === 'status-pending'" :path="mdiRadioboxBlank" size="24" />
<SvgIcon v-else-if="name === 'status-pending'" :path="mdiRadioboxBlank" size="20" />
<SvgIcon
v-else-if="name === 'status-running' || name === 'status-started'"
type="mdi"
:path="mdiRadioboxIndeterminateVariant"
size="24"
size="20"
/>
<SvgIcon v-else-if="name === 'status-skipped'" :path="mdiMinusCircleOutline" size="24" />
<SvgIcon v-else-if="name === 'status-success'" :path="mdiCheckCircleOutline" size="24" />
<SvgIcon v-else-if="name === 'attention'" :path="mdiAlert" size="24" />
<SvgIcon v-else-if="name === 'status-skipped'" :path="mdiMinusCircleOutline" size="20" />
<SvgIcon v-else-if="name === 'status-success'" :path="mdiCheckCircleOutline" size="20" />
<SvgIcon v-else-if="name === 'attention'" :path="mdiAlert" size="20" />
<SvgIcon v-else-if="name === 'warning'" :path="mdiAlertOutline" size="20" />
<SvgIcon v-else-if="name === 'error'" :path="mdiAlertCircle" size="20" />
<SvgIcon v-else-if="name === 'gitlab'" :path="mdiGitlab" size="32" />
<SvgIcon v-else-if="name === 'bitbucket' || name === 'bitbucket-dc'" :path="mdiBitbucket" size="32" />
<SvgIcon v-else-if="name === 'question'" :path="mdiHelpCircleOutline" size="24" />
<SvgIcon v-else-if="name === 'plus'" :path="mdiPlus" size="24" />
<SvgIcon v-else-if="name === 'list'" :path="mdiFormatListBulleted" size="24" />
<SvgIcon v-else-if="name === 'heal'" :path="mdiBandage" size="24" />
<SvgIcon v-else-if="name === 'turn-off'" :path="mdiPower" size="24" />
<SvgIcon v-else-if="name === 'chevron-right'" :path="mdiChevronRight" size="24" />
<SvgIcon v-else-if="name === 'close'" :path="mdiCloseCircleOutline" size="24" />
<SvgIcon v-else-if="name === 'edit'" :path="mdiPencil" size="24" />
<SvgIcon v-else-if="name === 'download'" :path="mdiDownloadCircle" size="24" />
<SvgIcon v-else-if="name === 'stopwatch'" :path="mdiAlarm" size="24" />
<SvgIcon v-else-if="name === 'auto-scroll'" :path="mdiDownload" size="24" />
<SvgIcon v-else-if="name === 'auto-scroll-off'" :path="mdiDownloadOff" size="24" />
<SvgIcon v-else-if="name === 'pause'" :path="mdiPause" size="24" />
<SvgIcon v-else-if="name === 'play'" :path="mdiPlay" size="24" />
<SvgIcon v-else-if="name === 'remove'" :path="mdiClose" size="24" />
<SvgIcon v-else-if="name === 'question'" :path="mdiHelpCircleOutline" size="20" />
<SvgIcon v-else-if="name === 'plus'" :path="mdiPlus" size="20" />
<SvgIcon v-else-if="name === 'list'" :path="mdiFormatListBulleted" size="20" />
<SvgIcon v-else-if="name === 'heal'" :path="mdiBandage" size="20" />
<SvgIcon v-else-if="name === 'turn-off'" :path="mdiPower" size="20" />
<SvgIcon v-else-if="name === 'chevron-right'" :path="mdiChevronRight" size="20" />
<SvgIcon v-else-if="name === 'close'" :path="mdiCloseCircleOutline" size="20" />
<SvgIcon v-else-if="name === 'edit'" :path="mdiPencil" size="20" />
<SvgIcon v-else-if="name === 'download'" :path="mdiDownloadCircle" size="20" />
<SvgIcon v-else-if="name === 'stopwatch'" :path="mdiAlarm" size="20" />
<SvgIcon v-else-if="name === 'auto-scroll'" :path="mdiDownload" size="20" />
<SvgIcon v-else-if="name === 'auto-scroll-off'" :path="mdiDownloadOff" size="20" />
<SvgIcon v-else-if="name === 'pause'" :path="mdiPause" size="20" />
<SvgIcon v-else-if="name === 'play'" :path="mdiPlay" size="20" />
<SvgIcon v-else-if="name === 'remove'" :path="mdiClose" size="20" />

<SvgIcon v-else-if="name === 'visibility-private'" :path="mdiLockOutline" size="24" />
<SvgIcon v-else-if="name === 'visibility-internal'" :path="mdiLockOpenOutline" size="24" />
Expand Down
2 changes: 1 addition & 1 deletion web/src/components/layout/scaffold/Header.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<Container :full-width="fullWidth" class="!py-0">
<div class="flex w-full md:items-center flex-col py-3 gap-2 md:gap-10 md:flex-row md:justify-between">
<div
class="flex items-center content-start"
class="flex items-center content-start min-h-10"
:class="{
'md:flex-1': searchBoxPresent,
}"
Expand Down
3 changes: 1 addition & 2 deletions web/src/components/layout/scaffold/Tabs.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,12 @@
v-if="isExactActive || (isActive && tab.matchChildren)"
name="chevron-right"
class="md:hidden flex-shrink-0"
size="20"
/>
<Icon v-else name="blank" class="md:hidden" />
<span
class="flex gap-2 items-center md:justify-center flex-row py-1 px-2 w-full min-w-20 dark:hover:bg-wp-background-100 hover:bg-wp-background-200 rounded-md"
>
<Icon v-if="tab.icon" :name="tab.icon" :class="tab.iconClass" class="flex-shrink-0" size="20" />
<Icon v-if="tab.icon" :name="tab.icon" :class="tab.iconClass" class="flex-shrink-0" />
<span>{{ tab.title }}</span>
<CountBadge v-if="tab.count" :value="tab.count" />
</span>
Expand Down
2 changes: 1 addition & 1 deletion web/src/components/repo/RepoItem.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
</div>

<div class="flex flex-shrink-0 gap-x-1 items-center ml-auto">
<Icon name="since" size="20" />
<Icon name="since" />
<span>{{ since }}</span>
</div>
</template>
Expand Down
1 change: 1 addition & 0 deletions web/src/components/repo/pipeline/PipelineStatusIcon.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
>
<Icon
:name="service ? 'settings' : `status-${status}`"
size="24"
:class="{
'text-wp-state-error-100': pipelineStatusColors[status] === 'red',
'text-wp-state-neutral-100': pipelineStatusColors[status] === 'gray',
Expand Down
6 changes: 3 additions & 3 deletions web/src/views/repo/pipeline/Pipeline.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<Container v-if="pipeline!.errors?.some((e) => !e.is_warning)" fill-width class="p-0">
<Panel>
<div class="flex flex-col items-center text-center gap-4">
<Icon name="status-error" class="w-16 h-16 text-wp-state-error-100" />
<Icon name="status-error" class="w-16 h-16 text-wp-state-error-100" size="24" />
<span class="text-xl">{{ $t('repo.pipeline.we_got_some_errors') }}</span>
<Button color="red" :text="$t('repo.pipeline.show_errors')" :to="{ name: 'repo-pipeline-errors' }" />
</div>
Expand All @@ -21,7 +21,7 @@
<Container v-else-if="pipeline!.status === 'blocked'" fill-width class="p-0">
<Panel>
<div class="flex flex-col items-center gap-4">
<Icon name="status-blocked" class="w-16 h-16" />
<Icon name="status-blocked" size="24" class="w-16 h-16" />
<span class="text-xl">{{ $t('repo.pipeline.protected.awaits') }}</span>
<div v-if="repoPermissions!.push" class="flex gap-2 flex-wrap items-center justify-center">
<Button
Expand All @@ -44,7 +44,7 @@
<Container v-else-if="pipeline!.status === 'declined'" fill-width class="p-0">
<Panel>
<div class="flex flex-col items-center gap-4">
<Icon name="status-declined" class="w-16 h-16 text-wp-state-error-100" />
<Icon name="status-declined" size="24" class="w-16 h-16 text-wp-state-error-100" />
<p class="text-xl">{{ $t('repo.pipeline.protected.declined') }}</p>
</div>
</Panel>
Expand Down