aboutsummaryrefslogtreecommitdiffstats
path: root/web_src/js/components
diff options
context:
space:
mode:
authorJason Song <i@wolfogre.com>2023-02-12 19:19:50 +0800
committerGitHub <noreply@github.com>2023-02-12 19:19:50 +0800
commita3546369661bf4073ae748a501840fbd05fef02b (patch)
treec9232d41701755fcec548b01fa0816140e2cc54d /web_src/js/components
parent34399cfd7a618198822ddb2d0052adc39e5568e4 (diff)
downloadgitea-a3546369661bf4073ae748a501840fbd05fef02b.tar.gz
gitea-a3546369661bf4073ae748a501840fbd05fef02b.zip
Fix style of actions rerun button (#22835)
Authored by @a1012112796 at https://github.com/go-gitea/gitea/pull/22798#issuecomment-1421820001 Avoid putting `button` in `a`. A patch for #22798 . Now it looks like: <img width="393" alt="image" src="https://user-images.githubusercontent.com/9418365/217791913-b491fc86-ee9b-4672-80ea-7286eef2d11f.png"> <img width="389" alt="image" src="https://user-images.githubusercontent.com/9418365/217791967-d8c09c8b-4cea-4011-b01e-db0d1333e7f6.png"> --------- Co-authored-by: silverwind <me@silverwind.io> Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Diffstat (limited to 'web_src/js/components')
-rw-r--r--web_src/js/components/RepoActionView.vue48
1 files changed, 30 insertions, 18 deletions
diff --git a/web_src/js/components/RepoActionView.vue b/web_src/js/components/RepoActionView.vue
index 703fe59d81..ddc7139a2e 100644
--- a/web_src/js/components/RepoActionView.vue
+++ b/web_src/js/components/RepoActionView.vue
@@ -12,19 +12,20 @@
<div class="action-view-left">
<div class="job-group-section">
<div class="job-brief-list">
- <a class="job-brief-item" v-for="(job, index) in run.jobs" :key="job.id" :href="run.link+'/jobs/'+index">
- <SvgIcon name="octicon-check-circle-fill" class="green" v-if="job.status === 'success'"/>
- <SvgIcon name="octicon-skip" class="ui text grey" v-else-if="job.status === 'skipped'"/>
- <SvgIcon name="octicon-clock" class="ui text yellow" v-else-if="job.status === 'waiting'"/>
- <SvgIcon name="octicon-blocked" class="ui text yellow" v-else-if="job.status === 'blocked'"/>
- <SvgIcon name="octicon-meter" class="ui text yellow" class-name="job-status-rotate" v-else-if="job.status === 'running'"/>
- <SvgIcon name="octicon-x-circle-fill" class="red" v-else/>
- {{ job.name }}
- <!-- TODO: it will be a better idea to move "button" out from "a", and the ".prevent" will not be needed. But it needs some work with CSS -->
- <button class="job-brief-rerun" @click.prevent="rerunJob(index)" v-if="job.canRerun">
+ <div class="job-brief-item" v-for="(job, index) in run.jobs" :key="job.id">
+ <a class="job-brief-link" :href="run.link+'/jobs/'+index">
+ <SvgIcon name="octicon-check-circle-fill" class="green" v-if="job.status === 'success'"/>
+ <SvgIcon name="octicon-skip" class="ui text grey" v-else-if="job.status === 'skipped'"/>
+ <SvgIcon name="octicon-clock" class="ui text yellow" v-else-if="job.status === 'waiting'"/>
+ <SvgIcon name="octicon-blocked" class="ui text yellow" v-else-if="job.status === 'blocked'"/>
+ <SvgIcon name="octicon-meter" class="ui text yellow" class-name="job-status-rotate" v-else-if="job.status === 'running'"/>
+ <SvgIcon name="octicon-x-circle-fill" class="red" v-else/>
+ <span class="ui text">{{ job.name }}</span>
+ </a>
+ <button class="job-brief-rerun" @click="rerunJob(index)" v-if="job.canRerun">
<SvgIcon name="octicon-sync" class="ui text black"/>
</button>
- </a>
+ </div>
</div>
</div>
</div>
@@ -291,7 +292,7 @@ export function initRepositoryActionView() {
.action-view-header {
margin: 0 20px 20px 20px;
- button.run_cancel {
+ .run_cancel {
border: none;
color: var(--color-red);
background-color: transparent;
@@ -299,7 +300,7 @@ export function initRepositoryActionView() {
cursor: pointer;
transition:transform 0.2s;
};
- button.run_cancel:hover{
+ .run_cancel:hover{
transform:scale(130%);
};
}
@@ -327,14 +328,16 @@ export function initRepositoryActionView() {
}
.job-brief-list {
- a.job-brief-item {
- display: block;
+ .job-brief-item {
margin: 5px 0;
padding: 10px;
background: var(--color-info-bg);
border-radius: 5px;
text-decoration: none;
- button.job-brief-rerun {
+ display: flex;
+ justify-items: center;
+ flex-wrap: nowrap;
+ .job-brief-rerun {
float: right;
border: none;
background-color: transparent;
@@ -342,11 +345,20 @@ export function initRepositoryActionView() {
cursor: pointer;
transition:transform 0.2s;
};
- button.job-brief-rerun:hover{
+ .job-brief-rerun:hover{
transform:scale(130%);
};
+ .job-brief-link {
+ flex-grow: 1;
+ display: flex;
+ span {
+ margin-right: 8px;
+ display: flex;
+ align-items: center;
+ }
+ }
}
- a.job-brief-item:hover {
+ .job-brief-item:hover {
background-color: var(--color-secondary);
}
}