Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make layout full-width #5294

Open
wants to merge 20 commits into
base: development
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
6ff49d3
Constrain video grids to 5 max columns at larger viewports
kommunarr Jun 20, 2024
7c07d47
Institute full-width layout for ft-cards
kommunarr Jun 20, 2024
7d23aac
Fix long title edge cases for playlist grid and list views
kommunarr Jun 20, 2024
74bf210
Switch to 6 columns after 2000px, and set max card width to 2800px
kommunarr Jun 20, 2024
3cc6d81
Adjust breakpoint to prevent breakage when side nav is expanded
kommunarr Jun 20, 2024
0845aec
Update banner width
kommunarr Jun 21, 2024
83e79e1
Adjust list styling to have fixed width for large viewport widths
kommunarr Jun 21, 2024
22adb57
Add catch-all size limit on ft-card that fixes commment overflow issue
kommunarr Jun 20, 2024
72ca2f8
Fix playlist list view when side nav is open
kommunarr Jun 21, 2024
914acf3
Align banner with ft-card width using identical styling rules
kommunarr Jun 21, 2024
ce972b5
Merge branch 'development' of github.com:FreeTubeApp/FreeTube into fe…
kommunarr Oct 4, 2024
cdbd94a
Fix playlist view on mobile
pkrasicki Oct 18, 2024
16d1e50
Remove the margin-top change
pkrasicki Oct 18, 2024
16954e5
Partial fix for playlist title and description overflow
pkrasicki Oct 18, 2024
6bcdc87
Fix playlist overflow in list view
pkrasicki Oct 18, 2024
a1db7e6
Fix right panel not fully expanding in list mode
pkrasicki Oct 18, 2024
bfde267
Merge development branch
pkrasicki Dec 20, 2024
18cbb18
Revert "Merge development branch"
pkrasicki Dec 22, 2024
ee22d0f
Merge branch 'development' of https://github.com/FreeTubeApp/FreeTube…
pkrasicki Dec 22, 2024
28c5b78
Fix button alignment in remote playlists
pkrasicki Dec 28, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions src/renderer/App.css
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,10 @@
.routerView {
flex: 1 1 0%;
margin-block: 18px;
margin-inline: 10px;
margin-inline: 5px;
}

.banner {
inline-size: 85%;
margin-block: 40px 0;
margin-inline: auto;
}
Expand Down Expand Up @@ -55,14 +54,26 @@
opacity: 0;
}

/* align banner with ft-card width using identical styling rules */
@media only screen and (width > 680px) {
.isSideNavOpen .banner {
max-inline-size: min(calc(100vw + -262px), 2800px);
}

.hideLabelsSideBar .banner {
max-inline-size: min(calc(100vw + -122px), 2800px);
}
}


