diff --git a/patches/glitch/system-font.patch b/patches/glitch/system-font.patch index d898c6b..b6439cb 100644 --- a/patches/glitch/system-font.patch +++ b/patches/glitch/system-font.patch @@ -1,9 +1,9 @@ diff --git a/app/javascript/flavours/glitch/styles/basics.scss b/app/javascript/flavours/glitch/styles/basics.scss -index a00b2936f..340294d73 100644 +index 25aa68f7e2..4afd87f357 100644 --- a/app/javascript/flavours/glitch/styles/basics.scss +++ b/app/javascript/flavours/glitch/styles/basics.scss -@@ -18,21 +18,6 @@ body { - -webkit-tap-highlight-color: rgba(0,0,0,0); +@@ -18,23 +18,6 @@ body { + -webkit-tap-highlight-color: rgba(0, 0, 0, 0); -webkit-tap-highlight-color: transparent; - &.system-font { @@ -18,17 +18,19 @@ index a00b2936f..340294d73 100644 - // Droid Sans => Older Androids (<4.0) - // Helvetica Neue => Older macOS <10.11 - // $font-sans-serif => web-font (Roboto) fallback and newer Androids (>=4.0) -- font-family: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", $font-sans-serif, sans-serif; +- font-family: system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', +- 'Oxygen', 'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', +- 'Helvetica Neue', $font-sans-serif, sans-serif; - } - &.app-body { 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 +index fc9ba3a189..acd3e35cda 100644 --- a/app/javascript/flavours/glitch/styles/components/modal.scss +++ b/app/javascript/flavours/glitch/styles/components/modal.scss -@@ -1131,7 +1131,7 @@ +@@ -1135,7 +1135,7 @@ width: 100%; border: 0; padding: 10px; @@ -38,7 +40,7 @@ index 8ba8bec10..e5db3303f 100644 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 -index fbb02c788..3946684ed 100644 +index fbb02c7884..3946684ed2 100644 --- a/app/javascript/flavours/glitch/styles/index.scss +++ b/app/javascript/flavours/glitch/styles/index.scss @@ -1,7 +1,5 @@ @@ -50,10 +52,10 @@ index fbb02c788..3946684ed 100644 @import 'reset'; @import 'basics'; diff --git a/app/javascript/flavours/glitch/styles/variables.scss b/app/javascript/flavours/glitch/styles/variables.scss -index b865b5a2d..3d05840fc 100644 +index 25658bb0c8..d68fbe0c78 100644 --- a/app/javascript/flavours/glitch/styles/variables.scss +++ b/app/javascript/flavours/glitch/styles/variables.scss -@@ -53,9 +53,9 @@ $media-modal-media-max-height: 80%; +@@ -56,9 +56,9 @@ $media-modal-media-max-height: 80%; $no-gap-breakpoint: 1175px; diff --git a/patches/system-font.patch b/patches/system-font.patch index 38320a1..5db23a0 100644 --- a/patches/system-font.patch +++ b/patches/system-font.patch @@ -1,5 +1,5 @@ diff --git a/app/javascript/styles/application.scss b/app/javascript/styles/application.scss -index 81a040108..01c840180 100644 +index 81a040108e..01c840180a 100644 --- a/app/javascript/styles/application.scss +++ b/app/javascript/styles/application.scss @@ -1,7 +1,5 @@ @@ -11,7 +11,7 @@ index 81a040108..01c840180 100644 @import 'mastodon/reset'; @import 'mastodon/basics'; diff --git a/app/javascript/styles/mailer.scss b/app/javascript/styles/mailer.scss -index 18fe522eb..16ffb8b2f 100644 +index 18fe522eb2..16ffb8b2fe 100644 --- a/app/javascript/styles/mailer.scss +++ b/app/javascript/styles/mailer.scss @@ -1,5 +1,4 @@ @@ -21,10 +21,10 @@ index 18fe522eb..16ffb8b2f 100644 table, td, diff --git a/app/javascript/styles/mastodon/basics.scss b/app/javascript/styles/mastodon/basics.scss -index 413a1cdd6..fccbf2763 100644 +index 1d08b12e57..893e86a97a 100644 --- a/app/javascript/styles/mastodon/basics.scss +++ b/app/javascript/styles/mastodon/basics.scss -@@ -19,21 +19,6 @@ body { +@@ -19,23 +19,6 @@ body { -webkit-tap-highlight-color: rgba(0, 0, 0, 0%); -webkit-tap-highlight-color: transparent; @@ -40,17 +40,19 @@ index 413a1cdd6..fccbf2763 100644 - // Droid Sans => Older Androids (<4.0) - // Helvetica Neue => Older macOS <10.11 - // $font-sans-serif => web-font (Roboto) fallback and newer Androids (>=4.0) -- font-family: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Oxygen, Ubuntu, Cantarell, "Fira Sans", "Droid Sans", "Helvetica Neue", $font-sans-serif, sans-serif; +- font-family: system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', +- Oxygen, Ubuntu, Cantarell, 'Fira Sans', 'Droid Sans', 'Helvetica Neue', +- $font-sans-serif, sans-serif; - } - &.app-body { padding: 0; diff --git a/app/javascript/styles/mastodon/variables.scss b/app/javascript/styles/mastodon/variables.scss -index 2f6c41d5f..5d59e8c2e 100644 +index 7de25f8fd4..e0a8ab5751 100644 --- a/app/javascript/styles/mastodon/variables.scss +++ b/app/javascript/styles/mastodon/variables.scss -@@ -55,6 +55,6 @@ $media-modal-media-max-height: 80%; +@@ -58,6 +58,6 @@ $media-modal-media-max-height: 80%; $no-gap-breakpoint: 1175px;