Skip to content

Commit f45086b

Browse files
committed
Fix colors and triangles in issues
- Fix misaligned triangles - Fix triangle and header background colors - Adjust timeline color
1 parent f719e2e commit f45086b

File tree

4 files changed

+40
-55
lines changed

4 files changed

+40
-55
lines changed

web_src/less/_base.less

+23-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,11 @@
5757
--color-secondary-alpha-70: #dededeb3;
5858
--color-secondary-alpha-80: #dededecc;
5959
--color-secondary-alpha-90: #dededee1;
60-
--color-body: #fff;
60+
--color-body: #ffffff;
61+
--color-text: #212121;
62+
--color-box-header: #f7f7f7;
63+
--color-box-body: #ffffff;
64+
--color-timeline: #ececec;
6165
}
6266

6367
:root:lang(ja) {
@@ -1336,6 +1340,24 @@ i.icon.centerlock {
13361340
visibility: hidden;
13371341
}
13381342

1343+
.ui.segment,
1344+
.ui.segments,
1345+
.ui.attached.segment {
1346+
background: var(--color-box-body);
1347+
color: var(--color-text);
1348+
border-color: var(--color-secondary);
1349+
}
1350+
1351+
.ui.attached.header {
1352+
background: var(--color-box-header);
1353+
border-color: var(--color-secondary);
1354+
1355+
.right .button {
1356+
padding: 8px 10px;
1357+
font-weight: normal;
1358+
}
1359+
}
1360+
13391361
/* https://github.com/go-gitea/gitea/issues/10210 */
13401362
.ui.attached.segment ~ .ui.top.attached.header {
13411363
margin-top: 1rem;

web_src/less/_form.less

-9
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,6 @@
77
}
88
}
99

10-
.ui.attached.header {
11-
background: #f0f0f0;
12-
13-
.right .button {
14-
padding: 8px 10px;
15-
font-weight: normal;
16-
}
17-
}
18-
1910
@create-page-form-input-padding: 250px !important;
2011
#create-page-form {
2112
form {

web_src/less/_repository.less

+12-11
Original file line numberDiff line numberDiff line change
@@ -781,7 +781,7 @@
781781
bottom: 0;
782782
left: 96px;
783783
width: 2px;
784-
background-color: #f3f3f3;
784+
background-color: var(--color-timeline);
785785
z-index: -1;
786786
}
787787

@@ -801,7 +801,7 @@
801801
bottom: 0;
802802
left: 30px;
803803
width: 2px;
804-
background-color: #f3f3f3;
804+
background-color: var(--color-timeline);
805805
z-index: -1;
806806
}
807807
}
@@ -848,14 +848,14 @@
848848

849849
.badge.badge-commit {
850850
border-color: transparent;
851-
background: radial-gradient(white 40%, transparent 40%) no-repeat;
851+
background: radial-gradient(var(--color-body) 40%, transparent 40%) no-repeat;
852852
}
853853

