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 dashboard switching on Mobile #20238

Merged
merged 14 commits into from
Jul 28, 2022
Merged

Fix dashboard switching on Mobile #20238

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
524f1dd
Fix dashboard switching on Mobile
Jul 5, 2022
d122308
Merge branch 'main' into fix-dashboard-context-mobile
zeripath Jul 5, 2022
ff1fe0d
Remove uncessary `!important`.
Jul 6, 2022
5380a53
Merge branch 'main' into fix-dashboard-context-mobile
Jul 6, 2022
a1c6fcc
Merge branch 'main' into fix-dashboard-context-mobile
Jul 9, 2022
53f2f75
Merge branch 'main' into fix-dashboard-context-mobile
zeripath Jul 10, 2022
f9edc93
Merge branch 'main' into fix-dashboard-context-mobile
6543 Jul 24, 2022
7326d56
Merge branch 'main' into fix-dashboard-context-mobile
Jul 28, 2022
02589de
Use dirty CSS
Jul 28, 2022
33e6391
Merge branch 'main' into fix-dashboard-context-mobile
Jul 28, 2022
07f5952
Fix HTML + revert CSS modification
Jul 28, 2022
0fdfce5
Tidy up css
Jul 28, 2022
e7b595d
Merge branch 'main' into fix-dashboard-context-mobile
6543 Jul 28, 2022
7ea515c
Merge branch 'main' into fix-dashboard-context-mobile
6543 Jul 28, 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
44 changes: 21 additions & 23 deletions templates/user/dashboard/navbar.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,30 +75,28 @@
{{end}}

{{if .ContextUser.IsOrganization}}
<div class="right stackable menu">
Gusted marked this conversation as resolved.
Show resolved Hide resolved
6543 marked this conversation as resolved.
Show resolved Hide resolved
<a class="{{if .PageIsNews}}active{{end}} item" style="margin-left: auto" href="{{.ContextUser.DashboardLink}}{{if .Team}}/{{PathEscape .Team.Name}}{{end}}">
{{svg "octicon-rss"}}&nbsp;{{.locale.Tr "activities"}}
</a>
{{if not .UnitIssuesGlobalDisabled}}
<a class="{{if .PageIsIssues}}active{{end}} item" href="{{.ContextUser.OrganisationLink}}/issues{{if .Team}}/{{PathEscape .Team.Name}}{{end}}">
{{svg "octicon-issue-opened"}}&nbsp;{{.locale.Tr "issues"}}
</a>
{{end}}
{{if not .UnitPullsGlobalDisabled}}
<a class="{{if .PageIsPulls}}active{{end}} item" href="{{.ContextUser.OrganisationLink}}/pulls{{if .Team}}/{{PathEscape .Team.Name}}{{end}}">
{{svg "octicon-git-pull-request"}}&nbsp;{{.locale.Tr "pull_requests"}}
</a>
{{end}}
{{if and .ShowMilestonesDashboardPage (not (and .UnitIssuesGlobalDisabled .UnitPullsGlobalDisabled))}}
<a class="{{if .PageIsMilestonesDashboard}}active{{end}} item" href="{{.ContextUser.OrganisationLink}}/milestones{{if .Team}}/{{PathEscape .Team.Name}}{{end}}">
{{svg "octicon-milestone"}}&nbsp;{{.locale.Tr "milestones"}}
<a class="{{if .PageIsNews}}active{{end}} item" style="margin-left: auto" href="{{.ContextUser.DashboardLink}}{{if .Team}}/{{PathEscape .Team.Name}}{{end}}">
{{svg "octicon-rss"}}&nbsp;{{.locale.Tr "activities"}}
</a>
{{if not .UnitIssuesGlobalDisabled}}
<a class="{{if .PageIsIssues}}active{{end}} item" href="{{.ContextUser.OrganisationLink}}/issues{{if .Team}}/{{PathEscape .Team.Name}}{{end}}">
{{svg "octicon-issue-opened"}}&nbsp;{{.locale.Tr "issues"}}
</a>
{{end}}
{{if not .UnitPullsGlobalDisabled}}
<a class="{{if .PageIsPulls}}active{{end}} item" href="{{.ContextUser.OrganisationLink}}/pulls{{if .Team}}/{{PathEscape .Team.Name}}{{end}}">
{{svg "octicon-git-pull-request"}}&nbsp;{{.locale.Tr "pull_requests"}}
</a>
{{end}}
{{if and .ShowMilestonesDashboardPage (not (and .UnitIssuesGlobalDisabled .UnitPullsGlobalDisabled))}}
<a class="{{if .PageIsMilestonesDashboard}}active{{end}} item" href="{{.ContextUser.OrganisationLink}}/milestones{{if .Team}}/{{PathEscape .Team.Name}}{{end}}">
{{svg "octicon-milestone"}}&nbsp;{{.locale.Tr "milestones"}}
</a>
{{end}}
<div class="item">
<a class="ui primary basic button" href="{{.ContextUser.HomeLink}}" title='{{.locale.Tr "home.view_home" .ContextUser.Name}}'>
{{.locale.Tr "home.view_home" (.ContextUser.ShortName 40)}}
</a>
{{end}}
<div class="item">
<a class="ui primary basic button" href="{{.ContextUser.HomeLink}}" title='{{.locale.Tr "home.view_home" .ContextUser.Name}}'>
{{.locale.Tr "home.view_home" (.ContextUser.ShortName 40)}}
</a>
</div>
</div>
{{end}}
</div>
Expand Down
6 changes: 6 additions & 0 deletions web_src/less/_dashboard.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,12 @@

.ui.dropdown {
max-width: 100%;

@media @mediaSm {
> .menu:not(.hidden) {
wxiaoguang marked this conversation as resolved.
Show resolved Hide resolved
position: inherit;
}
}
}
}
}
Expand Down