Skip to content

Commit

Permalink
Use consistent woodpecker color scheme
Browse files Browse the repository at this point in the history
  • Loading branch information
xoxys committed Jul 15, 2023
1 parent 669abdf commit 0732f4c
Show file tree
Hide file tree
Showing 12 changed files with 24 additions and 10 deletions.
2 changes: 1 addition & 1 deletion web/src/components/admin/settings/AdminQueueTab.vue
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
:name="queueInfo.paused ? 'pause' : 'play'"
:class="{
'text-red-400': queueInfo.paused,
'text-lime-400': !queueInfo.paused,
'text-woodpecker-300': !queueInfo.paused,
}"
/>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ const data = computed(() => {
label: t('admin.settings.queue.stats.worker_count'),
value: props.stats.worker_count,
perc: total.value > 0 ? (props.stats.worker_count / total.value) * 100 : 0,
color: 'bg-lime-400',
color: 'bg-woodpecker-300',
},
{
key: 'running_count',
Expand Down
2 changes: 1 addition & 1 deletion web/src/components/atomic/Button.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
:class="{
'bg-white hover:bg-gray-200 border-gray-300 text-color dark:bg-dark-gray-600 dark:border-dark-400 dark:hover:bg-dark-gray-800':
color === 'gray',
'bg-lime-600 hover:bg-lime-700 border-lime-800 text-white dark:text-gray-300 dark:bg-lime-900 dark:hover:bg-lime-800':
'bg-woodpecker-400 hover:bg-woodpecker-500 border-woodpecker-600 text-white dark:text-gray-300 dark:bg-woodpecker-500 dark:hover:bg-woodpecker-400':
color === 'green',
'bg-cyan-600 hover:bg-cyan-700 border-cyan-800 text-white dark:text-gray-300 dark:bg-cyan-900 dark:hover:bg-cyan-800':
color === 'blue',
Expand Down
2 changes: 1 addition & 1 deletion web/src/components/form/Checkbox.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<input
:id="`checkbox-${id}`"
type="checkbox"
class="checkbox flex-shrink-0 relative border border-gray-400 cursor-pointer rounded-md transition-colors duration-150 w-5 h-5 checked:bg-lime-600 checked:border-lime-600 focus-visible:border-gray-600 dark:(border-gray-600 checked:bg-lime-700 checked:border-lime-700 focus-visible:border-gray-300 checked:focus-visible:border-gray-300)"
class="checkbox flex-shrink-0 relative border border-gray-400 cursor-pointer rounded-md transition-colors duration-150 w-5 h-5 checked:bg-woodpecker-400 checked:border-woodpecker-400 focus-visible:border-gray-600 dark:(border-gray-600 checked:bg-woodpecker-500 checked:border-woodpecker-500 focus-visible:border-gray-300 checked:focus-visible:border-gray-300)"
:checked="innerValue"
@click="innerValue = !innerValue"
/>
Expand Down
2 changes: 1 addition & 1 deletion web/src/components/form/RadioField.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<input
:id="`radio-${id}-${option.value}`"
type="radio"
class="radio relative flex-shrink-0 border border-gray-400 cursor-pointer rounded-full w-5 h-5 checked:bg-lime-600 checked:border-lime-600 focus-visible:border-gray-600 dark:(border-gray-600 checked:bg-lime-700 checked:border-lime-700 focus-visible:border-gray-300 checked:focus-visible:border-gray-300)"
class="radio relative flex-shrink-0 border border-gray-400 cursor-pointer rounded-full w-5 h-5 checked:bg-woodpecker-400 checked:border-woodpecker-400 focus-visible:border-gray-600 dark:(border-gray-600 checked:bg-woodpecker-500 checked:border-woodpecker-500 focus-visible:border-gray-300 checked:focus-visible:border-gray-300)"
:value="option.value"
:checked="innerValue.includes(option.value)"
@click="innerValue = option.value"
Expand Down
4 changes: 4 additions & 0 deletions web/src/components/layout/header/ActivePipelines.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,11 @@
<div class="spinner-ring ring4" />
</div>
<div
<<<<<<< Updated upstream
class="flex items-center justify-center h-full w-full font-bold bg-white bg-opacity-15 dark:bg-black dark:bg-opacity-10 rounded-full"
=======
class="flex items-center justify-center h-full w-full font-bold bg-white bg-opacity-10 dark:bg-black dark:bg-opacity-10 rounded-md"
>>>>>>> Stashed changes
>
{{ activePipelines.length || 0 }}
</div>
Expand Down
4 changes: 3 additions & 1 deletion web/src/components/layout/header/Navbar.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
<template>
<!-- Navbar -->
<nav class="flex bg-lime-600 text-neutral-content p-4 dark:bg-dark-gray-800 dark:border-b dark:border-gray-700">
<nav
class="flex bg-woodpecker-400 text-neutral-content p-4 dark:bg-dark-gray-800 dark:border-b dark:border-gray-700 font-bold"
>
<!-- Left Links Box -->
<div class="flex text-white dark:text-gray-400 items-center space-x-2">
<!-- Logo -->
Expand Down
2 changes: 1 addition & 1 deletion web/src/components/repo/pipeline/PipelineItem.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
'bg-yellow-400 dark:bg-dark-200': pipeline.status === 'pending',
'bg-red-400 dark:bg-red-800': pipelineStatusColors[pipeline.status] === 'red',
'bg-gray-600 dark:bg-gray-500': pipelineStatusColors[pipeline.status] === 'gray',
'bg-lime-400 dark:bg-lime-900': pipelineStatusColors[pipeline.status] === 'green',
'bg-woodpecker-400 dark:bg-lime-900': pipelineStatusColors[pipeline.status] === 'green',
'bg-blue-400 dark:bg-blue-900': pipelineStatusColors[pipeline.status] === 'blue',
}"
/>
Expand Down
2 changes: 1 addition & 1 deletion web/src/components/repo/pipeline/PipelineLog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@

<div
v-if="step?.end_time !== undefined"
:class="step.exit_code == 0 ? 'dark:text-lime-400 text-lime-700' : 'dark:text-red-400 text-red-600'"
:class="step.exit_code == 0 ? 'dark:text-woodpecker-400 text-lime-700' : 'dark:text-red-400 text-red-600'"
class="w-full bg-gray-200 dark:bg-dark-gray-800 text-md p-4"
>
{{ $t('repo.pipeline.exit_code', { exitCode: step.exit_code }) }}
Expand Down
2 changes: 1 addition & 1 deletion web/src/components/repo/pipeline/PipelineStatusIcon.vue
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
:class="{
'text-red-400': pipelineStatusColors[status] === 'red',
'text-gray-400': pipelineStatusColors[status] === 'gray',
'text-lime-400': pipelineStatusColors[status] === 'green',
'text-woodpecker-400': pipelineStatusColors[status] === 'green',
'text-blue-400': pipelineStatusColors[status] === 'blue',
}"
/>
Expand Down
2 changes: 1 addition & 1 deletion web/src/views/Login.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<div
class="flex flex-col w-full overflow-hidden md:m-8 md:rounded-md md:shadow md:border md:bg-white md:dark:bg-dark-gray-700 dark:border-dark-200 md:flex-row md:w-3xl md:h-sm justify-center"
>
<div class="flex md:bg-lime-500 md:dark:bg-lime-900 md:w-3/5 justify-center items-center">
<div class="flex md:bg-woodpecker-400 md:dark:bg-dark-gray-800 md:w-3/5 justify-center items-center">
<img class="w-48 h-48" src="../assets/logo.svg?url" />
</div>
<div class="flex flex-col my-8 md:w-2/5 p-4 items-center justify-center">
Expand Down
8 changes: 8 additions & 0 deletions web/windi.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,14 @@ export default defineConfig({
extend: {
colors: {
greenish: '#4caf50',
woodpecker: {
100: '#BDFFAC',
200: '#7FD777',
300: '#4CAF50',
400: '#2A8737',
500: '#115F24',
600: '#043818',
},
link: colors.blue[400],
'dark-gray': {
600: '#383c4a',
Expand Down

0 comments on commit 0732f4c

Please sign in to comment.