Skip to content

Commit c5020cf

Browse files
silverwindlafrikstechknowlogickzeripath
authored
Various UI and arc-green fixes (#13291)
- introduce variable for border-radius value - fix some white borders in arc-green - add text selection and placeholder in arc-green - tweak branch list footer - more things I forgot Co-authored-by: Lauris BH <[email protected]> Co-authored-by: techknowlogick <[email protected]> Co-authored-by: zeripath <[email protected]>
1 parent 65dc4d0 commit c5020cf

File tree

5 files changed

+87
-14
lines changed

5 files changed

+87
-14
lines changed

‎templates/repo/branch/list.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
{{svg "octicon-shield-lock"}}
2020
{{end}}
2121
<a href="{{$.RepoLink}}/src/branch/{{$.DefaultBranch | EscapePound}}">{{$.DefaultBranch}}</a>
22-
<p class="info">{{svg "octicon-git-commit"}}<a href="{{$.RepoLink}}/commit/{{.Commit.ID.String}}">{{ShortSha .Commit.ID.String}}</a> · <span class="commit-message">{{RenderCommitMessage .Commit.CommitMessage $.RepoLink $.Repository.ComposeMetas}}</span> · {{$.i18n.Tr "org.repo_updated"}} {{TimeSince .Commit.Committer.When $.i18n.Lang}}</p>
22+
<p class="info df ac my-2">{{svg "octicon-git-commit" 16 "mr-2"}}<a href="{{$.RepoLink}}/commit/{{.Commit.ID.String}}">{{ShortSha .Commit.ID.String}}</a> · <span class="commit-message">{{RenderCommitMessage .Commit.CommitMessage $.RepoLink $.Repository.ComposeMetas}}</span> · {{$.i18n.Tr "org.repo_updated"}} {{TimeSince .Commit.Committer.When $.i18n.Lang}}</p>
2323
{{end}}
2424
{{end}}
2525
</td>

‎templates/repo/sub_menu.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div class="ui segments repository-summary">
1+
<div class="ui segments repository-summary{{if and (.Permission.CanRead $.UnitTypeCode) (not .IsEmptyRepo) .LanguageStats }} repository-summary-language-stats{{end}}">
22
<div class="ui segment sub-menu repository-menu">
33
<div class="ui two horizontal center link list">
44
{{if and (.Permission.CanRead $.UnitTypeCode) (not .IsEmptyRepo)}}

‎web_src/less/_base.less

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
--fonts-emoji: "Apple Color Emoji", "Segoe UI Emoji", "Noto Color Emoji", "Twemoji Mozilla";
66
/* other variables */
77
--fonts-regular: var(--fonts-proportional), var(--fonts-emoji), sans-serif;
8+
--border-radius: .28571429rem;
89
}
910

1011
:root:lang(ja) {
@@ -114,7 +115,7 @@ a {
114115
}
115116

116117
.rounded {
117-
border-radius: .28571429rem !important;
118+
border-radius: var(--border-radius) !important;
118119
}
119120

120121
.wrap {
@@ -1230,6 +1231,18 @@ table th[data-sortt-desc] {
12301231
}
12311232
}
12321233

1234+
.ui.dropdown .menu .item {
1235+
border-radius: 0;
1236+
}
1237+
1238+
.ui.dropdown .menu .item:first-of-type {
1239+
border-radius: var(--border-radius) var(--border-radius) 0 0;
1240+
}
1241+
1242+
.ui.dropdown .menu .item:last-of-type {
1243+
border-radius: 0 0 var(--border-radius) var(--border-radius);
1244+
}
1245+
12331246
.text-label {
12341247
display: inline-flex !important;
12351248
align-items: center !important;

‎web_src/less/_repository.less

Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@
248248
padding: 0 5px;
249249

250250
&:first-child {
251-
border-radius: .28571429rem 0 0 .28571429rem;
251+
border-radius: var(--border-radius) 0 0 var(--border-radius);
252252
}
253253
}
254254

@@ -1948,7 +1948,7 @@
19481948
}
19491949

19501950
.clone.button:first-child {
1951-
border-radius: .28571429rem 0 0 .28571429rem;
1951+
border-radius: var(--border-radius) 0 0 var(--border-radius);
19521952
}
19531953