854854
.badge {
855855
width: 32px;
856856
height: 32px;
857-
background-color: #eee;
858-
border: 2px solid #eee;
857+
background-color: var(--color-timeline);
858+
border: 2px solid var(--color-timeline);
859859
border-radius: 50%;
860860
display: flex;
861861
float: left;
@@ -1002,7 +1002,7 @@
10021002
border-radius: var(--border-radius);
10031003

10041004
> .merge-section {
1005-
background-color: #f7f7f7;
1005+
background-color: var(--color-box-body);
10061006

10071007
.item {
10081008
padding: .25rem 0;
@@ -1677,7 +1677,7 @@
16771677

16781678
.diff-file-box {
16791679
.header {
1680-
background-color: #f7f7f7;
1680+
background-color: var(--color-box-header);
16811681
}
16821682

16831683
.file-body.file-code {
@@ -2727,7 +2727,7 @@
27272727

27282728
> .header,
27292729
.segment {
2730-
box-shadow: 0 1px 2px 0 var(--color-secondary);
2730+
box-shadow: 0 1px 2px 0 var(--color-box-header);
27312731
}
27322732
}
27332733

@@ -2787,7 +2787,7 @@
27872787
.ui.vertical.menu {
27882788
.header.item {
27892789
font-size: 1.1em;
2790-
background: #f0f0f0;
2790+
background: var(--color-box-header);
27912791
}
27922792
}
27932793

@@ -2820,7 +2820,8 @@
28202820
margin: 0 !important;
28212821
position: relative;
28222822
color: #767676;
2823-
background-color: #f7f7f7;
2823+
min-height: 41px;
2824+
background-color: var(--color-box-header);
28242825
display: flex;
28252826
justify-content: space-between;
28262827
align-items: center;
@@ -2932,7 +2933,7 @@
29322933
}
29332934

29342935
&:after {
2935-
border-right-color: #f7f7f7;
2936+
border-right-color: var(--color-box-header);
29362937
border-width: 8px;
29372938
margin-top: -8px;
29382939
}

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

+5-34
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,10 @@
5151
--color-secondary-alpha-80: #454a57cc;
5252
--color-secondary-alpha-90: #454a57e1;
5353
--color-body: #383c4a;
54+
--color-box-header: #454a57;
55+
--color-box-body: #353945;
56+
--color-text: #9aa0af;
57+
--color-timeline: #454a57;
5458
}
5559

5660
/* Background */
@@ -561,12 +565,6 @@ body {
561565
color: #fff;
562566
}
563567

564-
.ui.attached.header {
565-
background: var(--color-secondary);
566-
border-color: var(--color-secondary);
567-
color: #dbdbdb;
568-
}
569-
570568
.ui.attached.table {
571569
border: 1px solid #304251;
572570
}
@@ -749,7 +747,7 @@ a.ui.basic.green.label:hover {
749747
}
750748

751749
.ui.menu .item > .label {
752-
background: #565454;
750+
background: #505667;
753751
}
754752

755753
.ui.form input:not([type]),
@@ -1049,17 +1047,6 @@ a.ui.basic.green.label:hover {
10491047
color: #dbdbdb;
10501048
}
10511049

1052-
.ui.segment {
1053-
background: #353945;
1054-
color: var(--color-secondary-dark-6) !important;
1055-
}
1056-
1057-
.ui.segment,
1058-
.ui.segments,
1059-
.ui.attached.segment {
1060-
border-color: var(--color-secondary);
1061-
}
1062-
10631050
.ui.list > .item > .content {
10641051
color: var(--color-secondary-dark-6) !important;
10651052
}
@@ -1118,11 +1105,6 @@ a.ui.basic.green.label:hover {
11181105
border-color: var(--color-secondary);
11191106
}
11201107

1121-
.merge-section {
1122-
background-color: var(--color-secondary);
1123-
border-color: #505667;
1124-
}
1125-
11261108
.header:after {
11271109
border-right-color: var(--color-secondary);
11281110
}
@@ -1148,21 +1130,10 @@ a.ui.basic.green.label:hover {
11481130
border-right-color: #353945;
11491131
}
11501132

1151-
.repository.view.issue .comment-list:not(.prevent-before-timeline):before,
1152-
.repository.view.issue .comment-list .timeline:before {
1153-
background-color: var(--color-secondary);
1154-
}
1155-
11561133
.repository.view.issue .comment-list .timeline-item .badge {
1157-
background-color: var(--color-secondary);
1158-
border-color: var(--color-secondary);
11591134
color: #ccc;
11601135
}
11611136

1162-
.repository.view.issue .comment-list .timeline-item .badge.badge-commit {
1163-
background: radial-gradient(var(--color-body) 40%, transparent 40%) no-repeat;
1164-
}
1165-
11661137
.comment-header-right a {
11671138
color: var(--color-secondary-dark-6);
11681139
}

0 commit comments

Comments
 (0)