Merge branch 'main' into close-sidebar

woodpecker-ci · Aug 28, 2023 · b618acb · b618acb
2 parents 54d237b + 15bd20d
commit b618acb
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 13 deletions.
diff --git a/web/src/assets/locales/fr.json b/web/src/assets/locales/fr.json
@@ -445,6 +445,8 @@
       },
       "secrets": {
         "add": "Ajouter un secret",
+        "created": "Secret d'utilisateur crée",
+        "deleted": "Secret d'utilisateur effacé",
         "events": {
           "events": "Disponible pour les événements suivants",
           "pr_warning": "Attention, si cette option est activé, un acteur malicieux peut proposer une pull request qui affiche vos secrets."
@@ -453,13 +455,15 @@
           "images": "Disponible pour les images suivantes"
         },
         "name": "Nom",
+        "none": "Il n'y a pas encore de secrets d'utilisateur.",
         "plugins_only": "Disponible uniquement pour les plugins",
         "save": "Enregistrer le secret",
+        "saved": "Secret d'utilisateur enregistré",
         "secrets": "Secrets",
         "show": "Afficher les secrets",
         "value": "Valeur"
       },
-      "settings": "Paramètres Utilisateur"
+      "settings": "Paramètres du compte utilisateur"
     }
   },
   "username": "Nom d'utilisateur",

diff --git a/web/src/components/layout/header/ActivePipelines.vue b/web/src/components/layout/header/ActivePipelines.vue
@@ -1,6 +1,6 @@
 <template>
   <IconButton :title="$t('pipeline_feed')" class="!p-1.5 relative text-current" @click="toggle">
-    <div v-if="activePipelines.length > 0" class="spinner">
+    <div v-if="activePipelines.length > 0" class="spinner m-1">
       <div class="spinner-ring ring1" />
       <div class="spinner-ring ring2" />
       <div class="spinner-ring ring3" />

diff --git a/web/src/components/repo/pipeline/PipelineLog.vue b/web/src/components/repo/pipeline/PipelineLog.vue
@@ -40,7 +40,7 @@
       <div
         v-show="hasLogs && loadedLogs"
         ref="consoleElement"
-        class="w-full max-w-full grid grid-cols-[min-content,1fr,min-content] p-4 auto-rows-min flex-grow overflow-x-hidden overflow-y-auto"
+        class="w-full max-w-full grid grid-cols-[min-content,minmax(0,1fr),min-content] p-4 auto-rows-min flex-grow overflow-x-hidden overflow-y-auto text-xs md:text-sm"
       >
         <div v-for="line in log" :key="line.index" class="contents font-mono">
           <a
@@ -57,7 +57,7 @@
           >
           <!-- eslint-disable vue/no-v-html -->
           <span
-            class="align-top whitespace-pre-wrap break-words text-sm"
+            class="align-top whitespace-pre-wrap break-words"
             :class="{
               'bg-opacity-40 dark:bg-opacity-50 bg-10.168.64.121-600 dark:bg-red-800': line.type === 'error',
               'bg-opacity-40 dark:bg-opacity-50 bg-yellow-600 dark:bg-yellow-800': line.type === 'warning',

diff --git a/web/src/components/repo/pipeline/PipelineStepList.vue b/web/src/components/repo/pipeline/PipelineStepList.vue
@@ -24,7 +24,7 @@
           <Icon name="pull_request" />
           <span class="truncate">{{ prettyRef }}</span>
         </a>
-        <span v-if="pipeline.event !== 'pull_request'" class="truncate">{{ pipeline.branch }}</span>
+        <span v-if="pipeline.event !== 'pull_request'" class="truncate">{{ prettyRef }}</span>
       </div>
       <div class="flex items-center flex-shrink-0">
         <template v-if="pipeline.event === 'pull_request'">
@@ -48,7 +48,7 @@
     </div>
 
     <div class="flex-grow min-h-0 w-full relative">
-      <div class="absolute top-0 left-0 right-0 h-full flex flex-col md:overflow-y-scroll gap-y-2">
+      <div class="absolute top-0 left-0 right-0 h-full flex flex-col md:overflow-y-auto gap-y-2">
         <div
           v-for="workflow in pipeline.workflows"
           :key="workflow.id"

diff --git a/web/src/views/Login.vue b/web/src/views/Login.vue
@@ -9,14 +9,14 @@
     </div>
 
     <div
-      class="flex flex-col w-full overflow-hidden md:m-8 md:rounded-md md:shadow md:border md:border-wp-background-400 md:bg-wp-background-100 md:dark:bg-wp-background-200 md:flex-row md:w-3xl md:h-sm justify-center"
+      class="flex flex-col w-full overflow-hidden bg-wp-background-100 shadow border border-wp-background-400 dark:bg-wp-background-200 md:m-8 md:rounded-md md:flex-row md:w-3xl md:h-sm"
     >
-      <div class="flex md:bg-wp-primary-200 md:dark:bg-wp-primary-300 md:w-3/5 justify-center items-center">
-        <WoodpeckerLogo class="w-48 h-48" />
+      <div class="flex justify-center items-center bg-wp-primary-200 dark:bg-wp-primary-300 min-h-48 md:w-3/5">
+        <WoodpeckerLogo preserveAspectRatio="xMinYMin slice" class="w-30 h-30 md:w-48 md:h-48" />
       </div>
-      <div class="flex flex-col my-8 md:w-2/5 p-4 items-center justify-center">
+      <div class="flex justify-center items-center flex-col md:w-2/5 min-h-48 gap-4 text-center">
         <h1 class="text-xl text-wp-text-100">{{ $t('welcome') }}</h1>
-        <Button class="mt-4" @click="doLogin">{{ $t('login') }}</Button>
+        <Button @click="doLogin">{{ $t('login') }}</Button>
       </div>
     </div>
   </main>

diff --git a/web/src/views/RepoAdd.vue b/web/src/views/RepoAdd.vue
@@ -17,7 +17,7 @@
           v-if="!repo.active"
           class="ml-auto"
           :text="$t('repo.enable.enable')"
-          :is-loading="isActivatingRepo && repoToActivate?.id === repo.id"
+          :is-loading="isActivatingRepo && repoToActivate?.forge_remote_id === repo.forge_remote_id"
           @click="activateRepo(repo)"
         />
       </ListItem>

diff --git a/web/src/views/repo/pipeline/Pipeline.vue b/web/src/views/repo/pipeline/Pipeline.vue
@@ -1,5 +1,5 @@
 <template>
-  <FluidContainer full-width class="flex flex-col flex-grow">
+  <FluidContainer full-width class="flex flex-col flex-grow md:min-h-xs">
     <div class="flex w-full min-h-0 flex-grow">
       <PipelineStepList
         v-if="pipeline?.workflows?.length || 0 > 0"