Skip to content

Commit 86ae233

Browse files
silverwindsilverwind
committed
migrate secondary border
1 parent 8a75915 commit 86ae233

File tree

8 files changed

+10
-16
lines changed

8 files changed

+10
-16
lines changed

‎templates/devtest/flex-list.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@
104104
</div>
105105

106106
<h1>If parent provides the padding/margin space:</h1>
107-
<div class="gt-border-secondary gt-py-4">
107+
<div class="tw-border tw-border-secondary gt-py-4">
108108
<div class="flex-list flex-space-fitted">
109109
<div class="flex-item">item 1 (no padding top)</div>
110110
<div class="flex-item">item 2 (no padding bottom)</div>

‎templates/devtest/gitea-ui.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,8 @@
9595

9696
<div>
9797
<h1>Loading</h1>
98-
<div class="is-loading small-loading-icon gt-border-secondary gt-py-2"><span>loading ...</span></div>
99-
<div class="is-loading gt-border-secondary gt-py-4">
98+
<div class="is-loading small-loading-icon tw-border tw-border-secondary gt-py-2"><span>loading ...</span></div>
99+
<div class="is-loading tw-border tw-border-secondary gt-py-4">
100100
<p>loading ...</p>
101101
<p>loading ...</p>
102102
<p>loading ...</p>

‎templates/repo/settings/options.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@
122122
<tbody>
123123
<tr>
124124
<td colspan="4">
125-
<div class="text red gt-py-4 gt-border-secondary-bottom">{{ctx.Locale.Tr "repo.settings.mirror_settings.direction.pull"}}: {{ctx.Locale.Tr "error.occurred"}}</div>
125+
<div class="text red gt-py-4 tw-border tw-border-secondary-bottom">{{ctx.Locale.Tr "repo.settings.mirror_settings.direction.pull"}}: {{ctx.Locale.Tr "error.occurred"}}</div>
126126
</td>
127127
</tr>
128128
</tbody>

‎templates/status/500.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
</head>
1717
<body>
1818
<div class="full height">
19-
<nav class="ui secondary menu gt-border-secondary-bottom">
19+
<nav class="ui secondary menu tw-border-b tw-border-b-secondary">
2020
<div class="ui container gt-df">
2121
<div class="item gt-f1">
2222
<a href="{{AppSubUrl}}/" aria-label="{{ctx.Locale.Tr "home"}}">

‎web_src/css/helpers.css

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,6 @@ Gitea's private styles use `g-` prefix.
5252
.gt-font-semibold { font-weight: var(--font-weight-semibold) !important; }
5353
.gt-font-bold { font-weight: var(--font-weight-bold) !important; }
5454

55-
.gt-border-secondary { border: 1px solid var(--color-secondary) !important; }
56-
.gt-border-secondary-top { border-top: 1px solid var(--color-secondary) !important; }
57-
.gt-border-secondary-bottom { border-bottom: 1px solid var(--color-secondary) !important; }
58-
.gt-border-secondary-left { border-left: 1px solid var(--color-secondary) !important; }
59-
.gt-border-secondary-right { border-right: 1px solid var(--color-secondary) !important; }
60-
6155
.interact-fg { color: inherit !important; }
6256
.interact-fg:hover { color: var(--color-primary) !important; }
6357
.interact-fg:active { color: var(--color-primary-active) !important; }

‎web_src/js/components/DashboardRepoList.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -425,7 +425,7 @@ export default sfc; // activate the IDE's Vue plugin
425425
</a>
426426
</li>
427427
</ul>
428-
<div v-if="showMoreReposLink" class="center gt-py-3 gt-border-secondary-top">
428+
<div v-if="showMoreReposLink" class="center gt-py-3 tw-border-t tw-border-t-secondary">
429429
<div class="ui borderless pagination menu narrow">
430430
<a
431431
class="item navigation gt-py-2" :class="{'disabled': page === 1}"

‎web_src/js/components/DiffCommitSelector.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ export default {
215215
<!-- only show the show changes since last review if there is a review AND we are commits ahead of the last review -->
216216
<div
217217
v-if="lastReviewCommitSha != null" role="menuitem"
218-
class="vertical item gt-df gt-fc gt-gap-2 gt-border-secondary-top"
218+
class="vertical item gt-df gt-fc gt-gap-2 tw-border-t tw-border-t-secondary"
219219
:class="{disabled: commitsSinceLastReview === 0}"
220220
@keydown.enter="changesSinceLastReviewClick()"
221221
@click="changesSinceLastReviewClick()"
@@ -227,10 +227,10 @@ export default {
227227
{{ commitsSinceLastReview }} commits
228228
</div>
229229
</div>
230-
<span v-if="!isLoading" class="info gt-border-secondary-top text light-2">{{ locale.select_commit_hold_shift_for_range }}</span>
230+
<span v-if="!isLoading" class="info tw-border-t tw-border-t-secondary text light-2">{{ locale.select_commit_hold_shift_for_range }}</span>
231231
<template v-for="commit in commits" :key="commit.id">
232232
<div
233-
class="vertical item gt-df gt-gap-2 gt-border-secondary-top" role="menuitem"
233+
class="vertical item gt-df gt-gap-2 tw-border-t tw-border-t-secondary" role="menuitem"
234234
:class="{selection: commit.selected, hovered: commit.hovered}"
235235
@keydown.enter.exact="commitClicked(commit.id)"
236236
@keydown.enter.shift.exact="commitClickedShift(commit)"

‎web_src/js/features/repo-diff-commit.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ function addLink(parent, href, text, tooltip) {
3939
link.href = href;
4040
link.textContent = text;
4141
if (tooltip) {
42-
link.classList.add('gt-border-secondary', 'tw-rounded');
42+
link.classList.add('tw-border tw-border-secondary', 'tw-rounded');
4343
link.setAttribute('data-tooltip-content', tooltip);
4444
}
4545
parent.append(link);

0 commit comments

Comments
 (0)