Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Update gfm.css to github-markdown-css #12613

Merged
merged 2 commits into from
Jun 13, 2024
Merged

Update gfm.css to github-markdown-css #12613

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
06519f0
Update gfm.css to github-markdown-css
t3chguy Jun 13, 2024
148da27
Update screenshots
t3chguy Jun 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
"escape-html": "^1.0.3",
"file-saver": "^2.0.5",
"filesize": "10.1.2",
"gfm.css": "^1.1.2",
"github-markdown-css": "^5.5.1",
"glob-to-regexp": "^0.4.1",
"graphemer": "^1.4.0",
"highlight.js": "^11.3.1",
Expand Down
Binary file modified ...wright/snapshots/timeline/timeline.spec.ts/highlighted-search-results-linux.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion res/css/views/rooms/_EventTile.pcss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -701,7 +701,7 @@ $left-gutter: 64px;
background-color: $inlinecode-background-color;
border: 1px solid $inlinecode-border-color;
border-radius: 4px;
/* The horizontal padding is added by gfm.css .markdown-body */
/* The horizontal padding is added by github-markdown-css .markdown-body */
padding: $spacing-2 0;
/* Avoid inline code blocks to be sticked when on multiple lines */
line-height: $font-22px;
Expand Down
2 changes: 1 addition & 1 deletion res/css/views/rooms/_MessageComposer.pcss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ limitations under the License.
word-break: break-word;

/* FIXME: rather unpleasant hack to get rid of <p/> margins. */
/* really we should be mixing in markdown-body from gfm.css instead */
/* really we should be mixing in markdown-body from github-markdown-css instead */
> :first-child {
margin-top: 0 !important;
}
Expand Down
1 change: 1 addition & 0 deletions res/themes/dark-custom/css/dark-custom.pcss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@
@import "../../legacy-dark/css/_legacy-dark.pcss";
@import "../../light-custom/css/_custom.pcss";
@import "../../../../res/css/_components.pcss";
@import url("github-markdown-css/github-markdown-dark.css");
1 change: 1 addition & 0 deletions res/themes/dark/css/dark.pcss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@
@import "../../light/css/_mods.pcss";
@import "../../../../res/css/_components.pcss";
@import url("highlight.js/styles/atom-one-dark.min.css");
@import url("github-markdown-css/github-markdown-dark.css");
1 change: 1 addition & 0 deletions res/themes/legacy-dark/css/legacy-dark.pcss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@
@import "_legacy-dark.pcss";
@import "../../../../res/css/_components.pcss";
@import url("highlight.js/styles/atom-one-dark.min.css");
@import url("github-markdown-css/github-markdown-dark.css");
1 change: 1 addition & 0 deletions res/themes/legacy-light/css/legacy-light.pcss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@
@import "_legacy-light.pcss";
@import "../../../../res/css/_components.pcss";
@import url("highlight.js/styles/atom-one-light.min.css");
@import url("github-markdown-css/github-markdown-light.css");
1 change: 1 addition & 0 deletions res/themes/light-custom/css/light-custom.pcss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@
@import "../../legacy-light/css/_legacy-light.pcss";
@import "_custom.pcss";
@import "../../../../res/css/_components.pcss";
@import url("github-markdown-css/github-markdown-light.css");
1 change: 1 addition & 0 deletions res/themes/light-high-contrast/css/light-high-contrast.pcss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@
@import "../../light/css/_mods.pcss";
@import "../../../../res/css/_components.pcss";
@import url("highlight.js/styles/atom-one-light.min.css");
@import url("github-markdown-css/github-markdown-light.css");
1 change: 1 addition & 0 deletions res/themes/light/css/light.pcss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@
@import "_mods.pcss";
@import "../../../../res/css/_components.pcss";
@import url("highlight.js/styles/atom-one-light.min.css");
@import url("github-markdown-css/github-markdown-light.css");
8 changes: 4 additions & 4 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5683,10 +5683,10 @@ get-symbol-description@^1.0.0, get-symbol-description@^1.0.2:
es-errors "^1.3.0"
get-intrinsic "^1.2.4"

gfm.css@^1.1.2:
version "1.1.2"
resolved "https://registry.yarnpkg.com/gfm.css/-/gfm.css-1.1.2.tgz#94acfa600672663b9dd0fd4b6ee5d11c8dbc161e"
integrity sha512-KhK3rqxMj+UTLRxWnfUA5n8XZYMWfHrrcCxtWResYR2B3hWIqBM6v9FPGZSlVuX+ScLewizOvNkjYXuPs95ThQ==
github-markdown-css@^5.5.1:
version "5.5.1"
resolved "https://registry.yarnpkg.com/github-markdown-css/-/github-markdown-css-5.5.1.tgz#c2a609ca0b067552c8bfc09e797ace20d614f515"
integrity sha512-2osyhNgFt7DEHnGHbgIifWawAqlc68gjJiGwO1xNw/S48jivj8kVaocsVkyJqUi3fm7fdYIDi4C6yOtcqR/aEQ==

gl-matrix@^3.4.3:
version "3.4.3"
Expand Down
Loading