From ccf5298a2c4e9137fbf070e07111d7e90ae5f8ab Mon Sep 17 00:00:00 2001 From: guillep2k <18600385+guillep2k@users.noreply.github.com> Date: Tue, 22 Oct 2019 03:39:40 -0300 Subject: [PATCH] Prevent .code-view from overriding font on icon fonts (#8614) (#8627) --- public/css/index.css | 2 +- public/less/_base.less | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/public/css/index.css b/public/css/index.css index e34f8ec4a2..c11b16c828 100644 --- a/public/css/index.css +++ b/public/css/index.css @@ -239,7 +239,7 @@ footer .ui.left,footer .ui.right{line-height:40px} .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 e295be368d..a916e08bd3 100644 --- a/public/less/_base.less +++ b/public/less/_base.less @@ -1047,7 +1047,7 @@ footer { overflow-x: auto; overflow-y: hidden; - * { + *:not(.fa):not(.octicon):not(.icon) { font-size: 12px; font-family: @monospaced-fonts, monospace; line-height: 20px;