From c2ca103d30b0f47b5ad0fa544ab5a07263894ea3 Mon Sep 17 00:00:00 2001 From: Unknwon Date: Sat, 5 Mar 2016 23:09:16 -0500 Subject: [PATCH] #2623 fix wrong font for webhook history --- public/css/gogs.css | 276 ++++++++++++++++++------------------- public/less/_markdown.less | 2 +- 2 files changed, 139 insertions(+), 139 deletions(-) diff --git a/public/css/gogs.css b/public/css/gogs.css index 00b1637d9..744f6b7b1 100644 --- a/public/css/gogs.css +++ b/public/css/gogs.css @@ -402,30 +402,30 @@ footer .container .links > *:first-child { background: inherit !important; padding: 0 !important; } -.markdown { +.markdown:not(code) { overflow: hidden; font-family: "Helvetica Neue", Helvetica, "Segoe UI", Arial, freesans, sans-serif; font-size: 16px; line-height: 1.6 !important; word-wrap: break-word; } -.markdown.file-view { +.markdown:not(code).file-view { padding: 2em 2em 2em !important; } -.markdown > *:first-child { +.markdown:not(code) > *:first-child { margin-top: 0 !important; } -.markdown > *:last-child { +.markdown:not(code) > *:last-child { margin-bottom: 0 !important; } -.markdown a:not([href]) { +.markdown:not(code) a:not([href]) { color: inherit; text-decoration: none; } -.markdown .absent { +.markdown:not(code) .absent { color: #c00; } -.markdown .anchor { +.markdown:not(code) .anchor { position: absolute; top: 0; left: 0; @@ -434,217 +434,217 @@ footer .container .links > *:first-child { padding-left: 30px; margin-left: -30px; } -.markdown .anchor:focus { +.markdown:not(code) .anchor:focus { outline: none; } -.markdown h1, -.markdown h2, -.markdown h3, -.markdown h4, -.markdown h5, -.markdown h6 { +.markdown:not(code) h1, +.markdown:not(code) h2, +.markdown:not(code) h3, +.markdown:not(code) h4, +.markdown:not(code) h5, +.markdown:not(code) h6 { position: relative; margin-top: 1em; margin-bottom: 16px; font-weight: bold; line-height: 1.4; } -.markdown h1:first-of-type, -.markdown h2:first-of-type, -.markdown h3:first-of-type, -.markdown h4:first-of-type, -.markdown h5:first-of-type, -.markdown h6:first-of-type { +.markdown:not(code) h1:first-of-type, +.markdown:not(code) h2:first-of-type, +.markdown:not(code) h3:first-of-type, +.markdown:not(code) h4:first-of-type, +.markdown:not(code) h5:first-of-type, +.markdown:not(code) h6:first-of-type { margin-top: 0 !important; } -.markdown h1 .octicon-link, -.markdown h2 .octicon-link, -.markdown h3 .octicon-link, -.markdown h4 .octicon-link, -.markdown h5 .octicon-link, -.markdown h6 .octicon-link { +.markdown:not(code) h1 .octicon-link, +.markdown:not(code) h2 .octicon-link, +.markdown:not(code) h3 .octicon-link, +.markdown:not(code) h4 .octicon-link, +.markdown:not(code) h5 .octicon-link, +.markdown:not(code) h6 .octicon-link { display: none; color: #000; vertical-align: middle; } -.markdown h1:hover .anchor, -.markdown h2:hover .anchor, -.markdown h3:hover .anchor, -.markdown h4:hover .anchor, -.markdown h5:hover .anchor, -.markdown h6:hover .anchor { +.markdown:not(code) h1:hover .anchor, +.markdown:not(code) h2:hover .anchor, +.markdown:not(code) h3:hover .anchor, +.markdown:not(code) h4:hover .anchor, +.markdown:not(code) h5:hover .anchor, +.markdown:not(code) h6:hover .anchor { padding-left: 8px; margin-left: -30px; text-decoration: none; } -.markdown h1:hover .anchor .octicon-link, -.markdown h2:hover .anchor .octicon-link, -.markdown h3:hover .anchor .octicon-link, -.markdown h4:hover .anchor .octicon-link, -.markdown h5:hover .anchor .octicon-link, -.markdown h6:hover .anchor .octicon-link { +.markdown:not(code) h1:hover .anchor .octicon-link, +.markdown:not(code) h2:hover .anchor .octicon-link, +.markdown:not(code) h3:hover .anchor .octicon-link, +.markdown:not(code) h4:hover .anchor .octicon-link, +.markdown:not(code) h5:hover .anchor .octicon-link, +.markdown:not(code) h6:hover .anchor .octicon-link { display: inline-block; } -.markdown h1 tt, -.markdown h1 code, -.markdown h2 tt, -.markdown h2 code, -.markdown h3 tt, -.markdown h3 code, -.markdown h4 tt, -.markdown h4 code, -.markdown h5 tt, -.markdown h5 code, -.markdown h6 tt, -.markdown h6 code { +.markdown:not(code) h1 tt, +.markdown:not(code) h1 code, +.markdown:not(code) h2 tt, +.markdown:not(code) h2 code, +.markdown:not(code) h3 tt, +.markdown:not(code) h3 code, +.markdown:not(code) h4 tt, +.markdown:not(code) h4 code, +.markdown:not(code) h5 tt, +.markdown:not(code) h5 code, +.markdown:not(code) h6 tt, +.markdown:not(code) h6 code { font-size: inherit; } -.markdown h1 { +.markdown:not(code) h1 { padding-bottom: 0.3em; font-size: 2.25em; line-height: 1.2; border-bottom: 1px solid #eee; } -.markdown h1 .anchor { +.markdown:not(code) h1 .anchor { line-height: 1; } -.markdown h2 { +.markdown:not(code) h2 { padding-bottom: 0.3em; font-size: 1.75em; line-height: 1.225; border-bottom: 1px solid #eee; } -.markdown h2 .anchor { +.markdown:not(code) h2 .anchor { line-height: 1; } -.markdown h3 { +.markdown:not(code) h3 { font-size: 1.5em; line-height: 1.43; } -.markdown h3 .anchor { +.markdown:not(code) h3 .anchor { line-height: 1.2; } -.markdown h4 { +.markdown:not(code) h4 { font-size: 1.25em; } -.markdown h4 .anchor { +.markdown:not(code) h4 .anchor { line-height: 1.2; } -.markdown h5 { +.markdown:not(code) h5 { font-size: 1em; } -.markdown h5 .anchor { +.markdown:not(code) h5 .anchor { line-height: 1.1; } -.markdown h6 { +.markdown:not(code) h6 { font-size: 1em; color: #777; } -.markdown h6 .anchor { +.markdown:not(code) h6 .anchor { line-height: 1.1; } -.markdown p, -.markdown blockquote, -.markdown ul, -.markdown ol, -.markdown dl, -.markdown table, -.markdown pre { +.markdown:not(code) p, +.markdown:not(code) blockquote, +.markdown:not(code) ul, +.markdown:not(code) ol, +.markdown:not(code) dl, +.markdown:not(code) table, +.markdown:not(code) pre { margin-top: 0; margin-bottom: 16px; } -.markdown blockquote { +.markdown:not(code) blockquote { margin-left: 0; } -.markdown hr { +.markdown:not(code) hr { height: 4px; padding: 0; margin: 16px 0; background-color: #e7e7e7; border: 0 none; } -.markdown ul, -.markdown ol { +.markdown:not(code) ul, +.markdown:not(code) ol { padding-left: 2em; } -.markdown ul.no-list, -.markdown ol.no-list { +.markdown:not(code) ul.no-list, +.markdown:not(code) ol.no-list { padding: 0; list-style-type: none; } -.markdown ul ul, -.markdown ul ol, -.markdown ol ol, -.markdown ol ul { +.markdown:not(code) ul ul, +.markdown:not(code) ul ol, +.markdown:not(code) ol ol, +.markdown:not(code) ol ul { margin-top: 0; margin-bottom: 0; } -.markdown ol ol, -.markdown ul ol { +.markdown:not(code) ol ol, +.markdown:not(code) ul ol { list-style-type: lower-roman; } -.markdown li > p { +.markdown:not(code) li > p { margin-top: 16px; } -.markdown dl { +.markdown:not(code) dl { padding: 0; } -.markdown dl dt { +.markdown:not(code) dl dt { padding: 0; margin-top: 16px; font-size: 1em; font-style: italic; font-weight: bold; } -.markdown dl dd { +.markdown:not(code) dl dd { padding: 0 16px; margin-bottom: 16px; } -.markdown blockquote { +.markdown:not(code) blockquote { padding: 0 15px; color: #777; border-left: 4px solid #ddd; } -.markdown blockquote > :first-child { +.markdown:not(code) blockquote > :first-child { margin-top: 0; } -.markdown blockquote > :last-child { +.markdown:not(code) blockquote > :last-child { margin-bottom: 0; } -.markdown table { +.markdown:not(code) table { display: block; width: 100%; overflow: auto; word-break: normal; word-break: keep-all; } -.markdown table th { +.markdown:not(code) table th { font-weight: bold; } -.markdown table th, -.markdown table td { +.markdown:not(code) table th, +.markdown:not(code) table td { padding: 6px 13px !important; border: 1px solid #ddd !important; } -.markdown table tr { +.markdown:not(code) table tr { background-color: #fff; border-top: 1px solid #ccc; } -.markdown table tr:nth-child(2n) { +.markdown:not(code) table tr:nth-child(2n) { background-color: #f8f8f8; } -.markdown img { +.markdown:not(code) img { max-width: 100%; box-sizing: border-box; } -.markdown .emoji { +.markdown:not(code) .emoji { max-width: none; } -.markdown span.frame { +.markdown:not(code) span.frame { display: block; overflow: hidden; } -.markdown span.frame > span { +.markdown:not(code) span.frame > span { display: block; float: left; width: auto; @@ -653,69 +653,69 @@ footer .container .links > *:first-child { overflow: hidden; border: 1px solid #ddd; } -.markdown span.frame span img { +.markdown:not(code) span.frame span img { display: block; float: left; } -.markdown span.frame span span { +.markdown:not(code) span.frame span span { display: block; padding: 5px 0 0; clear: both; color: #333; } -.markdown span.align-center { +.markdown:not(code) span.align-center { display: block; overflow: hidden; clear: both; } -.markdown span.align-center > span { +.markdown:not(code) span.align-center > span { display: block; margin: 13px auto 0; overflow: hidden; text-align: center; } -.markdown span.align-center span img { +.markdown:not(code) span.align-center span img { margin: 0 auto; text-align: center; } -.markdown span.align-right { +.markdown:not(code) span.align-right { display: block; overflow: hidden; clear: both; } -.markdown span.align-right > span { +.markdown:not(code) span.align-right > span { display: block; margin: 13px 0 0; overflow: hidden; text-align: right; } -.markdown span.align-right span img { +.markdown:not(code) span.align-right span img { margin: 0; text-align: right; } -.markdown span.float-left { +.markdown:not(code) span.float-left { display: block; float: left; margin-right: 13px; overflow: hidden; } -.markdown span.float-left span { +.markdown:not(code) span.float-left span { margin: 13px 0 0; } -.markdown span.float-right { +.markdown:not(code) span.float-right { display: block; float: right; margin-left: 13px; overflow: hidden; } -.markdown span.float-right > span { +.markdown:not(code) span.float-right > span { display: block; margin: 13px auto 0; overflow: hidden; text-align: right; } -.markdown code, -.markdown tt { +.markdown:not(code) code, +.markdown:not(code) tt { padding: 0; padding-top: 0.2em; padding-bottom: 0.2em; @@ -724,21 +724,21 @@ footer .container .links > *:first-child { background-color: rgba(0, 0, 0, 0.04); border-radius: 3px; } -.markdown code:before, -.markdown code:after, -.markdown tt:before, -.markdown tt:after { +.markdown:not(code) code:before, +.markdown:not(code) code:after, +.markdown:not(code) tt:before, +.markdown:not(code) tt:after { letter-spacing: -0.2em; content: "\00a0"; } -.markdown code br, -.markdown tt br { +.markdown:not(code) code br, +.markdown:not(code) tt br { display: none; } -.markdown del code { +.markdown:not(code) del code { text-decoration: inherit; } -.markdown pre > code { +.markdown:not(code) pre > code { padding: 0; margin: 0; font-size: 100%; @@ -747,11 +747,11 @@ footer .container .links > *:first-child { background: transparent; border: 0; } -.markdown .highlight { +.markdown:not(code) .highlight { margin-bottom: 16px; } -.markdown .highlight pre, -.markdown pre { +.markdown:not(code) .highlight pre, +.markdown:not(code) pre { padding: 16px; overflow: auto; font-size: 85%; @@ -759,15 +759,15 @@ footer .container .links > *:first-child { background-color: #f7f7f7; border-radius: 3px; } -.markdown .highlight pre { +.markdown:not(code) .highlight pre { margin-bottom: 0; word-break: normal; } -.markdown pre { +.markdown:not(code) pre { word-wrap: normal; } -.markdown pre code, -.markdown pre tt { +.markdown:not(code) pre code, +.markdown:not(code) pre tt { display: inline; max-width: initial; padding: 0; @@ -778,13 +778,13 @@ footer .container .links > *:first-child { background-color: transparent; border: 0; } -.markdown pre code:before, -.markdown pre code:after, -.markdown pre tt:before, -.markdown pre tt:after { +.markdown:not(code) pre code:before, +.markdown:not(code) pre code:after, +.markdown:not(code) pre tt:before, +.markdown:not(code) pre tt:after { content: normal; } -.markdown kbd { +.markdown:not(code) kbd { display: inline-block; padding: 3px 5px; font-size: 11px; @@ -797,11 +797,11 @@ footer .container .links > *:first-child { border-radius: 3px; box-shadow: inset 0 -1px 0 #bbb; } -.markdown input[type="checkbox"] { +.markdown:not(code) input[type="checkbox"] { vertical-align: middle !important; } -.markdown .csv-data td, -.markdown .csv-data th { +.markdown:not(code) .csv-data td, +.markdown:not(code) .csv-data th { padding: 5px; overflow: hidden; font-size: 12px; @@ -809,16 +809,16 @@ footer .container .links > *:first-child { text-align: left; white-space: nowrap; } -.markdown .csv-data .blob-num { +.markdown:not(code) .csv-data .blob-num { padding: 10px 8px 9px; text-align: right; background: #fff; border: 0; } -.markdown .csv-data tr { +.markdown:not(code) .csv-data tr { border-top: 0; } -.markdown .csv-data th { +.markdown:not(code) .csv-data th { font-weight: bold; background: #f8f8f8; border-top: 0; diff --git a/public/less/_markdown.less b/public/less/_markdown.less index e59f6a591..4200aed3a 100644 --- a/public/less/_markdown.less +++ b/public/less/_markdown.less @@ -1,4 +1,4 @@ -.markdown { +.markdown:not(code) { overflow: hidden; font-family: "Helvetica Neue", Helvetica, "Segoe UI", Arial, freesans, sans-serif; font-size: 16px;