Skip to content

Fix the layout of the hashtag page #3886

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.

Sign up for GitHub

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

Merged
FreeTubeBot merged 2 commits into from
Aug 18, 2023
Merged

Fix the layout of the hashtag page #3886

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1e568c2
Fix the layout of the hashtag page
absidue Aug 15, 2023
0fbb633
Merge branch 'development' into fix-hashtag-layout
absidue Aug 17, 2023
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
9 changes: 7 additions & 2 deletions src/renderer/views/Hashtag/Hashtag.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,14 @@
.getNextPage:hover, .getNextPage:focus {
background-color: var(--side-nav-hover-color);
}

.card {
box-sizing: border-box;
margin: 0 auto 20px;
position: relative;
width: 85%;
}

@media only screen and (max-width: 680px) {
.card {
width: 90%;
}
}
61 changes: 29 additions & 32 deletions src/renderer/views/Hashtag/Hashtag.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,39 +4,36 @@
v-if="isLoading"
:fullscreen="true"
/>
<div v-else>
<ft-card>
<h2>{{ hashtag }}</h2>
<div
class="elementList"
<ft-card
v-else
class="card"
>
<h2>{{ hashtag }}</h2>
<ft-element-list
v-if="videos.length > 0"
:data="videos"
/>
<ft-flex-box
v-else
>
<p
class="message"
>
<ft-element-list
v-if="videos.length > 0"
:data="videos"
/>
<ft-flex-box
v-else-if="videos.length === 0"
>
<p
class="message"
>
{{ $t("Hashtag.This hashtag does not currently have any videos") }}
</p>
</ft-flex-box>
</div>
<div
v-if="showFetchMoreButton"
class="getNextPage"
role="button"
tabindex="0"
@click="handleFetchMore"
@keydown.space.prevent="handleFetchMore"
@keydown.enter.prevent="handleFetchMore"
>
<font-awesome-icon :icon="['fas', 'search']" /> {{ $t("Search Filters.Fetch more results") }}
</div>
</ft-card>
</div>
{{ $t("Hashtag.This hashtag does not currently have any videos") }}
</p>
</ft-flex-box>
<div
v-if="showFetchMoreButton"
class="getNextPage"
role="button"
tabindex="0"
@click="handleFetchMore"
@keydown.space.prevent="handleFetchMore"
@keydown.enter.prevent="handleFetchMore"
>
<font-awesome-icon :icon="['fas', 'search']" /> {{ $t("Search Filters.Fetch more results") }}
</div>
</ft-card>
</div>
</template>
<script src="./Hashtag.js" />
Expand Down