fix

go-gitea · Mar 18, 2024 · f66f1c3 · f66f1c3
1 parent 9322be9
commit f66f1c3
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 11 deletions.
diff --git a/templates/repo/settings/options.tmpl b/templates/repo/settings/options.tmpl
@@ -122,7 +122,7 @@
  <tbody>
  <tr>
  <td colspan="4">
- <div class="text red gt-py-4 tw-border tw-border-b-secondary">{{ctx.Locale.Tr "repo.settings.mirror_settings.direction.pull"}}: {{ctx.Locale.Tr "error.occurred"}}</div>
+ <div class="text red gt-py-4">{{ctx.Locale.Tr "repo.settings.mirror_settings.direction.pull"}}: {{ctx.Locale.Tr "error.occurred"}}</div>
  </td>
  </tr>
  </tbody>
@@ -201,8 +201,8 @@
  </td>
  </tr>
  </tbody>
+ {{end}}{{/* end if: IsMirror */}}
  </table>
- {{end}}{{/* end if: IsMirror */}}
 
  <table class="ui table">
  <thead>

diff --git a/templates/status/500.tmpl b/templates/status/500.tmpl
@@ -16,7 +16,7 @@
 </head>
 <body>
  <div class="full height">
- <nav class="ui secondary menu tw-border-b tw-border-b-secondary">
+ <nav class="ui secondary menu">
  <div class="ui container gt-df">
  <div class="item gt-f1">
  <a href="{{AppSubUrl}}/" aria-label="{{ctx.Locale.Tr "home"}}">
@@ -28,6 +28,7 @@
  </div>
  </div>
  </nav>
+ <div class="divider"></div>
  <div role="main" class="page-content status-page-500">
  <div class="ui container" >
  <style> .ui.message.flash-message { text-align: left; } </style>

diff --git a/web_src/js/components/DashboardRepoList.vue b/web_src/js/components/DashboardRepoList.vue
@@ -425,8 +425,9 @@ export default sfc; // activate the IDE's Vue plugin
  </a>
  </li>
  </ul>
- <div v-if="showMoreReposLink" class="center gt-py-3 tw-border-t tw-border-t-secondary">
- <div class="ui borderless pagination menu narrow">
+ <div v-if="showMoreReposLink" class="tw-text-center">
+ <div class="divider gt-my-0"></div>
+ <div class="ui borderless pagination menu narrow gt-my-3">
  <a
  class="item navigation gt-py-2" :class="{'disabled': page === 1}"
  @click="changePage(1)" :title="textFirstPage"

diff --git a/web_src/js/components/DiffCommitSelector.vue b/web_src/js/components/DiffCommitSelector.vue
@@ -204,7 +204,7 @@ export default {
  </button>
  <div class="menu left transition" id="diff-commit-selector-menu" :class="{visible: menuVisible}" v-show="menuVisible" v-cloak :aria-expanded="menuVisible ? 'true': 'false'">
  <div class="loading-indicator is-loading" v-if="isLoading"/>
- <div v-if="!isLoading" class="vertical item gt-df gt-fc gt-gap-2" id="diff-commit-list-show-all" role="menuitem" @keydown.enter="showAllChanges()" @click="showAllChanges()">
+ <div v-if="!isLoading" class="vertical item" id="diff-commit-list-show-all" role="menuitem" @keydown.enter="showAllChanges()" @click="showAllChanges()">
  <div class="gt-ellipsis">
  {{ locale.show_all_commits }}
  </div>
@@ -215,7 +215,7 @@ export default {
  <!-- only show the show changes since last review if there is a review AND we are commits ahead of the last review -->
  <div
  v-if="lastReviewCommitSha != null" role="menuitem"
- class="vertical item gt-df gt-fc gt-gap-2 tw-border-t tw-border-t-secondary"
+ class="vertical item"
  :class="{disabled: commitsSinceLastReview === 0}"
  @keydown.enter="changesSinceLastReviewClick()"
  @click="changesSinceLastReviewClick()"
@@ -227,10 +227,10 @@ export default {
  {{ commitsSinceLastReview }} commits
  </div>
  </div>
- <span v-if="!isLoading" class="info tw-border-t tw-border-t-secondary text light-2">{{ locale.select_commit_hold_shift_for_range }}</span>
+ <span v-if="!isLoading" class="info text light-2">{{ locale.select_commit_hold_shift_for_range }}</span>
  <template v-for="commit in commits" :key="commit.id">
  <div
- class="vertical item gt-df gt-gap-2 tw-border-t tw-border-t-secondary" role="menuitem"
+ class="vertical item" role="menuitem"
  :class="{selection: commit.selected, hovered: commit.hovered}"
  @keydown.enter.exact="commitClicked(commit.id)"
  @keydown.enter.shift.exact="commitClickedShift(commit)"
@@ -285,10 +285,14 @@ export default {
  width: 350px;
  }
 
- #diff-commit-selector-menu .item {
+ #diff-commit-selector-menu .item,
+ #diff-commit-selector-menu .info {
+ display: flex !important;
  flex-direction: row;
  line-height: 1.4;
  padding: 7px 14px !important;
+ border-top: 1px solid var(--color-secondary) !important;
+ gap: 0.25em;
  }
 
  #diff-commit-selector-menu .item:focus {

diff --git a/web_src/js/features/repo-diff-commit.js b/web_src/js/features/repo-diff-commit.js
@@ -39,7 +39,7 @@ function addLink(parent, href, text, tooltip) {
  link.href = href;
  link.textContent = text;
  if (tooltip) {
- link.classList.add('tw-border tw-border-secondary', 'tw-rounded');
+ link.classList.add('tw-border', 'tw-border-secondary', 'tw-rounded');
  link.setAttribute('data-tooltip-content', tooltip);
  }
  parent.append(link);