Various UI fixes (#14239)

* Fix #14238

* Fix #14235

* Fix #14237

* Fix #14234

* Use octicon to show private status of repo in admin dashboard

* Fix #14232

* Fix #14236

diff --git a/templates/admin/repo/list.tmpl b/templates/admin/repo/list.tmpl
index 5f8db358532326d29c90a1b405d98bf5d02e060b..17a6871b3a75f5dd2672a9e54bb55e565b260e0a 100644 (file)
--- a/templates/admin/repo/list.tmpl
+++ b/templates/admin/repo/list.tmpl
@@ -22,7 +22,6 @@
                                                        {{.i18n.Tr "admin.repos.name"}}
                                                        {{SortArrow "alphabetically" "reversealphabetically" $.SortType false}}
                                                </th>
-                                               <th>{{.i18n.Tr "admin.repos.private"}}</th>
                                                <th>{{.i18n.Tr "admin.repos.watches"}}</th>
                                                <th  data-sortt-asc="moststars" data-sortt-desc="feweststars">
                                                        {{.i18n.Tr "admin.repos.stars"}}
@@ -51,8 +50,12 @@
                                                                        <span class="text gold">{{svg "octicon-lock"}}</span>
                                                                {{end}}
                                                        </td>
-                                                       <td><a href="{{AppSubUrl}}/{{.Owner.Name}}/{{.Name}}">{{.Name}}</a></td>
-                                                       <td>{{if .IsPrivate}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</td>
+                                                       <td>
+                                                               <a href="{{AppSubUrl}}/{{.Owner.Name}}/{{.Name}}">{{.Name}}</a>
+                                                               {{if .IsPrivate}}
+                                                                       <span class="text gold">{{svg "octicon-lock"}}</span>
+                                                               {{end}}
+                                                       </td>
                                                        <td>{{.NumWatches}}</td>
                                                        <td>{{.NumStars}}</td>
                                                        <td>{{.NumForks}}</td>

diff --git a/templates/explore/organizations.tmpl b/templates/explore/organizations.tmpl
index 8785ac84db2c7d7f4f288147c6574c1f4fb00a85..b039c1ad2a13857127755d1a78bd8cb93e142139 100644 (file)
--- a/templates/explore/organizations.tmpl
+++ b/templates/explore/organizations.tmpl
@@ -12,7 +12,7 @@
                                        <span class="header">
                                                <a href="{{.HomeLink}}">{{.Name}}</a> {{.FullName}}
                                                {{if .Visibility.IsPrivate}}
-                                                       <span class="text gold">{{svg "octicon-lock"}}</span>
+                                                       <span class="ui basic label">{{$.i18n.Tr "repo.desc.private"}}</span>
                                                {{end}}
                                        </span>
                                        <div class="description">

diff --git a/templates/user/settings/grants_oauth2.tmpl b/templates/user/settings/grants_oauth2.tmpl
index 0b635ae0a9c70074685ceda2be6696954fae4ee6..cf24252ededc97c37a1ee0bac41afa26cf6ec711 100644 (file)
--- a/templates/user/settings/grants_oauth2.tmpl
+++ b/templates/user/settings/grants_oauth2.tmpl
@@ -15,7 +15,9 @@
                                                {{$.i18n.Tr "settings.revoke_key"}}
                                        </button>
                                </div>
-                               {{svg "octicon-key"}}
+                               <div class="left floated content">
+                                       {{svg "octicon-key"}}
+                               </div>
                                <div class="content">
                                        <strong>{{$grant.Application.Name}}</strong>
                                        <div class="activity meta">

diff --git a/web_src/less/_base.less b/web_src/less/_base.less
index 9ae13b8c019dc881ff527041a41119393d8eb0d3..10786b905892a69cc89292b3ad08c2ed99713f25 100644 (file)
--- a/web_src/less/_base.less
+++ b/web_src/less/_base.less
@@ -1556,10 +1556,13 @@ a.ui.label:hover {
 .ui.button {
   background: var(--color-button);
   border: 1px solid var(--color-light-border);
-  box-shadow: none !important;
   color: var(--color-text);
 }
 
+.page-content .ui.button {
+  box-shadow: none !important;
+}
+
 .ui.button:hover {
   background: var(--color-hover);
   color: var(--color-text);

diff --git a/web_src/less/_dashboard.less b/web_src/less/_dashboard.less
index 1330b04abbea222c8a18c4889ea3ddf6d6cb567b..4ffdc9136f84cd8f6ebe264b62d74273ce70c487 100644 (file)
--- a/web_src/less/_dashboard.less
+++ b/web_src/less/_dashboard.less
@@ -111,6 +111,7 @@
 
     .issue.title {
       width: 80%;
+      margin: 0 0 1em;
     }
 
     .push.news .content ul {

diff --git a/web_src/less/_repository.less b/web_src/less/_repository.less
index b19eec58ebf08230e3a746c17d042a50f4a3a5db..6c7de750753104ed4dcb8e772af822f539e8fc31 100644 (file)
--- a/web_src/less/_repository.less
+++ b/web_src/less/_repository.less
@@ -1475,7 +1475,7 @@
     }
   }
 
-  .diff-box .header {
+  .diff-box .header:not(.resolved-placeholder) {
     display: flex;
     align-items: center;
 
@@ -1493,6 +1493,15 @@
     }
   }
 
+  .diff-box .resolved-placeholder {
+    display: flex;
+    align-items: center;
+
+    .button {
+      padding: 8px 12px;
+    }
+  }
+
   .diff-file-box {
     margin-top: 1rem;
     margin-bottom: 1rem;
@@ -2697,7 +2706,12 @@ tbody.commit-list {
 
 .commit-body {
   white-space: pre-wrap;
-  margin: 0;
+}
+
+.repository:not(.diff) {
+  .commit-body {
+    margin: 0;
+  }
 }
 
 .git-notes.top {