Skip to content

Commit 1fd7e3d

Browse files
silverwindyp05327
andauthored
Improve Actions CSS (#24864)
- Various color tweaks - Add sticky positioning to left sidebar, right header and right step header - Adjust margins and border radiuses <img width="1235" alt="Screenshot 2023-05-23 at 11 18 06" src="https://github.com/go-gitea/gitea/assets/115237/f601b00d-c7f2-43de-89f2-3ac55f2d9cdc"> <img width="1239" alt="Screenshot 2023-05-23 at 11 18 18" src="https://github.com/go-gitea/gitea/assets/115237/a2d24cc9-29fa-4c17-906b-84feea14b889"> ![](https://github.com/go-gitea/gitea/assets/115237/643910f2-a582-405d-bc93-36f2e54b5fda) ![](https://github.com/go-gitea/gitea/assets/115237/382a8a54-f1e3-4f08-affc-ea3108c02352) --------- Co-authored-by: yp05327 <[email protected]>
1 parent 9ad5cad commit 1fd7e3d

File tree

3 files changed

+53
-23
lines changed

3 files changed

+53
-23
lines changed

web_src/css/base.css

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,10 @@
7070
--color-secondary-alpha-90: #dededee1;
7171
/* console colors */
7272
--color-console-fg: #ffffff;
73-
--color-console-bg: #171717;
73+
--color-console-bg: #252a2f;
74+
--color-console-border: #ffffff16;
7475
--color-console-hover-bg: #ffffff16;
76+
--color-console-active-bg: #353a3f;
7577
/* named colors */
7678
--color-red: #db2828;
7779
--color-orange: #f2711c;

web_src/css/themes/theme-arc-green.css

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,13 @@
5656
--color-secondary-alpha-70: #525767b3;
5757
--color-secondary-alpha-80: #525767cc;
5858
--color-secondary-alpha-90: #525767e1;
59-
/* colors */
59+
/* console colors */
60+
--color-console-fg: #ffffff;
61+
--color-console-bg: #262936;
62+
--color-console-border: #ffffff16;
63+
--color-console-hover-bg: #ffffff16;
64+
--color-console-active-bg: #383c47;
65+
/* named colors */
6066
--color-red: #cc4848;
6167
--color-orange: #cc580c;
6268
--color-yellow: #cc9903;
@@ -175,7 +181,6 @@
175181
--color-accent: var(--color-primary-light-1);
176182
--color-small-accent: var(--color-primary-light-5);
177183
--color-active-line: #534d1b;
178-
179184
accent-color: var(--color-accent);
180185
color-scheme: dark;
181186
}

web_src/js/components/RepoActionView.vue

Lines changed: 43 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<button class="ui basic small compact button red" @click="cancelRun()" v-else-if="run.canCancel">
1515
{{ locale.cancel }}
1616
</button>
17-
<button class="ui basic small compact button secondary" @click="rerun()" v-else-if="run.canRerun">
17+
<button class="ui basic small compact button secondary gt-mr-0" @click="rerun()" v-else-if="run.canRerun">
1818
{{ locale.rerun_all }}
1919
</button>
2020
</div>
@@ -422,20 +422,20 @@ export function ansiLogToHTML(line) {
422422
<style scoped>
423423
.action-view-body {
424424
display: flex;
425-
height: calc(100vh - 266px); /* fine tune this value to make the main view has full height */
425+
gap: 12px;
426426
}
427427
428428
/* ================ */
429429
/* action view header */
430430
431431
.action-view-header {
432-
margin: 20px 0;
432+
margin-top: 8px;
433+
margin-bottom: 4px;
433434
}
434435
435436
.action-info-summary {
436437
display: flex;
437438
align-items: center;
438-
margin-top: 1rem;
439439
justify-content: space-between;
440440
}
441441
@@ -452,7 +452,12 @@ export function ansiLogToHTML(line) {
452452
.action-commit-summary {
453453
display: flex;
454454
gap: 5px;
455-
margin: 10px 0 10px 25px;
455+
margin: 5px 0 0 25px;
456+
}
457+
458+
.action-view-left, .action-view-right {
459+
padding-top: 12px;
460+
padding-bottom: 12px;
456461
}
457462
458463
/* ================ */
@@ -461,7 +466,10 @@ export function ansiLogToHTML(line) {
461466
.action-view-left {
462467
width: 30%;
463468
max-width: 400px;
464-
overflow-y: scroll;
469+
position: sticky;
470+
top: 0;
471+
max-height: 100vh;
472+
overflow-y: auto;
465473
}
466474
467475
.job-group-section .job-group-summary {
@@ -490,11 +498,15 @@ export function ansiLogToHTML(line) {
490498
padding-right: 3px;
491499
}
492500
501+
.job-brief-list {
502+
display: flex;
503+
flex-direction: column;
504+
gap: 8px;
505+
}
506+
493507
.job-brief-item {
494-
margin: 5px 0;
495508
padding: 10px;
496-
background: var(--color-info-bg);
497-
border-radius: 5px;
509+
border-radius: var(--border-radius);
498510
text-decoration: none;
499511
display: flex;
500512
flex-wrap: nowrap;
@@ -503,12 +515,12 @@ export function ansiLogToHTML(line) {
503515
}
504516
505517
.job-brief-item:hover {
506-
background-color: var(--color-secondary);
518+
background-color: var(--color-hover);
507519
}
508520
509521
.job-brief-item.selected {
510522
font-weight: var(--font-weight-bold);
511-
background-color: var(--color-secondary-dark-1);
523+
background-color: var(--color-active);
512524
}
513525
514526
.job-brief-item:first-of-type {
@@ -555,8 +567,7 @@ export function ansiLogToHTML(line) {
555567
556568
.action-view-right {
557569
flex: 1;
558-
background-color: var(--color-console-bg);
559-
color: var(--color-secondary-dark-2);
570+
color: var(--color-secondary-dark-3);
560571
max-height: 100%;
561572
width: 70%;
562573
display: flex;
@@ -565,7 +576,12 @@ export function ansiLogToHTML(line) {
565576
566577
.job-info-header {
567578
padding: 10px;
568-
border-bottom: 1px solid var(--color-grey);
579+
border-bottom: 1px solid var(--color-console-border);
580+
background-color: var(--color-console-bg);
581+
position: sticky;
582+
top: 0;
583+
border-radius: var(--border-radius) var(--border-radius) 0 0;
584+
height: 60px;
569585
}
570586
571587
.job-info-header .job-info-header-title {
@@ -580,8 +596,9 @@ export function ansiLogToHTML(line) {
580596
}
581597
582598
.job-step-container {
599+
background-color: var(--color-console-bg);
583600
max-height: 100%;
584-
overflow: auto;
601+
border-radius: 0 0 var(--border-radius) var(--border-radius);
585602
}
586603
587604
.job-step-container .job-step-summary {
@@ -590,6 +607,7 @@ export function ansiLogToHTML(line) {
590607
display: flex;
591608
align-items: center;
592609
user-select: none;
610+
border-radius: var(--border-radius);
593611
}
594612
595613
.job-step-container .job-step-summary .step-summary-msg {
@@ -600,11 +618,17 @@ export function ansiLogToHTML(line) {
600618
margin-left: 16px;
601619
}
602620
603-
.job-step-container .job-step-summary:hover,
621+
.job-step-container .job-step-summary:hover {
622+
color: var(--color-console-fg);
623+
background-color: var(--color-console-hover-bg);
624+
625+
}
626+
604627
.job-step-container .job-step-summary.selected {
605628
color: var(--color-console-fg);
606-
background-color: var(--color-black-light);
607-
border-radius: 5px;
629+
background-color: var(--color-console-active-bg);
630+
position: sticky;
631+
top: 60px;
608632
}
609633
610634
@media (max-width: 768px) {
@@ -639,7 +663,7 @@ export function ansiLogToHTML(line) {
639663
}
640664
641665
.job-step-section .job-step-logs {
642-
font-family: monospace;
666+
font-family: var(--fonts-monospace);
643667
margin: 8px 0;
644668
font-size: 12px;
645669
}
@@ -649,7 +673,6 @@ export function ansiLogToHTML(line) {
649673
}
650674
651675
.job-step-section .job-step-logs .job-log-line:hover {
652-
color: var(--color-console-fg);
653676
background-color: var(--color-console-hover-bg);
654677
}
655678

0 commit comments

Comments
 (0)