From 0068b8106ba1c3dbe79bf6dfff79be470e950f4a Mon Sep 17 00:00:00 2001
From: Adam Strzelecki <ono@java.pl>
Date: Thu, 3 Dec 2015 02:18:38 +0100
Subject: [PATCH] CSS: Octicons 16px fix outside of _octicons.less

Otherwise the fix will be overwritten by next _octicons.less update.

This is follow-up for 22b0dfbb35f10f22ef0485e289f44532d7a71863.
---
 public/css/gogs.css        | 5 ++---
 public/less/_base.less     | 2 ++
 public/less/_octicons.less | 4 +---
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/public/css/gogs.css b/public/css/gogs.css
index c3ac5ffc..426d8524 100755
--- a/public/css/gogs.css
+++ b/public/css/gogs.css
@@ -5,9 +5,7 @@
   font-style: normal;
 }
 .octicon,
-.mega-octicon,
-.icon.octicon,
-.icon.mega-octicon {
+.mega-octicon {
   font: normal normal normal 16px/1 octicons;
   display: inline-block;
   text-decoration: none;
@@ -1052,6 +1050,7 @@ footer .container .links > *:first-child {
 .octicon.icon,
 .mega-octicon.icon {
   font-family: octicons;
+  font-size: 16px;
   opacity: 1 !important;
 }
 .sr-only {
diff --git a/public/less/_base.less b/public/less/_base.less
index 77ed7545..fd12c80b 100644
--- a/public/less/_base.less
+++ b/public/less/_base.less
@@ -313,9 +313,11 @@ footer {
   .generate-img(@n, (@i + 1));
 }
 
+// ensure Semantic UI .icon font family and 14px size does not apply to .icon.octicon
 .octicon.icon,
 .mega-octicon.icon {
 	font-family: octicons;
+	font-size: 16px;
 	opacity: 1 !important;
 }
 
diff --git a/public/less/_octicons.less b/public/less/_octicons.less
index a159dec8..dfd437e6 100755
--- a/public/less/_octicons.less
+++ b/public/less/_octicons.less
@@ -14,9 +14,7 @@
 
 // .octicon is optimized for 16px.
 // .mega-octicon is optimized for 32px but can be used larger.
-.octicon, .mega-octicon,
-// ensure Semantic UI .icon of 14px does not apply to .icon.octicon:
-.icon.octicon, .icon.mega-octicon {
+.octicon, .mega-octicon {
   font: normal normal normal 16px/1 octicons;
   display: inline-block;
   text-decoration: none;