Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

css: Remove code elements from bootstrap.css. 

Updates `markdown.css` and `rendered_markdown.css` for the rules
in `bootstrap.css` that were being used to style code elements and
removes the now redundant/ignored rules from `bootstrap.css`.
This commit is contained in:
Lauryn Menard 2023-02-20 19:48:15 +01:00 committed by Tim Abbott
parent 734d1848c0
commit 3c63025d88
3 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
web/styles/portico/markdown.css
View File

@ -363,10 +363,16 @@
} }
code { code {
/* Copied from rendered_markdown.css */ /* Different from zulip.css */
font-family: Monaco, Menlo, Consolas, "Courier New", monospace;
/* Same as base rules for code elements in rendered_markdown.css */
font-size: 0.825em; font-size: 0.825em;
unicode-bidi: embed; unicode-bidi: embed;
direction: ltr; direction: ltr;
color: hsl(0, 0%, 0%);
border: 1px solid hsl(240, 13%, 90%);
border-radius: 3px;
/* Different from base rules for code elements in rendered_markdown.css */
white-space: initial; white-space: initial;
padding: 0; padding: 0;
padding-right: 4px; padding-right: 4px;
@ -378,6 +384,9 @@
font-size: 14px; font-size: 14px;
white-space: pre-wrap; white-space: pre-wrap;
padding: 0; padding: 0;
color: inherit;
background-color: transparent;
border: 0;
} }
} }

8
web/styles/rendered_markdown.css
View File

@ -613,6 +613,10 @@ code {
direction: ltr; direction: ltr;
color: hsl(0, 0%, 0%); color: hsl(0, 0%, 0%);
white-space: pre; white-space: pre;
padding: 2px 4px;
background-color: hsl(240, 14%, 97%);
border: 1px solid hsl(240, 13%, 90%);
border-radius: 3px;
} }
.rendered_markdown code { .rendered_markdown code {
@ -673,6 +677,10 @@ pre {
pre code { pre code {
overflow-x: scroll; overflow-x: scroll;
white-space: pre; white-space: pre;
padding: 0;
color: inherit;
background-color: transparent;
border: 0;
} }
/* Style inline code inside a link /* Style inline code inside a link

16
web/third/bootstrap/css/bootstrap.css vendored
View File

@ -281,7 +281,6 @@ blockquote:before,
blockquote:after { blockquote:after {
content: ""; content: "";
} }
code,
pre { pre {
padding: 0 3px 2px; padding: 0 3px 2px;
font-family: Monaco, Menlo, Consolas, "Courier New", monospace; font-family: Monaco, Menlo, Consolas, "Courier New", monospace;
@ -291,13 +290,6 @@ pre {
-moz-border-radius: 3px; -moz-border-radius: 3px;
border-radius: 3px; border-radius: 3px;
} }
code {
padding: 2px 4px;
color: #d14;
background-color: #f7f7f9;
border: 1px solid #e1e1e8;
white-space: nowrap;
}
pre { pre {
display: block; display: block;
padding: 9.5px; padding: 9.5px;
@ -315,14 +307,6 @@ pre {
-moz-border-radius: 4px; -moz-border-radius: 4px;
border-radius: 4px; border-radius: 4px;
} }
pre code {
padding: 0;
color: inherit;
white-space: pre;
white-space: pre-wrap;
background-color: transparent;
border: 0;
}
.label { .label {
display: inline-block; display: inline-block;
padding: 2px 4px; padding: 2px 4px;