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.

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

Make more use of flex in mobile formatting (fixes #142) #729

Merged
merged 2 commits into from
Feb 6, 2022
+28 −15
Merged

Make more use of flex in mobile formatting (fixes #142) #729

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
40b31a1
Make more use of flex in mobile formatting (fixes #142)
svenstaro Feb 6, 2022
4cc83f6
Add CHANGELOG for #729
svenstaro Feb 6, 2022
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
## [Unreleased] - ReleaseDate
- Fix panic when using TLS in some instances [#670](https://github.com/svenstaro/miniserve/issues/670) (thanks @aliemjay)
- Add `--route-prefix` to add a fixed route prefix [#728](https://github.com/svenstaro/miniserve/pull/728) (thanks @aliemjay and @Jikstra)
- Allow tapping the whole row in mobile view [#729](https://github.com/svenstaro/miniserve/pull/729)

## [0.18.0] - 2021-10-26
- Add raw mode and raw mode footer display [#508](https://github.com/svenstaro/miniserve/pull/508) (thanks @Jikstra)
Expand Down
28 changes: 18 additions & 10 deletions data/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,11 @@ table tbody tr td {
line-height: 1.125rem;
}

table tbody tr td p {
display: flex;
align-items: center;
}

table thead tr th {
padding: 0.5rem 0.625rem 0.625rem;
font-weight: bold;
Expand Down Expand Up @@ -329,8 +334,8 @@ th span.active span {

.back {
position: fixed;
width: 3.8rem;
height: 3.8rem;
width: 3rem;
height: 3rem;
align-items: center;
justify-content: center;
bottom: 3rem;
Expand All @@ -340,6 +345,8 @@ th span.active span {
box-shadow: 0 0 8px -4px #888888;
color: var(--back_button_link_color);
display: none;
padding: 0;
font-size: 2em;
}

.back:visited {
Expand Down Expand Up @@ -482,30 +489,31 @@ th span.active span {
}

.mobile-info {
display: block;
float: right;
margin-top: 0.5rem;
display: inline-flex;
align-items: center;
margin: auto;
}

table tbody tr td {
padding-top: 0;
padding-bottom: 0;
}

a.directory {
display: block;
a {
padding: 0.5625rem 0;
}

a.directory {
flex-grow: 1;
}

.file-entry {
align-items: center;
}

a.root,
a.file {
display: inline-block;
flex: 1;
padding: 0.5625rem 0;
flex-grow: 1;
}

.back {
Expand Down
14 changes: 9 additions & 5 deletions src/renderer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,9 +124,11 @@ pub fn page(
@if !is_root {
tr {
td colspan="3" {
span.root-chevron { (chevron_left()) }
a.root href=(parametrized_link("../", sort_method, sort_order, false)) {
"Parent directory"
p {
span.root-chevron { (chevron_left()) }
a.root href=(parametrized_link("../", sort_method, sort_order, false)) {
"Parent directory"
}
}
}
}
Expand Down Expand Up @@ -169,8 +171,10 @@ pub fn raw(entries: Vec<Entry>, is_root: bool) -> Markup {
@if !is_root {
tr {
td colspan="3" {
a.root href=(parametrized_link("../", None, None, true)) {
".."
p {
a.root href=(parametrized_link("../", None, None, true)) {
".."
}
}
}
}
Expand Down