diff --git a/src/components/Article/Article.module.scss b/src/components/Article/Article.module.scss
index 8216369c..1f863c1d 100644
--- a/src/components/Article/Article.module.scss
+++ b/src/components/Article/Article.module.scss
@@ -23,22 +23,16 @@ img {
}
}
-.shoutCover {
- background-size: cover;
- height: 0;
- padding-bottom: 56.2%;
+.articleContent {
+ img {
+ cursor: zoom-in;
+ }
}
.shoutBody {
font-size: 1.6rem;
line-height: 1.6;
- img {
- display: block;
- margin-bottom: 0.5em;
- cursor: zoom-in;
- }
-
blockquote,
blockquote[data-type='punchline'] {
clear: both;
diff --git a/src/components/Article/FullArticle.tsx b/src/components/Article/FullArticle.tsx
index 335ad71a..6894d734 100644
--- a/src/components/Article/FullArticle.tsx
+++ b/src/components/Article/FullArticle.tsx
@@ -27,6 +27,7 @@ import { AuthorBadge } from '../Author/AuthorBadge'
import { getImageUrl } from '../../utils/getImageUrl'
import { FeedArticlePopup } from '../Feed/FeedArticlePopup'
import { Lightbox } from '../_shared/Lightbox'
+import { Image } from '../_shared/Image'
type Props = {
article: Shout
@@ -251,7 +252,10 @@ export const FullArticle = (props: Props) => {
{props.article.title}
-
+
{/*TODO: Check styles.shoutTopic*/}
@@ -327,9 +326,7 @@ export const FullArticle = (props: Props) => {
-
+
diff --git a/src/components/Feed/ArticleCard/ArticleCard.module.scss b/src/components/Feed/ArticleCard/ArticleCard.module.scss
index 660df8ca..9ffcc750 100644
--- a/src/components/Feed/ArticleCard/ArticleCard.module.scss
+++ b/src/components/Feed/ArticleCard/ArticleCard.module.scss
@@ -403,7 +403,6 @@
}
.shoutCardWithCover {
- aspect-ratio: 16/9;
width: 100%;
@include media-breakpoint-down(xl) {
@@ -413,6 +412,7 @@
}
swiper-slide & {
+ aspect-ratio: 16/9;
margin-bottom: 0;
@include media-breakpoint-down(lg) {
diff --git a/src/components/_shared/Lightbox/Lightbox.module.scss b/src/components/_shared/Lightbox/Lightbox.module.scss
index 834c8750..67075ab9 100644
--- a/src/components/_shared/Lightbox/Lightbox.module.scss
+++ b/src/components/_shared/Lightbox/Lightbox.module.scss
@@ -17,7 +17,8 @@
}
.close {
- position: absolute;
+ position: fixed;
+ z-index: 1001;
top: 20px;
right: 40px;
font-size: 30px;
@@ -29,12 +30,13 @@
.zoomControls {
display: flex;
- position: absolute;
+ position: fixed;
bottom: 16px;
left: 50%;
height: 24px;
gap: 1rem;
transform: translateX(-50%);
+ z-index: 1001;
.control {
border-radius: 50%;
diff --git a/src/components/_shared/Lightbox/Lightbox.tsx b/src/components/_shared/Lightbox/Lightbox.tsx
index a90bf219..a9dee711 100644
--- a/src/components/_shared/Lightbox/Lightbox.tsx
+++ b/src/components/_shared/Lightbox/Lightbox.tsx
@@ -1,7 +1,8 @@
import { clsx } from 'clsx'
import styles from './Lightbox.module.scss'
-import { createSignal } from 'solid-js'
+import { createSignal, onCleanup, onMount } from 'solid-js'
import { Icon } from '../Icon'
+import { useEscKeyDownHandler } from '../../../utils/useEscKeyDownHandler'
type Props = {
class?: string
@@ -31,6 +32,8 @@ export const Lightbox = (props: Props) => {
transition: 'transform 0.3s ease'
})
+ useEscKeyDownHandler(closeLightbox)
+
return (
@@ -40,6 +43,9 @@ export const Lightbox = (props: Props) => {
+
diff --git a/src/pages/profile/Settings.module.scss b/src/pages/profile/Settings.module.scss
index 4553b827..50473218 100644
--- a/src/pages/profile/Settings.module.scss
+++ b/src/pages/profile/Settings.module.scss
@@ -234,9 +234,12 @@ h5 {
border: 1px solid var(--black-100);
cursor: pointer;
- img {
- width: 100%;
+ .userpicImage {
+ width: 180px;
+ height: 180px;
border-radius: 50%;
+ background-position: center;
+ background-size: contain;
}
&.hasControls {
@@ -254,6 +257,7 @@ h5 {
.control {
width: 40px;
height: 40px;
+ padding: 10px;
border-radius: 50%;
background: var(--background-color);
border: 1px solid var(--black-100);
diff --git a/src/pages/profile/profileSettings.page.tsx b/src/pages/profile/profileSettings.page.tsx
index fc1c51cb..484307d5 100644
--- a/src/pages/profile/profileSettings.page.tsx
+++ b/src/pages/profile/profileSettings.page.tsx
@@ -23,6 +23,7 @@ import { Icon } from '../../components/_shared/Icon'
import { Popover } from '../../components/_shared/Popover'
import { Image } from '../../components/_shared/Image'
import { Loading } from '../../components/_shared/Loading'
+import { getImageUrl } from '../../utils/getImageUrl'
export const ProfileSettingsPage = () => {
const { t } = useLocalize()
@@ -149,7 +150,15 @@ export const ProfileSettingsPage = () => {
-
+
{(triggerRef: (el) => void) => (
diff --git a/src/styles/FourOuFour.module.scss b/src/styles/FourOuFour.module.scss
index 09a87b79..683b078b 100644
--- a/src/styles/FourOuFour.module.scss
+++ b/src/styles/FourOuFour.module.scss
@@ -1,12 +1,11 @@
.errorPageWrapper {
height: 100vh;
- margin: -120px 0 -2em;
- padding-top: 100px;
+ padding-top: 60px;
}
.errorPage {
position: relative;
- top: 35%;
+ top: 37%;
transform: translateY(-50%);
.image-link:hover {