From 22b0dfbb35f10f22ef0485e289f44532d7a71863 Mon Sep 17 00:00:00 2001 From: Adam Strzelecki Date: Mon, 30 Nov 2015 15:38:58 +0100 Subject: [PATCH] CSS: Ensure Octicons are used with 16px font size Semantic UI .icon 1em font-size has priority over .octicon 16px, resulting octicons rendered at 14px font-size, which is not okay since Octicons are meant to be shown sizes that are multiples of 16px. --- public/css/gogs.css | 4 +++- public/less/_octicons.less | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/public/css/gogs.css b/public/css/gogs.css index d58c4e2540..19a34b8fe2 100755 --- a/public/css/gogs.css +++ b/public/css/gogs.css @@ -5,7 +5,9 @@ font-style: normal; } .octicon, -.mega-octicon { +.mega-octicon, +.icon.octicon, +.icon.mega-octicon { font: normal normal normal 16px/1 octicons; display: inline-block; text-decoration: none; diff --git a/public/less/_octicons.less b/public/less/_octicons.less index dfd437e6b1..a159dec851 100755 --- a/public/less/_octicons.less +++ b/public/less/_octicons.less @@ -14,7 +14,9 @@ // .octicon is optimized for 16px. // .mega-octicon is optimized for 32px but can be used larger. -.octicon, .mega-octicon { +.octicon, .mega-octicon, +// ensure Semantic UI .icon of 14px does not apply to .icon.octicon: +.icon.octicon, .icon.mega-octicon { font: normal normal normal 16px/1 octicons; display: inline-block; text-decoration: none;