summaryrefslogtreecommitdiffstats
path: root/templates/user
diff options
context:
space:
mode:
Diffstat (limited to 'templates/user')
-rw-r--r--templates/user/auth/signin_navbar.tmpl2
-rw-r--r--templates/user/dashboard/dashboard.tmpl4
-rw-r--r--templates/user/dashboard/feeds.tmpl4
-rw-r--r--templates/user/dashboard/issues.tmpl14
-rw-r--r--templates/user/dashboard/navbar.tmpl72
-rw-r--r--templates/user/profile.tmpl4
6 files changed, 54 insertions, 46 deletions
diff --git a/templates/user/auth/signin_navbar.tmpl b/templates/user/auth/signin_navbar.tmpl
index 3102eb8c5c..3f0db26713 100644
--- a/templates/user/auth/signin_navbar.tmpl
+++ b/templates/user/auth/signin_navbar.tmpl
@@ -1,5 +1,5 @@
{{if .EnableOpenIDSignIn}}
-<div class="ui secondary pointing tabular top attached borderless menu stackable new-menu navbar">
+<div class="ui secondary pointing tabular top attached borderless menu new-menu navbar">
<a class="{{if .PageIsLogin}}active{{end}} item" href="{{AppSubUrl}}/user/login">
{{.i18n.Tr "auth.login_userpass"}}
</a>
diff --git a/templates/user/dashboard/dashboard.tmpl b/templates/user/dashboard/dashboard.tmpl
index c1f02ac8d1..bddcc4925b 100644
--- a/templates/user/dashboard/dashboard.tmpl
+++ b/templates/user/dashboard/dashboard.tmpl
@@ -3,7 +3,7 @@
{{template "user/dashboard/navbar" .}}
<div class="ui container">
{{template "base/alert" .}}
- <div class="ui grid">
+ <div class="ui mobile reversed stackable grid">
<div class="ten wide column">
{{template "user/dashboard/feeds" .}}
</div>
@@ -27,7 +27,7 @@
v-cloak
>
<div>
- <div v-if="!isOrganization" class="ui two item stackable tabable menu">
+ <div v-if="!isOrganization" class="ui two item tabable menu">
<a :class="{item: true, active: tab === 'repos'}" @click="changeTab('repos')">{{.i18n.Tr "repository"}}</a>
<a :class="{item: true, active: tab === 'organizations'}" @click="changeTab('organizations')">{{.i18n.Tr "organization"}}</a>
</div>
diff --git a/templates/user/dashboard/feeds.tmpl b/templates/user/dashboard/feeds.tmpl
index e94ef4d6b8..bdd6c34820 100644
--- a/templates/user/dashboard/feeds.tmpl
+++ b/templates/user/dashboard/feeds.tmpl
@@ -4,7 +4,7 @@
<img class="ui avatar image" src="{{.GetActAvatar}}" alt="">
</div>
<div class="ui grid">
- <div class="ui fifteen wide column">
+ <div class="ui thirteen wide column">
<div class="{{if eq .GetOpType 5}}push news{{end}}">
<p>
<a href="{{AppSubUrl}}/{{.GetActUserName}}">{{.ShortActUserName}}</a>
@@ -79,7 +79,7 @@
<p class="text italic light grey">{{TimeSince .GetCreate $.i18n.Lang}}</p>
</div>
</div>
- <div class="ui one wide column">
+ <div class="ui three wide right aligned column">
<i class="text grey mega-octicon octicon-{{ActionIcon .GetOpType}}"></i>
</div>
</div>
diff --git a/templates/user/dashboard/issues.tmpl b/templates/user/dashboard/issues.tmpl
index cf2e10885b..720def07e9 100644
--- a/templates/user/dashboard/issues.tmpl
+++ b/templates/user/dashboard/issues.tmpl
@@ -2,7 +2,7 @@
<div class="dashboard issues">
{{template "user/dashboard/navbar" .}}
<div class="ui container">
- <div class="ui grid">
+ <div class="ui stackable grid">
<div class="four wide column">
<div class="ui secondary vertical filter menu">
<a class="{{if eq .ViewType "your_repositories"}}ui basic blue button{{end}} item" href="{{.Link}}?type=your_repositories&repo={{.RepoID}}&sort={{$.SortType}}&state={{.State}}">
@@ -64,8 +64,16 @@
<div class="ui label">{{if not $.RepoID}}{{.Repo.FullName}}{{end}}#{{.Index}}</div>
<a class="title has-emoji" href="{{AppSubUrl}}/{{.Repo.Owner.Name}}/{{.Repo.Name}}/issues/{{.Index}}">{{.Title}}</a>
- {{range .Labels}}
- <a class="ui label" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&state={{$.State}}&labels={{.ID}}&milestone={{$.MilestoneID}}&assignee={{$.AssigneeID}}" style="color: {{.ForegroundColor}}; background-color: {{.Color}}">{{.Name}}</a>
+ {{with .Labels}}
+ {{/* If we have any labels, we should show them
+ with a 2.5 line height, this way they don't look
+ awful and they don't stack on top of each other,
+ especially on mobile views. */}}
+ <span style="line-height: 2.5">
+ {{range .}}
+ <a class="ui label" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&state={{$.State}}&labels={{.ID}}&milestone={{$.MilestoneID}}&assignee={{$.AssigneeID}}" style="color: {{.ForegroundColor}}; background-color: {{.Color}}">{{.Name}}</a>
+ {{end}}
+ </span>
{{end}}
{{if .NumComments}}
diff --git a/templates/user/dashboard/navbar.tmpl b/templates/user/dashboard/navbar.tmpl
index 02f21048ff..0a395bc329 100644
--- a/templates/user/dashboard/navbar.tmpl
+++ b/templates/user/dashboard/navbar.tmpl
@@ -1,36 +1,38 @@
<div class="ui container">
- <div class="ui floating dropdown link jump">
- <span class="text">
- <img class="ui avatar image" src="{{.ContextUser.RelAvatarLink}}">
- {{.ContextUser.ShortName 20}}
- <i class="dropdown icon"></i>
- </span>
- <div class="context user overflow menu" tabindex="-1">
- <div class="ui header">
- {{.i18n.Tr "home.switch_dashboard_context"}}
- </div>
- <div class="items">
- <a class="{{if eq .ContextUser.ID .SignedUser.ID}}active selected{{end}} item" href="{{AppSubUrl}}/{{if .PageIsIssues}}issues{{else if .PageIsPulls}}pulls{{end}}">
- <img class="ui avatar image" src="{{.SignedUser.RelAvatarLink}}">
- {{.SignedUser.Name}}
- </a>
- {{range .Orgs}}
- <a class="{{if eq $.ContextUser.ID .ID}}active selected{{end}} item" href="{{AppSubUrl}}/org/{{.Name}}/{{if $.PageIsIssues}}issues{{else if $.PageIsPulls}}pulls{{else}}dashboard{{end}}">
- <img class="ui avatar image" src="{{.RelAvatarLink}}">
- {{.ShortName 20}}
+ <div class="ui secondary stackable menu">
+ <div class="item">
+ <div class="ui floating dropdown link jump">
+ <span class="text">
+ <img class="ui avatar image" src="{{.ContextUser.RelAvatarLink}}">
+ {{.ContextUser.ShortName 20}}
+ <i class="dropdown icon"></i>
+ </span>
+ <div class="context user overflow menu" tabindex="-1">
+ <div class="ui header">
+ {{.i18n.Tr "home.switch_dashboard_context"}}
+ </div>
+ <div class="items">
+ <a class="{{if eq .ContextUser.ID .SignedUser.ID}}active selected{{end}} item" href="{{AppSubUrl}}/{{if .PageIsIssues}}issues{{else if .PageIsPulls}}pulls{{end}}">
+ <img class="ui avatar image" src="{{.SignedUser.RelAvatarLink}}">
+ {{.SignedUser.Name}}
+ </a>
+ {{range .Orgs}}
+ <a class="{{if eq $.ContextUser.ID .ID}}active selected{{end}} item" href="{{AppSubUrl}}/org/{{.Name}}/{{if $.PageIsIssues}}issues{{else if $.PageIsPulls}}pulls{{else}}dashboard{{end}}">
+ <img class="ui avatar image" src="{{.RelAvatarLink}}">
+ {{.ShortName 20}}
+ </a>
+ {{end}}
+ </div>
+ <a class="item" href="{{AppSubUrl}}/org/create">
+ <i class="octicon octicon-plus"></i>&nbsp;&nbsp;&nbsp;{{.i18n.Tr "new_org"}}
</a>
- {{end}}
+ </div>
</div>
- <a class="item" href="{{AppSubUrl}}/org/create">
- <i class="octicon octicon-plus"></i>&nbsp;&nbsp;&nbsp;{{.i18n.Tr "new_org"}}
- </a>
</div>
- </div>
- {{if .ContextUser.IsOrganization}}
- <div class="ui right">
- <div class="ui secondary head menu">
- <a class="{{if .PageIsNews}}active{{end}} item" href="{{AppSubUrl}}/org/{{.ContextUser.Name}}/dashboard">
+ {{if .ContextUser.IsOrganization}}
+ <div class="right stackable menu">
+ <a class="{{if .PageIsNews}}active{{end}} item" style="margin-left: auto" href="{{AppSubUrl}}/org/{{.ContextUser.Name}}/dashboard">
<i class="octicon octicon-rss"></i>&nbsp;{{.i18n.Tr "activities"}}
</a>
<a class="{{if .PageIsIssues}}active{{end}} item" href="{{AppSubUrl}}/org/{{.ContextUser.Name}}/issues">
@@ -39,15 +41,13 @@
<a class="{{if .PageIsPulls}}active{{end}} item" href="{{AppSubUrl}}/org/{{.ContextUser.Name}}/pulls">
<i class="octicon octicon-git-pull-request"></i>&nbsp;{{.i18n.Tr "pull_requests"}}
</a>
- <div class="right menu">
- <div class="item">
- <a class="ui blue basic button" href="{{.ContextUser.HomeLink}}">
- {{.i18n.Tr "home.view_home" (.ContextUser.ShortName 10)}}
- </a>
- </div>
+ <div class="item">
+ <a class="ui blue basic button" href="{{.ContextUser.HomeLink}}">
+ {{.i18n.Tr "home.view_home" (.ContextUser.ShortName 10)}}
+ </a>
</div>
</div>
- </div>
- {{end}}
+ {{end}}
+ </div>
</div>
<div class="ui divider"></div>
diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl
index e89a4aa378..669ee3264b 100644
--- a/templates/user/profile.tmpl
+++ b/templates/user/profile.tmpl
@@ -1,7 +1,7 @@
{{template "base/head" .}}
<div class="user profile">
<div class="ui container">
- <div class="ui grid">
+ <div class="ui stackable grid">
<div class="ui five wide column">
<div class="ui card">
{{if eq .SignedUserName .Owner.Name}}
@@ -82,7 +82,7 @@
</div>
</div>
<div class="ui eleven wide column">
- <div class="ui secondary pointing menu">
+ <div class="ui secondary stackable pointing menu">
<a class='{{if and (ne .TabName "activity") (ne .TabName "stars")}}active{{end}} item' href="{{.Owner.HomeLink}}">
<i class="octicon octicon-repo"></i> {{.i18n.Tr "user.repositories"}}
</a>
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-22 16:38:32 +0000