@media only screen and (width <= 680px) {
.routerView {
margin-block: 68px;
margin-inline: 8px;
}

.banner {
inline-size: 90%;
max-inline-size: calc(100vw - 64px);
margin-block: 60px 0;
}

Expand Down
23 changes: 21 additions & 2 deletions src/renderer/components/FtAutoGrid/FtAutoGrid.css
Original file line number Diff line number Diff line change
@@ -1,11 +1,30 @@
.grid {
.autoGrid {
display: grid;
grid-gap: 8px;
grid-template-columns: repeat(auto-fill, minmax(262px, 1fr));
justify-content: space-evenly;
}

.list {
.autoList {
display: grid;
grid-gap: 4px;
}

@media (width >= 1514px) {
.autoList {
justify-content: center;
}
}

/* Cap grid column width at 5 for larger viewports */
@media (width >= 1605px) {
.autoGrid {
grid-template-columns: repeat(5, minmax(262px, 1fr));
}
}

@media (width >= 2000px) {
.autoGrid {
grid-template-columns: repeat(6, minmax(262px, 1fr));
}
}
4 changes: 2 additions & 2 deletions src/renderer/components/FtAutoGrid/FtAutoGrid.vue
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<template>
<div
:class="{
grid: grid,
list: !grid
autoGrid: grid,
autoList: !grid
}"
>
<slot />
Expand Down
1 change: 0 additions & 1 deletion src/renderer/components/PasswordDialog/PasswordDialog.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
.card {
inline-size: 85%;
margin: auto;
box-sizing: border-box;
}
Expand Down
17 changes: 17 additions & 0 deletions src/renderer/components/ft-card/ft-card.css
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,21 @@
padding-block: 3px 16px;
padding-inline: 16px;
box-shadow: 0 1px 2px rgb(0 0 0 / 10%);
max-inline-size: min(calc(100vw + -132px), 2800px);
}

@media only screen and (width > 680px) {
.isSideNavOpen .ft-card {
max-inline-size: min(calc(100vw + -262px), 2800px);
}

.hideLabelsSideBar .ft-card {
max-inline-size: min(calc(100vw + -122px), 2800px);
}
}

@media only screen and (width <= 680px) {
.ft-card {
max-inline-size: calc(100vw - 64px);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,6 @@ h2,
}

.card {
inline-size: 85%;
margin-block: 0 15px;
margin-inline: auto;
}

@media only screen and (width <= 680px) {
.card {
inline-size: 90%;
}
}
7 changes: 0 additions & 7 deletions src/renderer/components/ft-profile-edit/ft-profile-edit.css
Original file line number Diff line number Diff line change
Expand Up @@ -78,13 +78,6 @@ h3 {
}

.card {
inline-size: 85%;
margin-block: 0 60px;
margin-inline: auto;
}

@media only screen and (width <= 680px) {
.card {
inline-size: 90%;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,6 @@ h2 {
}

.card {
inline-size: 85%;
margin-block: 0 15px;
margin-inline: auto;
}

@media only screen and (width <= 680px) {
.card {
inline-size: 90%;
}
}
66 changes: 52 additions & 14 deletions src/renderer/components/playlist-info/playlist-info.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
cursor: pointer;
}


.playlistThumbnail img {
inline-size: 100%;
// Ensure placeholder image displayed at same aspect ratio as most other images
Expand All @@ -28,16 +27,26 @@

.playlistTitle {
margin-block-end: 0.1em;
word-break: break-word;
max-block-size: 20vh;
overflow-y: scroll;
}

.playlistDescription {
max-block-size: 20vh;
overflow-y: auto;
white-space: break-spaces;
margin-inline: auto;
word-break: break-word;
}

@media only screen and (width <= 500px) {
max-block-size: 10vh;
.isSideNavOpen {
.playlistTitle,
.playlistDescription {
@media only screen and (width >= 1162px) {
/* Approximate max size before untruncated title starts breaking list view desktop interface with side nav open */
max-inline-size: 28vw;
}
}
}

Expand All @@ -62,17 +71,28 @@
word-break: break-all;
}

.playlistOptions {
display: flex;
flex-wrap: wrap;
gap: 8px;
justify-content: center;
}

.channelShareWrapper {
column-gap: 8px;
display: grid;
grid-template-columns: auto minmax(min-content, 1fr);
}

.playlistOptions {
display: grid;
grid-auto-flow: column;
column-gap: 8px;
justify-content: flex-end;
position: sticky;
inset-block-end: -20px;
background-color: var(--card-bg-color);
padding-block: 5px;

.playlistOptions {
display: grid;
grid-auto-flow: column;
column-gap: 8px;
justify-content: flex-end;
}
}

.searchInputsRow {
Expand All @@ -98,13 +118,22 @@

.playlistTitle,
.playlistDescription {
overflow-x: hidden;
text-align: center;
white-space: nowrap;
text-overflow: ellipsis;
max-inline-size: 750px;

/* Approximate max size before untruncated title could break grid view interface */
max-inline-size: 50vw;
}

.app:not(.isSideNavOpen) .playlistTitle,
.app:not(.isSideNavOpen) .playlistDescription {
inline-size: 100%;
margin-block: 8px;
max-inline-size: 70vw;

@media only screen and (width >= 910px) {
/* Approximate max size before untruncated title starts breaking list view desktop interface */
max-inline-size: 28vw;
}
}

.descriptionInput {
Expand All @@ -130,6 +159,15 @@
}
}

@media only screen and (width <= 680px) {
.playlistTitle,
.playlistDescription {
max-inline-size: 100%;
}
}



@media only screen and (width <= 1250px) {
:deep(.sharePlaylistIcon .iconDropdown) {
inset-inline: auto;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,8 @@
.card {
inline-size: 85%;
margin-block: 0 60px;
margin-inline: auto;
}

.message {
color: var(--tertiary-text-color);
}

@media only screen and (width <= 680px) {
.card {
inline-size: 90%;
}
}
4 changes: 4 additions & 0 deletions src/renderer/scss-partials/_ft-list-item.scss
Original file line number Diff line number Diff line change
Expand Up @@ -319,6 +319,10 @@ $watched-transition-duration: 0.5s;
.info .description {
margin-inline-end: 10px;
}

@media only screen and (width >= 1514px) {
max-inline-size: 1250px;
}
}

&.grid {
Expand Down
7 changes: 0 additions & 7 deletions src/renderer/views/About/About.css
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
.card {
margin-block: 0 60px;
margin-inline: auto;
inline-size: 85%;
}

.brand {
Expand Down Expand Up @@ -61,9 +60,3 @@
grid-template-columns: 1fr;
}
}

@media only screen and (width <=680px) {
.card {
inline-size: 90%;
}
}
1 change: 0 additions & 1 deletion src/renderer/views/Channel/Channel.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
.card {
position: relative;
inline-size: 85%;
margin-block: 0 20px;
margin-inline: auto;
box-sizing: border-box;
Expand Down
7 changes: 0 additions & 7 deletions src/renderer/views/Hashtag/Hashtag.css
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,4 @@
.card {
margin-block: 0 20px;
margin-inline: auto;
inline-size: 85%;
}

@media only screen and (width <= 680px) {
.card {
inline-size: 90%;
}
}
7 changes: 0 additions & 7 deletions src/renderer/views/History/History.css
Original file line number Diff line number Diff line change
@@ -1,15 +1,8 @@
.card {
inline-size: 85%;
margin-block: 0 60px;
margin-inline: auto;
}

.message {
color: var(--tertiary-text-color);
}

@media only screen and (width <= 680px) {
.card {
inline-size: 90%;
}
}
Loading
Loading