19541954
.ui.action.small.input {
@@ -2390,7 +2390,14 @@
23902390

23912391
.item {
23922392
width: 100%;
2393-
border-radius: 3px;
2393+
2394+
&:first-of-type {
2395+
border-radius: var(--border-radius) 0 0 var(--border-radius);
2396+
}
2397+
2398+
&:last-of-type {
2399+
border-radius: 0 var(--border-radius) var(--border-radius) 0;
2400+
}
23942401

23952402
a {
23962403
color: black;
@@ -2499,6 +2506,8 @@
24992506
}
25002507

25012508
.repository-summary {
2509+
box-shadow: none !important;
2510+
25022511
.segment.language-stats-details,
25032512
.segment.repository-summary {
25042513
border-top: none;
@@ -2528,6 +2537,15 @@
25282537
}
25292538
}
25302539

2540+
.repository-menu {
2541+
padding: 0 !important;
2542+
}
2543+
2544+
.repository-menu .item {
2545+
padding-top: 9px !important;
2546+
padding-bottom: 9px !important;
2547+
}
2548+
25312549
&.diff .committed-by {
25322550
padding-top: .5rem;
25332551

@@ -3228,11 +3246,11 @@ td.blob-excerpt {
32283246
}
32293247

32303248
.diff-file-box[data-folded="true"] .diff-file-header {
3231-
border-radius: .28571429rem !important;
3249+
border-radius: var(--border-radius) !important;
32323250
}
32333251

32343252
/* prevent page shaking on language bar click */
3235-
.repository.file .repository-summary {
3253+
.repository-summary-language-stats {
32363254
height: 48px;
32373255
overflow: hidden;
32383256
}

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

Lines changed: 48 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -388,6 +388,14 @@
388388
color: #fff;
389389
}
390390

391+
.repository .ui.segment.sub-menu .list .item.active {
392+
background: #404552;
393+
}
394+
395+
.ui.segments {
396+
border-color: #454b5a;
397+
}
398+
391399
.ui.horizontal.segments > .segment {
392400
background-color: #383c4a;
393401
}
@@ -433,6 +441,15 @@ body {
433441
background: #87ab63 !important;
434442
}
435443

444+
::selection {
445+
background: #87ab63 !important;
446+
color: #fff !important;
447+
}
448+
449+
::placeholder {
450+
color: #7f7f7f !important;
451+
}
452+
436453
a {
437454
color: #87ab63;
438455
}
@@ -535,6 +552,7 @@ a:hover {
535552
border: 1px solid #333640;
536553
}
537554

555+
.ui.secondary.menu .active.item,
538556
.ui.secondary.menu .dropdown.item:hover,
539557
.ui.secondary.menu .link.item:hover,
540558
.ui.secondary.menu .active.item:hover,
@@ -549,6 +567,12 @@ a:hover {
549567
background: #454b5a;
550568
}
551569

570+
.ui.link.list .item,
571+
.ui.link.list a.item,
572+
.ui.link.list .item a:not(.ui) {
573+
color: #dbdbdb;
574+
}
575+
552576
.ui.menu .ui.dropdown .menu > .item {
553577
color: #9e9e9e !important;
554578
}
@@ -622,8 +646,8 @@ footer {
622646
.ui.label,
623647
.ui.label.basic {
624648
color: #dbdbdb;
625-
border-color: rgb(152, 152, 152);
626-
background-color: #2a2e39;
649+
border-color: #6a737d;
650+
background-color: #353945;
627651
}
628652

629653
.issue.list > .item .title {
@@ -672,6 +696,7 @@ a.ui.basic.green.label:hover {
672696
.ui.ui.menu .item.disabled,
673697
.ui.ui.menu .item.disabled:hover {
674698
color: #626773;
699+
opacity: 1;
675700
}
676701

677702
.ui.disabled.checkbox label,
@@ -855,7 +880,7 @@ a.ui.basic.green.label:hover {
855880
.ui.basic.button,
856881
.ui.basic.buttons .button {
857882
color: #9e9e9e;
858-
background: rgba(0, 0, 0, .08);
883+
background: rgba(0, 0, 0, .06);
859884
box-shadow: none;
860885
}
861886

@@ -915,8 +940,8 @@ a.ui.basic.green.label:hover {
915940
}
916941

917942
.ui.table tbody tr {
918-
border-color: #333640;
919-
background: #2a2e3a;
943+
border-color: #404552;
944+
background: #353945;
920945
}
921946

922947
.ui .text.grey {
@@ -1245,6 +1270,11 @@ td.blob-hunk {
12451270
color: #dbdbdb !important;
12461271
}
12471272

1273+
.repository .filter.menu.labels .label-filter .menu .info,
1274+
.repository .filter.menu.labels .label-filter .menu .info code {
1275+
border-color: #4e5361;
1276+
}
1277+
12481278
.ui.card,
12491279
.ui.cards > .card {
12501280
background: #353945;
@@ -1719,6 +1749,7 @@ a.ui.labels .label:hover {
17191749
border-color: #634343 !important;
17201750
}
17211751

1752+
.repository .labelspage .item,
17221753
.organization.settings .labelspage .item,
17231754
.organization.teams .repositories .item:not(:last-child),
17241755
.organization.teams .members .item:not(:last-child),
@@ -1727,8 +1758,14 @@ a.ui.labels .label:hover {
17271758
border-bottom-color: #404552;
17281759
}
17291760

1761+
.repository .labelspage .item a,
1762+
.organization.settings .labelspage .item a {
1763+
color: #6a737d;
1764+
}
1765+
1766+
.repository .labelspage .item a:hover,
17301767
.organization.settings .labelspage .item a:hover {
1731-
color: #fff;
1768+
color: #9e9e9e;
17321769
}
17331770

17341771
.ui.blue.button:active,
@@ -1766,6 +1803,11 @@ a.ui.labels .label:hover {
17661803
background: #383c4a;
17671804
}
17681805

1806+
.minicolors-panel {
1807+
background: #404552 !important;
1808+
border-color: #6a737d !important;
1809+
}
1810+
17691811
.editor-toolbar {
17701812
background-color: #404552;
17711813
border-color: #4b505f;

0 commit comments

Comments
 (0)