Skip to content

Commit 576145e

Browse files
authored
Merge pull request #193 from jtCodes/text-effect
Text effect
2 parents d94a845 + f62440f commit 576145e

2 files changed

Lines changed: 31 additions & 14 deletions

File tree

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "lyrictor",
3-
"version": "1.1.1",
3+
"version": "1.2.0",
44
"private": true,
55
"main": "electron/main.cjs",
66
"dependencies": {

src/Homepage.tsx

Lines changed: 30 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,7 @@ export default function Homepage() {
139139
!shouldUsePhoneHomepageLayout &&
140140
!isFullScreen
141141
);
142+
const shouldUseDesktopPreviewBranch = !usePhoneHomepageLayout;
142143
const desktopLayoutGap = shouldUseWideHomepageLayout ? HOMEPAGE_DESKTOP_LAYOUT_GAP : 0;
143144
const desktopPreviewAvailableHeight = shouldUseWideHomepageLayout
144145
? Math.max((maxContentHeight ?? 0) - HOMEPAGE_FEATURED_INFO_HEIGHT, 220)
@@ -625,23 +626,39 @@ export default function Homepage() {
625626
ref={contentRef}
626627
style={{ gridArea: "content", overflow: "hidden" }}
627628
>
628-
{shouldUseWideHomepageLayout ? (
629+
{shouldUseDesktopPreviewBranch ? (
629630
<div
630-
style={{
631-
display: "flex",
632-
justifyContent: "center",
633-
height: "100%",
634-
width: "100%",
635-
}}
631+
style={
632+
isFullScreen
633+
? {
634+
position: "fixed",
635+
inset: 0,
636+
zIndex: 100,
637+
backgroundColor: "var(--spectrum-global-color-gray-50)",
638+
display: "flex",
639+
justifyContent: "center",
640+
alignItems: "center",
641+
}
642+
: {
643+
display: "flex",
644+
justifyContent: "center",
645+
height: "100%",
646+
width: "100%",
647+
}
648+
}
636649
>
637650
<div
638651
style={{
639652
display: "grid",
640-
gridTemplateColumns: `${featuredProjectWidth}px minmax(0, ${effectiveDesktopProjectRailWidth}px)`,
641-
columnGap: desktopLayoutGap,
642-
alignItems: "start",
653+
gridTemplateColumns: isFullScreen
654+
? `${featuredProjectWidth}px`
655+
: `${featuredProjectWidth}px minmax(0, ${effectiveDesktopProjectRailWidth}px)`,
656+
columnGap: isFullScreen ? 0 : desktopLayoutGap,
657+
alignItems: isFullScreen ? "center" : "start",
643658
height: "100%",
644-
width: featuredProjectWidth + effectiveDesktopProjectRailWidth + desktopLayoutGap,
659+
width: isFullScreen
660+
? featuredProjectWidth
661+
: featuredProjectWidth + effectiveDesktopProjectRailWidth + desktopLayoutGap,
645662
maxWidth: "100%",
646663
minWidth: 0,
647664
}}
@@ -655,7 +672,7 @@ export default function Homepage() {
655672
flexDirection: "column",
656673
justifyContent: "center",
657674
alignItems: "flex-start",
658-
paddingTop: HOMEPAGE_FILTER_PILL_TOP_OFFSET,
675+
paddingTop: isFullScreen ? 0 : HOMEPAGE_FILTER_PILL_TOP_OFFSET,
659676
boxSizing: "border-box",
660677
}}
661678
>
@@ -666,7 +683,7 @@ export default function Homepage() {
666683
/>
667684
</div>
668685
</div>
669-
{projectListSection}
686+
{!isFullScreen ? projectListSection : null}
670687
</div>
671688
</div>
672689
) : (

0 commit comments

Comments
 (0)