diff options
Diffstat (limited to 'app/javascript')
-rw-r--r-- | app/javascript/packs/public.js | 21 | ||||
-rw-r--r-- | app/javascript/styles/mastodon/components.scss | 1 | ||||
-rw-r--r-- | app/javascript/styles/mastodon/stream_entries.scss | 5 |
3 files changed, 20 insertions, 7 deletions
diff --git a/app/javascript/packs/public.js b/app/javascript/packs/public.js index 6b47eecf9..dc18da853 100644 --- a/app/javascript/packs/public.js +++ b/app/javascript/packs/public.js @@ -67,13 +67,6 @@ function main() { }, datetime, now, datetime.getFullYear()); }); - [].forEach.call(document.querySelectorAll('.modal-button'), (content) => { - content.addEventListener('click', (e) => { - e.preventDefault(); - window.open(e.target.href, 'mastodon-intent', 'width=445,height=600,resizable=no,menubar=no,status=no,scrollbars=yes'); - }); - }); - const reactComponents = document.querySelectorAll('[data-component]'); if (reactComponents.length > 0) { import(/* webpackChunkName: "containers/media_container" */ '../mastodon/containers/media_container') @@ -119,6 +112,20 @@ function main() { return false; }); + delegate(document, '.modal-button', 'click', e => { + e.preventDefault(); + + let href; + + if (e.target.nodeName !== 'A') { + href = e.target.parentNode.href; + } else { + href = e.target.href; + } + + window.open(href, 'mastodon-intent', 'width=445,height=600,resizable=no,menubar=no,status=no,scrollbars=yes'); + }); + delegate(document, '#account_display_name', 'input', ({ target }) => { const nameCounter = document.querySelector('.name-counter'); const name = document.querySelector('.card .display-name strong'); diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss index 931f1aa0d..cfd8e5ad4 100644 --- a/app/javascript/styles/mastodon/components.scss +++ b/app/javascript/styles/mastodon/components.scss @@ -628,6 +628,7 @@ overflow: hidden; white-space: pre-wrap; padding-top: 2px; + color: $primary-text-color; &:focus { outline: 0; diff --git a/app/javascript/styles/mastodon/stream_entries.scss b/app/javascript/styles/mastodon/stream_entries.scss index 9e2aa720c..03bbd84db 100644 --- a/app/javascript/styles/mastodon/stream_entries.scss +++ b/app/javascript/styles/mastodon/stream_entries.scss @@ -3,6 +3,7 @@ border-radius: 4px; overflow: hidden; margin-bottom: 10px; + text-align: left; @media screen and (max-width: $no-gap-breakpoint) { margin-bottom: 0; @@ -63,6 +64,10 @@ } } } + + &--highlighted .entry { + background: lighten($ui-base-color, 8%); + } } .button.logo-button { |