Prevent .code-view from overriding font on icon fonts (#8614)

diff --git a/public/css/index.css b/public/css/index.css
index 03a199d0b9af42496193c9f12e842dbfd12a93c8..9292604422dd1758e33408bada932e053e0df958 100644 (file)
--- a/public/css/index.css
+++ b/public/css/index.css
@@ -243,7 +243,7 @@ i.icon.centerlock{top:1.5em}
 .lines-commit .ui.avatar.image{height:18px;width:18px}
 .lines-code .bottom-line,.lines-commit .bottom-line,.lines-num .bottom-line{border-bottom:1px solid #eaecef}
 .code-view{overflow:auto;overflow-x:auto;overflow-y:hidden}
-.code-view *{font-size:12px;font-family:'SF Mono',Consolas,Menlo,'Liberation Mono',Monaco,'Lucida Console',monospace;line-height:20px}
+.code-view :not(.fa):not(.octicon):not(.icon){font-size:12px;font-family:'SF Mono',Consolas,Menlo,'Liberation Mono',Monaco,'Lucida Console',monospace;line-height:20px}
 .code-view table{width:100%}
 .code-view .active{background:#fff866}
 .markdown:not(code){overflow:hidden;font-size:16px;line-height:1.6!important;word-wrap:break-word}

diff --git a/public/less/_base.less b/public/less/_base.less
index 62b2084a3b3d77e06c2e0d2341b9250ef54bdb3c..1a386f17b0cecfbd8cb502468c330bddc12c8137 100644 (file)
--- a/public/less/_base.less
+++ b/public/less/_base.less
@@ -1063,7 +1063,7 @@ i.icon.centerlock {
     overflow-x: auto;
     overflow-y: hidden;
 
-    * {
+    *:not(.fa):not(.octicon):not(.icon) {
         font-size: 12px;
         font-family: @monospaced-fonts, monospace;
         line-height: 20px;