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

fix(web): keep the pages of the navigation in the center #21867

Merged
merged 19 commits into from
Nov 25, 2022
Merged

fix(web): keep the pages of the navigation in the center #21867

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
238a713
fix(web): keep the pages of the navigation in the center
kecrily Nov 19, 2022
9527d10
Merge branch 'main' into fix/page-navigation
lunny Nov 21, 2022
216ffdf
Merge branch 'main' into fix/page-navigation
lunny Nov 21, 2022
8763f36
Merge branch 'main' into fix/page-navigation
lunny Nov 21, 2022
d66dca0
Merge branch 'main' into fix/page-navigation
lunny Nov 22, 2022
7b360b0
Merge branch 'main' into fix/page-navigation
lunny Nov 22, 2022
a780962
Merge branch 'main' into fix/page-navigation
lunny Nov 22, 2022
92a7e10
Merge branch 'main' into fix/page-navigation
lunny Nov 23, 2022
a26bdf0
Merge branch 'main' into fix/page-navigation
lunny Nov 23, 2022
8c05f49
Merge branch 'main' into fix/page-navigation
lunny Nov 23, 2022
db2a68c
Merge branch 'main' into fix/page-navigation
lunny Nov 23, 2022
434eb45
Merge branch 'main' into fix/page-navigation
lunny Nov 23, 2022
ab4eeb0
Merge branch 'main' into fix/page-navigation
lunny Nov 24, 2022
ad090d2
Merge branch 'main' into fix/page-navigation
lunny Nov 24, 2022
cc7b877
Merge branch 'main' into fix/page-navigation
jolheiser Nov 24, 2022
9ee95f3
Merge branch 'main' into fix/page-navigation
lunny Nov 24, 2022
21fb03a
Merge branch 'main' into fix/page-navigation
lunny Nov 24, 2022
ed86a01
Merge branch 'main' into fix/page-navigation
lunny Nov 25, 2022
6b18d8f
Merge branch 'main' into fix/page-navigation
lunny Nov 25, 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
2 changes: 1 addition & 1 deletion templates/base/paginate.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
{{if eq .Num -1}}
<a class="disabled item">...</a>
{{else}}
<a class="{{if .IsCurrent}}active{{end}} item" {{if not .IsCurrent}}href="{{$.Link}}?page={{.Num}}{{if $paginationLink}}&{{$paginationLink}}{{end}}"{{end}}>{{.Num}}</a>
<a class="{{if .IsCurrent}}active{{end}} item content-center" {{if not .IsCurrent}}href="{{$.Link}}?page={{.Num}}{{if $paginationLink}}&{{$paginationLink}}{{end}}"{{end}}>{{.Num}}</a>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
<a class="{{if .IsCurrent}}active{{end}} item content-center" {{if not .IsCurrent}}href="{{$.Link}}?page={{.Num}}{{if $paginationLink}}&{{$paginationLink}}{{end}}"{{end}}>{{.Num}}</a>
<a class="{{if .IsCurrent}}active {{end}}item content-center"{{if not .IsCurrent}} href="{{$.Link}}?page={{.Num}}{{if $paginationLink}}&{{$paginationLink}}{{end}}"{{end}}>{{.Num}}</a>

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is something I want to address together in another PR.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's not do this here but in #21855.

{{end}}
{{end}}
<a class="{{if not .HasNext}}disabled{{end}} item navigation" {{if .HasNext}}href="{{$.Link}}?page={{.Next}}{{if $paginationLink}}&{{$paginationLink}}{{end}}"{{end}}>
Expand Down
2 changes: 2 additions & 0 deletions web_src/less/helpers.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,8 @@
.py-4 { padding-top: 1rem !important; padding-bottom: 1rem !important; }
.py-5 { padding-top: 2rem !important; padding-bottom: 2rem !important; }

.content-center { align-content: center !important; }
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why important?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because all the other classes are important, I have written it as important as well.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Important is ok for helpers.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's probably not necessary for this helper, but for others it definitely is to allow outweighing the heavyweight fomantic styles as well as the overly-nested styles of our own.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Which simply means that we should fix our nested selectors and replace them with simpler ones.
But that's a topic for another PR.


@media @mediaSm {
.db-small { display: block !important; }
.w-100-small { width: 100% !important; }
Expand Down