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

fix patches for mastodon changes

Browse Source
This commit is contained in:
Jake Jarvis 2023-03-09 09:37:57 -05:00
parent 1e77182057
commit 7c0eae223d
Signed by: jake
GPG Key ID: 2B0C9CF251E69A39
8 changed files with 54 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
patches/glitch/hide-contact-email.patch
View File

@ -1,7 +1,7 @@
diff --git a/app/javascript/flavours/glitch/features/about/index.js b/app/javascript/flavours/glitch/features/about/index.js
index 57f295ea9..0992ba767 100644
--- a/app/javascript/flavours/glitch/features/about/index.js
+++ b/app/javascript/flavours/glitch/features/about/index.js
diff --git a/app/javascript/flavours/glitch/features/about/index.jsx b/app/javascript/flavours/glitch/features/about/index.jsx
index 1e0a8666ab..45d1375bd8 100644
--- a/app/javascript/flavours/glitch/features/about/index.jsx
+++ b/app/javascript/flavours/glitch/features/about/index.jsx
@@ -127,14 +127,6 @@ class About extends React.PureComponent {
<Account id={server.getIn(['contact', 'account', 'id'])} size={36} />

8
patches/glitch/hide-rules.patch
View File

@ -1,7 +1,7 @@
diff --git a/app/javascript/flavours/glitch/features/about/index.js b/app/javascript/flavours/glitch/features/about/index.js
index 57f295ea9..e27a30292 100644
--- a/app/javascript/flavours/glitch/features/about/index.js
+++ b/app/javascript/flavours/glitch/features/about/index.js
diff --git a/app/javascript/flavours/glitch/features/about/index.jsx b/app/javascript/flavours/glitch/features/about/index.jsx
index 1e0a8666ab..8e8d5d8325 100644
--- a/app/javascript/flavours/glitch/features/about/index.jsx
+++ b/app/javascript/flavours/glitch/features/about/index.jsx
@@ -15,7 +15,6 @@ import Image from 'flavours/glitch/components/image';
const messages = defineMessages({

20
patches/glitch/hide-signup.patch
View File

@ -1,7 +1,7 @@
diff --git a/app/javascript/flavours/glitch/features/interaction_modal/index.js b/app/javascript/flavours/glitch/features/interaction_modal/index.js
index b71c041c9d..a934178753 100644
--- a/app/javascript/flavours/glitch/features/interaction_modal/index.js
+++ b/app/javascript/flavours/glitch/features/interaction_modal/index.js
diff --git a/app/javascript/flavours/glitch/features/interaction_modal/index.jsx b/app/javascript/flavours/glitch/features/interaction_modal/index.jsx
index 3a54105a36..ba95369fe8 100644
--- a/app/javascript/flavours/glitch/features/interaction_modal/index.jsx
+++ b/app/javascript/flavours/glitch/features/interaction_modal/index.jsx
@@ -1,7 +1,6 @@
import React from 'react';
import PropTypes from 'prop-types';
@ -41,10 +41,10 @@ index b71c041c9d..a934178753 100644
</div>
<div className='interaction-modal__choices__choice'>
diff --git a/app/javascript/flavours/glitch/features/ui/components/header.js b/app/javascript/flavours/glitch/features/ui/components/header.js
diff --git a/app/javascript/flavours/glitch/features/ui/components/header.jsx b/app/javascript/flavours/glitch/features/ui/components/header.jsx
index d9ad949611..436c001f74 100644
--- a/app/javascript/flavours/glitch/features/ui/components/header.js
+++ b/app/javascript/flavours/glitch/features/ui/components/header.js
--- a/app/javascript/flavours/glitch/features/ui/components/header.jsx
+++ b/app/javascript/flavours/glitch/features/ui/components/header.jsx
@@ -2,7 +2,7 @@ import React from 'react';
import Logo from 'flavours/glitch/components/logo';
import { Link, withRouter } from 'react-router-dom';
@ -90,10 +90,10 @@ index d9ad949611..436c001f74 100644
</>
);
}
diff --git a/app/javascript/flavours/glitch/features/ui/components/sign_in_banner.js b/app/javascript/flavours/glitch/features/ui/components/sign_in_banner.js
diff --git a/app/javascript/flavours/glitch/features/ui/components/sign_in_banner.jsx b/app/javascript/flavours/glitch/features/ui/components/sign_in_banner.jsx
index c0d62aca00..eda16f2654 100644
--- a/app/javascript/flavours/glitch/features/ui/components/sign_in_banner.js
+++ b/app/javascript/flavours/glitch/features/ui/components/sign_in_banner.js
--- a/app/javascript/flavours/glitch/features/ui/components/sign_in_banner.jsx
+++ b/app/javascript/flavours/glitch/features/ui/components/sign_in_banner.jsx
@@ -1,38 +1,11 @@
-import React, { useCallback } from 'react';
+import React from 'react';

8
patches/glitch/mastodon-logo.patch
View File

@ -1,7 +1,7 @@
diff --git a/app/javascript/flavours/glitch/features/ui/components/navigation_panel.js b/app/javascript/flavours/glitch/features/ui/components/navigation_panel.js
index 3b46c6eec..f2465482f 100644
--- a/app/javascript/flavours/glitch/features/ui/components/navigation_panel.js
+++ b/app/javascript/flavours/glitch/features/ui/components/navigation_panel.js
diff --git a/app/javascript/flavours/glitch/features/ui/components/navigation_panel.jsx b/app/javascript/flavours/glitch/features/ui/components/navigation_panel.jsx
index 3b46c6eec0..f2465482fd 100644
--- a/app/javascript/flavours/glitch/features/ui/components/navigation_panel.jsx
+++ b/app/javascript/flavours/glitch/features/ui/components/navigation_panel.jsx
@@ -2,6 +2,7 @@ import React from 'react';
import PropTypes from 'prop-types';
import { defineMessages, injectIntl } from 'react-intl';

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

@ -1,9 +1,9 @@
diff --git a/app/javascript/flavours/glitch/styles/basics.scss b/app/javascript/flavours/glitch/styles/basics.scss
index 25aa68f7e2..4afd87f357 100644
index 84977eb397..29d3640e4d 100644
--- a/app/javascript/flavours/glitch/styles/basics.scss
+++ b/app/javascript/flavours/glitch/styles/basics.scss
@@ -18,23 +18,6 @@ body {
-webkit-tap-highlight-color: rgba(0, 0, 0, 0);
@@ -19,23 +19,6 @@ body {
-webkit-tap-highlight-color: rgba(0, 0, 0, 0%);
-webkit-tap-highlight-color: transparent;
- &.system-font {
@ -19,22 +19,22 @@ index 25aa68f7e2..4afd87f357 100644
- // 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;
- 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 fc9ba3a189..acd3e35cda 100644
index 65060f4224..8b81916d66 100644
--- a/app/javascript/flavours/glitch/styles/components/modal.scss
+++ b/app/javascript/flavours/glitch/styles/components/modal.scss
@@ -1135,7 +1135,7 @@
@@ -1130,7 +1130,7 @@
width: 100%;
border: 0;
padding: 10px;
- font-family: 'mastodon-font-monospace', monospace;
- font-family: mastodon-font-monospace, monospace;
+ font-family: $font-monospace, monospace;
background: $ui-base-color;
color: $primary-text-color;
@ -51,11 +51,11 @@ index fbb02c7884..3946684ed2 100644
@import 'reset';
@import 'basics';
diff --git a/app/javascript/flavours/glitch/styles/variables.scss b/app/javascript/flavours/glitch/styles/variables.scss
index 25658bb0c8..d68fbe0c78 100644
--- a/app/javascript/flavours/glitch/styles/variables.scss
+++ b/app/javascript/flavours/glitch/styles/variables.scss
@@ -56,9 +56,9 @@ $media-modal-media-max-height: 80%;
diff --git a/app/javascript/styles/mastodon/variables.scss b/app/javascript/styles/mastodon/variables.scss
index 7de25f8fd4..e0a8ab5751 100644
--- a/app/javascript/styles/mastodon/variables.scss
+++ b/app/javascript/styles/mastodon/variables.scss
@@ -58,6 +58,6 @@ $media-modal-media-max-height: 80%;
$no-gap-breakpoint: 1175px;
@ -65,6 +65,3 @@ index 25658bb0c8..d68fbe0c78 100644
+$font-sans-serif: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue" !default;
+$font-display: $font-sans-serif !default;
+$font-monospace: ui-monospace, SFMono-Regular, "SF Mono", Menlo, Consolas, "Liberation Mono" !default;
// Avatar border size (8% default, 100% for rounded avatars)
$ui-avatar-border-size: 8%;

8
patches/hide-contact-email.patch
View File

@ -1,7 +1,7 @@
diff --git a/app/javascript/mastodon/features/about/index.js b/app/javascript/mastodon/features/about/index.js
index e59f73738..0cb11216e 100644
--- a/app/javascript/mastodon/features/about/index.js
+++ b/app/javascript/mastodon/features/about/index.js
diff --git a/app/javascript/mastodon/features/about/index.jsx b/app/javascript/mastodon/features/about/index.jsx
index dc1942c631..a44bda4757 100644
--- a/app/javascript/mastodon/features/about/index.jsx
+++ b/app/javascript/mastodon/features/about/index.jsx
@@ -127,14 +127,6 @@ class About extends React.PureComponent {
<Account id={server.getIn(['contact', 'account', 'id'])} size={36} />

8
patches/hide-rules.patch
View File

@ -1,7 +1,7 @@
diff --git a/app/javascript/mastodon/features/about/index.js b/app/javascript/mastodon/features/about/index.js
index e59f73738..3468ad19e 100644
--- a/app/javascript/mastodon/features/about/index.js
+++ b/app/javascript/mastodon/features/about/index.js
diff --git a/app/javascript/mastodon/features/about/index.jsx b/app/javascript/mastodon/features/about/index.jsx
index dc1942c631..a044aa7c37 100644
--- a/app/javascript/mastodon/features/about/index.jsx
+++ b/app/javascript/mastodon/features/about/index.jsx
@@ -15,7 +15,6 @@ import Image from 'mastodon/components/image';
const messages = defineMessages({

22
patches/hide-signup.patch
View File

@ -1,7 +1,7 @@
diff --git a/app/javascript/mastodon/features/interaction_modal/index.js b/app/javascript/mastodon/features/interaction_modal/index.js
index d4535378f0..285fe2ba3a 100644
--- a/app/javascript/mastodon/features/interaction_modal/index.js
+++ b/app/javascript/mastodon/features/interaction_modal/index.js
diff --git a/app/javascript/mastodon/features/interaction_modal/index.jsx b/app/javascript/mastodon/features/interaction_modal/index.jsx
index c1d346fed4..86eeeb14e1 100644
--- a/app/javascript/mastodon/features/interaction_modal/index.jsx
+++ b/app/javascript/mastodon/features/interaction_modal/index.jsx
@@ -1,7 +1,6 @@
import React from 'react';
import PropTypes from 'prop-types';
@ -41,10 +41,10 @@ index d4535378f0..285fe2ba3a 100644
</div>
<div className='interaction-modal__choices__choice'>
diff --git a/app/javascript/mastodon/features/ui/components/header.js b/app/javascript/mastodon/features/ui/components/header.js
index 1384bebda0..10d6f70bb7 100644
--- a/app/javascript/mastodon/features/ui/components/header.js
+++ b/app/javascript/mastodon/features/ui/components/header.js
diff --git a/app/javascript/mastodon/features/ui/components/header.jsx b/app/javascript/mastodon/features/ui/components/header.jsx
index 92adc47a9c..c0e0bdb460 100644
--- a/app/javascript/mastodon/features/ui/components/header.jsx
+++ b/app/javascript/mastodon/features/ui/components/header.jsx
@@ -2,7 +2,7 @@ import React from 'react';
import Logo from 'mastodon/components/logo';
import { Link, withRouter } from 'react-router-dom';
@ -90,10 +90,10 @@ index 1384bebda0..10d6f70bb7 100644
</>
);
}
diff --git a/app/javascript/mastodon/features/ui/components/sign_in_banner.js b/app/javascript/mastodon/features/ui/components/sign_in_banner.js
diff --git a/app/javascript/mastodon/features/ui/components/sign_in_banner.jsx b/app/javascript/mastodon/features/ui/components/sign_in_banner.jsx
index 86fcc11b56..eda16f2654 100644
--- a/app/javascript/mastodon/features/ui/components/sign_in_banner.js
+++ b/app/javascript/mastodon/features/ui/components/sign_in_banner.js
--- a/app/javascript/mastodon/features/ui/components/sign_in_banner.jsx
+++ b/app/javascript/mastodon/features/ui/components/sign_in_banner.jsx
@@ -1,38 +1,11 @@
-import React, { useCallback } from 'react';
+import React from 'react';