Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion templates/repo/home_sidebar_bottom.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
<div class="flex-item-title">
<a class="item muted" href="{{.RepoLink}}/releases">
{{ctx.Locale.Tr "repo.releases"}}
<span class="ui small label">{{.NumReleases}}</span>
</a>
<span class="ui small label">{{.NumReleases}}</span>
</div>
<div class="flex-item">
<div class="flex-item-leading">
Expand Down
2 changes: 1 addition & 1 deletion templates/repo/home_sidebar_top.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<div class="flex-item">
<div class="flex-item-main">
<div class="flex-item-title">{{ctx.Locale.Tr "repo.repo_desc"}}</div>
<div class="flex-item-body tw-text-16">
<div class="flex-item-body tw-text-15">
<div class="tw-flex tw-flex-col tw-gap-2 tw-mt-2">
<div class="repo-description tw-break-anywhere tw-gap-2">
{{- $description := .Repository.DescriptionHTML ctx -}}
Expand Down
2 changes: 1 addition & 1 deletion templates/shared/search/code/results.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
{{range $result := .SearchResults}}
{{$repo := or $.Repo (index $.RepoMaps .RepoID)}}
<div class="diff-file-box file-content non-diff-file-content repo-search-result">
<h4 class="ui top attached header tw-font-normal tw-flex tw-flex-wrap">
<h4 class="ui top attached header tw-font-normal flex-text-block tw-flex-wrap tw-py-2">
{{if not $.Repo}}
<span class="file tw-flex-1">
<a rel="nofollow" href="{{$repo.Link}}">{{$repo.FullName}}</a>
Expand Down
24 changes: 16 additions & 8 deletions web_src/css/repo.css
Original file line number Diff line number Diff line change
Expand Up @@ -528,9 +528,12 @@ td .commit-summary {
}

.repository.view.issue .comment-list .timeline-item .comment-text-line {
/* TODO: this "line-height" is not ideal (actually it is abused), many layouts depend on this magic value,
for example: alignment of the header arrow and the avatar, view PR commit list left icon layout, dismiss review with reason, etc */
line-height: 32px;
vertical-align: middle;
color: var(--color-text-light);
min-width: 0;
}

.repository.view.issue .comment-list .timeline-item .comment-text-line .ui.label {
Expand Down Expand Up @@ -601,9 +604,6 @@ td .commit-summary {
width: 100%;
margin: 0;
}
.repository.view.issue .comment-list .comment .content .form .button:not(:last-child) {
margin-bottom: 1rem;
}
}

.repository.view.issue .comment-list .comment .merge-section {
Expand Down Expand Up @@ -654,7 +654,7 @@ td .commit-summary {

.repository.view.issue .comment-list .code-comment {
border: 1px solid transparent;
margin: 0;
padding: 8px;
}

.repository.view.issue .comment-list .code-comment .comment-header {
Expand All @@ -664,6 +664,7 @@ td .commit-summary {
}

.repository.view.issue .comment-list .code-comment .comment-content {
margin-top: 6px;
margin-left: 24px;
}

Expand Down Expand Up @@ -1286,9 +1287,9 @@ td .commit-summary {
box-shadow: 0 0 0 3px var(--color-primary-alpha-30) !important;
}

.comment:target .header::before {
.comment:target .comment-header::before {
border-right-color: var(--color-primary) !important;
filter: drop-shadow(-3px 0 0 var(--color-primary-alpha-30)) !important;
filter: drop-shadow(-4px 0 0 var(--color-primary-alpha-30)) !important;
}

.code-comment:target,
Expand All @@ -1308,14 +1309,17 @@ td .commit-summary {
padding: 0.5em 1rem;
position: relative;
color: var(--color-text);
min-height: 41px;
display: flex;
justify-content: space-between;
align-items: center;
flex-wrap: wrap;
gap: 0.25em;
}

.comment-header.avatar-content-left-arrow {
min-height: 41px; /* for a comment header with left arrow, the arrow is absolutely positioned, but the header content varies (for example: no "roles", etc), so it needs a min-height */
}

.comment-header.avatar-content-left-arrow::after {
border-right-color: var(--color-box-header);
}
Expand All @@ -1339,14 +1343,18 @@ td .commit-summary {
.comment-header-right {
display: flex;
align-items: center;
gap: 0.5em;
gap: 6px;
}

.comment-header-right {
flex: 1;
justify-content: end;
}

.comment-header-right > .item.action {
padding: 4px; /* add some padding to make click area larger for the "item action ... ui dropdown" items */
}

.comment-body {
background: var(--color-box-body);
border: none !important;
Expand Down
10 changes: 5 additions & 5 deletions web_src/css/repo/reactions.css
Original file line number Diff line number Diff line change
Expand Up @@ -41,16 +41,16 @@
margin-left: 4px;
}

.ui.dropdown.select-reaction .menu {
min-width: 170px; /* item-outer-width * 4 */
.ui.dropdown.select-reaction .menu.visible {
display: grid !important;
grid-template-columns: repeat(4, 1fr);
padding: 4px;
}

.ui.dropdown.select-reaction .menu > .item {
float: left;
margin: 4px;
font-size: 20px;
width: 34px;
height: 34px;
font-size: 16px;
border-radius: var(--border-radius);
display: flex;
align-items: center;
Expand Down
2 changes: 1 addition & 1 deletion web_src/css/review.css
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
}

.comment-code-cloud {
padding: 0.5rem 1rem !important;
padding: 0.5rem !important;
position: relative;
}

Expand Down
4 changes: 2 additions & 2 deletions web_src/js/components/RepoActionView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -489,7 +489,7 @@ export default defineComponent({
<button class="ui basic small compact button red" @click="cancelRun()" v-else-if="run.canCancel">
{{ locale.cancel }}
</button>
<button class="ui basic small compact button link-action" :data-url="`${run.link}/rerun`" v-else-if="run.canRerun">
<button class="ui basic small compact button link-action tw-shrink-0" :data-url="`${run.link}/rerun`" v-else-if="run.canRerun">
{{ locale.rerun_all }}
</button>
</div>
Expand Down Expand Up @@ -520,7 +520,7 @@ export default defineComponent({
<span class="job-brief-name tw-mx-2 gt-ellipsis">{{ job.name }}</span>
</div>
<span class="job-brief-item-right">
<SvgIcon name="octicon-sync" role="button" :data-tooltip-content="locale.rerun" class="job-brief-rerun tw-mx-2 link-action" :data-url="`${run.link}/jobs/${index}/rerun`" v-if="job.canRerun"/>
<SvgIcon name="octicon-sync" role="button" :data-tooltip-content="locale.rerun" class="job-brief-rerun tw-mx-2 link-action interact-fg" :data-url="`${run.link}/jobs/${index}/rerun`" v-if="job.canRerun"/>
<span class="step-summary-duration">{{ job.duration }}</span>
</span>
</a>
Expand Down