From 6c81b738f71e46aae33424051ac3e4cffa974fed Mon Sep 17 00:00:00 2001
From: Cirno the Strongest <1447794+CirnoT@users.noreply.github.com>
Date: Thu, 18 Jun 2020 03:20:07 +0200
Subject: [PATCH] Update Fomantic-UI to 2.8.6 and remove old workarounds
 (#11933)

Co-authored-by: zeripath <art27@cantab.net>
Co-authored-by: techknowlogick <techknowlogick@gitea.io>
---
 package-lock.json                           | 30 +++++++--------------
 package.json                                |  2 +-
 semantic.json                               |  2 +-
 templates/repo/issue/view_content/pull.tmpl |  4 +--
 web_src/less/_base.less                     |  8 ------
 web_src/less/_repository.less               |  3 ---
 6 files changed, 14 insertions(+), 35 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 4ee0f0d65..13edbf798 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1048,23 +1048,13 @@
       },
       "dependencies": {
         "@octokit/request-error": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-2.0.1.tgz",
-          "integrity": "sha512-5lqBDJ9/TOehK82VvomQ6zFiZjPeSom8fLkFVLuYL3sKiIb5RB8iN/lenLkY7oBmyQcGP7FBMGiIZTO8jufaRQ==",
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-2.0.2.tgz",
+          "integrity": "sha512-2BrmnvVSV1MXQvEkrb9zwzP0wXFNbPJij922kYBTLIlIafukrGOb+ABBT2+c6wZiuyWDH1K1zmjGQ0toN/wMWw==",
           "requires": {
-            "@octokit/types": "^4.0.1",
+            "@octokit/types": "^5.0.1",
             "deprecation": "^2.0.0",
             "once": "^1.4.0"
-          },
-          "dependencies": {
-            "@octokit/types": {
-              "version": "4.1.10",
-              "resolved": "https://registry.npmjs.org/@octokit/types/-/types-4.1.10.tgz",
-              "integrity": "sha512-/wbFy1cUIE5eICcg0wTKGXMlKSbaAxEr00qaBXzscLXpqhcwgXeS6P8O0pkysBhRfyjkKjJaYrvR1ExMO5eOXQ==",
-              "requires": {
-                "@types/node": ">= 8"
-              }
-            }
           }
         },
         "universal-user-agent": {
@@ -1121,9 +1111,9 @@
       }
     },
     "@octokit/types": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-5.0.0.tgz",
-      "integrity": "sha512-3LVS+MbeqwSd5G4KS8123cZz+hWomsiGeMnQ/QJIBFDwL/YHX8kkr0FZXrgWEMO7Fgi2/VOrhbiFnk9sZ+s4qA==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-5.0.1.tgz",
+      "integrity": "sha512-GorvORVwp244fGKEt3cgt/P+M0MGy4xEDbckw+K5ojEezxyMDgCaYPKVct+/eWQfZXOT7uq0xRpmrl/+hliabA==",
       "requires": {
         "@types/node": ">= 8"
       }
@@ -5466,9 +5456,9 @@
       }
     },
     "fomantic-ui": {
-      "version": "2.8.5",
-      "resolved": "https://registry.npmjs.org/fomantic-ui/-/fomantic-ui-2.8.5.tgz",
-      "integrity": "sha512-VvnralD84d6sRfp/FYYURLeNXi7QeKfLje5En2MNGRFRfR3t+J3KEPSk7g8NBP4KJWsW3Hr8Lne0p9ErA05aug==",
+      "version": "2.8.6",
+      "resolved": "https://registry.npmjs.org/fomantic-ui/-/fomantic-ui-2.8.6.tgz",
+      "integrity": "sha512-4/CU9XeaX42LHWmajOxJf2f3vXK++qOG5nhEv9Gjw7T7dA4MzI5I5XSpoRkQ2L5u3v4c+iiPKJAJpExWtvh23w==",
       "requires": {
         "@octokit/rest": "^16.16.0",
         "better-console": "1.0.1",
diff --git a/package.json b/package.json
index 2320a45f4..862f16616 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
     "dropzone": "5.7.1",
     "fast-glob": "3.2.2",
     "file-loader": "6.0.0",
-    "fomantic-ui": "2.8.5",
+    "fomantic-ui": "2.8.6",
     "highlight.js": "10.0.3",
     "jquery": "3.5.1",
     "jquery.are-you-sure": "1.9.0",
diff --git a/semantic.json b/semantic.json
index 0d7763a46..5136c2030 100644
--- a/semantic.json
+++ b/semantic.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.8.5",
+  "version": "2.8.6",
   "base": "node_modules/fomantic-ui",
   "paths": {
     "source": {
diff --git a/templates/repo/issue/view_content/pull.tmpl b/templates/repo/issue/view_content/pull.tmpl
index aacbb0c39..dc897bd7b 100644
--- a/templates/repo/issue/view_content/pull.tmpl
+++ b/templates/repo/issue/view_content/pull.tmpl
@@ -194,7 +194,7 @@
 						</div>
 					{{end}}
 				{{end}}
-				
+
 				{{$canAutoMerge = true}}
 				{{if (gt .Issue.PullRequest.CommitsBehind 0)}}
 					<div class="ui divider"></div>
@@ -312,7 +312,7 @@
 								</button>
 								<div class="ui dropdown icon button">
 									<i class="dropdown icon"></i>
-									<div class="menu left">
+									<div class="menu">
 										{{if $prUnit.PullRequestsConfig.AllowMerge}}
 										<div class="item{{if eq .MergeStyle "merge"}} active selected{{end}}" data-do="merge">{{$.i18n.Tr "repo.pulls.merge_pull_request"}}</div>
 										{{end}}
diff --git a/web_src/less/_base.less b/web_src/less/_base.less
index a80806ec2..b3afe3648 100644
--- a/web_src/less/_base.less
+++ b/web_src/less/_base.less
@@ -1048,14 +1048,6 @@ i.icon.centerlock {
     top: 1em;
 }
 
-// temporary workaround for fomantic 2.8.5 bug
-// https://github.com/go-gitea/gitea/pull/11767
-i.icon,
-i.icons {
-    vertical-align: unset;
-    line-height: unset;
-}
-
 .ui.label {
     padding: .3em .5em;
 }
diff --git a/web_src/less/_repository.less b/web_src/less/_repository.less
index ca3d56592..795deeb49 100644
--- a/web_src/less/_repository.less
+++ b/web_src/less/_repository.less
@@ -652,9 +652,6 @@
                     margin-left: 10px;
                     margin-top: 10px;
                 }
-                .icon-octicon {
-                    padding-left: 2px;
-                }
                 .branch-update.grid {
                     .row {
                         padding-bottom: 1rem;