jake/mastodon-utils
1
Fork 0
mirror of https://github.com/jakejarvis/mastodon-utils.git synced 2025-04-26 07:55:22 -04:00
Code Issues Releases Wiki Activity

format patches (again)

Browse Source
This commit is contained in:
Jake Jarvis 2022-12-09 23:17:35 -05:00
parent ced8e91274
commit ac3dbc5d7c
Signed by: jake
GPG Key ID: 2B0C9CF251E69A39
8 changed files with 34 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
patches/glitch/system-font.patch
View File

@ -24,6 +24,19 @@ index a00b2936f..340294d73 100644
&.app-body { &.app-body {
padding: 0; padding: 0;
diff --git a/app/javascript/flavours/glitch/styles/components/modal.scss b/app/javascript/flavours/glitch/styles/components/modal.scss
index 8ba8bec10..e5db3303f 100644
--- a/app/javascript/flavours/glitch/styles/components/modal.scss
+++ b/app/javascript/flavours/glitch/styles/components/modal.scss
@@ -1131,7 +1131,7 @@
width: 100%;
border: 0;
padding: 10px;
- font-family: 'mastodon-font-monospace', monospace;
+ font-family: $font-monospace, monospace;
background: $ui-base-color;
color: $primary-text-color;
font-size: 14px;
diff --git a/app/javascript/flavours/glitch/styles/index.scss b/app/javascript/flavours/glitch/styles/index.scss diff --git a/app/javascript/flavours/glitch/styles/index.scss b/app/javascript/flavours/glitch/styles/index.scss
index fbb02c788..3946684ed 100644 index fbb02c788..3946684ed 100644
--- a/app/javascript/flavours/glitch/styles/index.scss --- a/app/javascript/flavours/glitch/styles/index.scss

10
patches/system-font.patch
View File

@ -45,25 +45,15 @@ index 413a1cdd6..fccbf2763 100644
- -
&.app-body { &.app-body {
padding: 0; padding: 0;
<<<<<<< Updated upstream
=======
>>>>>>> Stashed changes
diff --git a/app/javascript/styles/mastodon/variables.scss b/app/javascript/styles/mastodon/variables.scss diff --git a/app/javascript/styles/mastodon/variables.scss b/app/javascript/styles/mastodon/variables.scss
index 2f6c41d5f..b968ea42d 100644 index 2f6c41d5f..b968ea42d 100644
--- a/app/javascript/styles/mastodon/variables.scss --- a/app/javascript/styles/mastodon/variables.scss
+++ b/app/javascript/styles/mastodon/variables.scss +++ b/app/javascript/styles/mastodon/variables.scss
@@ -55,6 +55,6 @@ $media-modal-media-max-height: 80%; @@ -55,6 +55,6 @@ $media-modal-media-max-height: 80%;
<<<<<<< Updated upstream
$no-gap-breakpoint: 1175px; $no-gap-breakpoint: 1175px;
=======
$no-gap-breakpoint: 1175px;
>>>>>>> Stashed changes
-$font-sans-serif: 'mastodon-font-sans-serif' !default; -$font-sans-serif: 'mastodon-font-sans-serif' !default;
-$font-display: 'mastodon-font-display' !default; -$font-display: 'mastodon-font-display' !default;
-$font-monospace: 'mastodon-font-monospace' !default; -$font-monospace: 'mastodon-font-monospace' !default;