Skip to content

Commit 03d7998

Browse files
geek1011bkcsoft
geek1011
authored and
bkcsoft
committed
Cleaner UI for explore page (#1253) (#1255)
* Take navbar out of column * Add styles to navbar * Changed navbar classes * Remove unneeded !important from index.css * Remove unneeded !important from _explore.less
1 parent 780cb69 commit 03d7998

File tree

6 files changed

+78
-78
lines changed

6 files changed

+78
-78
lines changed

‎public/css/index.css

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2944,6 +2944,14 @@ footer .ui.language .menu {
29442944
padding-top: 15px;
29452945
padding-bottom: 80px;
29462946
}
2947+
.explore .navbar {
2948+
justify-content: center;
2949+
padding-top: 15px !important;
2950+
margin-top: -15px !important;
2951+
margin-bottom: 15px !important;
2952+
background-color: #FAFAFA !important;
2953+
border-width: 1px !important;
2954+
}
29472955
.explore .navbar .octicon {
29482956
width: 16px;
29492957
text-align: center;

‎public/less/_explore.less

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,13 @@
33
padding-bottom: @footer-margin * 2;
44

55
.navbar {
6+
justify-content: center;
7+
padding-top: 15px !important;
8+
margin-top: -15px !important;
9+
margin-bottom: 15px !important;
10+
background-color: #FAFAFA !important;
11+
border-width: 1px !important;
12+
613
.octicon {
714
width: 16px;
815
text-align: center;
@@ -72,4 +79,4 @@
7279
}
7380
}
7481
}
75-
}
82+
}

‎templates/explore/navbar.tmpl

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
1-
<div class="four wide column">
2-
<div class="ui vertical menu navbar">
3-
<div class="header item">{{.i18n.Tr "explore"}}</div>
4-
<a class="{{if .PageIsExploreRepositories}}active{{end}} item" href="{{AppSubUrl}}/explore/repos">
5-
<span class="octicon octicon-repo"></span> {{.i18n.Tr "explore.repos"}}
6-
</a>
7-
<a class="{{if .PageIsExploreUsers}}active{{end}} item" href="{{AppSubUrl}}/explore/users">
8-
<span class="octicon octicon-person"></span> {{.i18n.Tr "explore.users"}}
9-
</a>
10-
<a class="{{if .PageIsExploreOrganizations}}active{{end}} item" href="{{AppSubUrl}}/explore/organizations">
11-
<span class="octicon octicon-organization"></span> {{.i18n.Tr "explore.organizations"}}
12-
</a>
13-
</div>
1+
<div class="ui secondary pointing tabular top attached borderless menu navbar">
2+
<a class="{{if .PageIsExploreRepositories}}active{{end}} item" href="{{AppSubUrl}}/explore/repos">
3+
<span class="octicon octicon-repo"></span> {{.i18n.Tr "explore.repos"}}
4+
</a>
5+
<a class="{{if .PageIsExploreUsers}}active{{end}} item" href="{{AppSubUrl}}/explore/users">
6+
<span class="octicon octicon-person"></span> {{.i18n.Tr "explore.users"}}
7+
</a>
8+
<a class="{{if .PageIsExploreOrganizations}}active{{end}} item" href="{{AppSubUrl}}/explore/organizations">
9+
<span class="octicon octicon-organization"></span> {{.i18n.Tr "explore.organizations"}}
10+
</a>
1411
</div>

‎templates/explore/organizations.tmpl

Lines changed: 24 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,33 @@
11
{{template "base/head" .}}
22
<div class="explore users">
3+
{{template "explore/navbar" .}}
34
<div class="ui container">
4-
<div class="ui grid">
5-
{{template "explore/navbar" .}}
6-
<div class="twelve wide column content">
7-
{{template "explore/search" .}}
5+
{{template "explore/search" .}}
86

9-
<div class="ui user list">
10-
{{range .Users}}
11-
<div class="item">
12-
<img class="ui avatar image" src="{{.RelAvatarLink}}">
13-
<div class="content">
14-
<span class="header"><a href="{{.HomeLink}}">{{.Name}}</a> {{.FullName}}</span>
15-
<div class="description">
16-
{{if .Location}}
17-
<i class="octicon octicon-location"></i> {{.Location}}
18-
{{end}}
19-
{{if and .Website}}
20-
<i class="octicon octicon-link"></i>
21-
<a href="{{.Website}}" rel="nofollow">{{.Website}}</a>
22-
{{end}}
23-
<i class="octicon octicon-clock"></i> {{$.i18n.Tr "user.join_on"}} {{DateFmtShort .Created}}
24-
</div>
25-
</div>
26-
</div>
27-
{{else}}
28-
<div>{{$.i18n.Tr "explore.org_no_results"}}</div>
29-
{{end}}
7+
<div class="ui user list">
8+
{{range .Users}}
9+
<div class="item">
10+
<img class="ui avatar image" src="{{.RelAvatarLink}}">
11+
<div class="content">
12+
<span class="header"><a href="{{.HomeLink}}">{{.Name}}</a> {{.FullName}}</span>
13+
<div class="description">
14+
{{if .Location}}
15+
<i class="octicon octicon-location"></i> {{.Location}}
16+
{{end}}
17+
{{if and .Website}}
18+
<i class="octicon octicon-link"></i>
19+
<a href="{{.Website}}" rel="nofollow">{{.Website}}</a>
20+
{{end}}
21+
<i class="octicon octicon-clock"></i> {{$.i18n.Tr "user.join_on"}} {{DateFmtShort .Created}}
22+
</div>
23+
</div>
3024
</div>
31-
32-
{{template "base/paginate" .}}
33-
</div>
25+
{{else}}
26+
<div>{{$.i18n.Tr "explore.org_no_results"}}</div>
27+
{{end}}
3428
</div>
29+
30+
{{template "base/paginate" .}}
3531
</div>
3632
</div>
3733
{{template "base/footer" .}}

‎templates/explore/repos.tmpl

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,10 @@
11
{{template "base/head" .}}
22
<div class="explore repositories">
3+
{{template "explore/navbar" .}}
34
<div class="ui container">
4-
<div class="ui grid">
5-
{{template "explore/navbar" .}}
6-
<div class="twelve wide column content">
7-
{{template "explore/search" .}}
8-
{{template "explore/repo_list" .}}
9-
{{template "base/paginate" .}}
10-
</div>
11-
</div>
5+
{{template "explore/search" .}}
6+
{{template "explore/repo_list" .}}
7+
{{template "base/paginate" .}}
128
</div>
139
</div>
1410
{{template "base/footer" .}}

‎templates/explore/users.tmpl

Lines changed: 24 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,33 @@
11
{{template "base/head" .}}
22
<div class="explore users">
3+
{{template "explore/navbar" .}}
34
<div class="ui container">
4-
<div class="ui grid">
5-
{{template "explore/navbar" .}}
6-
<div class="twelve wide column content">
7-
{{template "explore/search" .}}
5+
{{template "explore/search" .}}
86

9-
<div class="ui user list">
10-
{{range .Users}}
11-
<div class="item">
12-
<img class="ui avatar image" src="{{.RelAvatarLink}}">
13-
<div class="content">
14-
<span class="header"><a href="{{.HomeLink}}">{{.Name}}</a> {{.FullName}}</span>
15-
<div class="description">
16-
{{if .Location}}
17-
<i class="octicon octicon-location"></i> {{.Location}}
18-
{{end}}
19-
{{if and $.ShowUserEmail .Email $.IsSigned (not .KeepEmailPrivate)}}
20-
<i class="octicon octicon-mail"></i>
21-
<a href="mailto:{{.Email}}" rel="nofollow">{{.Email}}</a>
22-
{{end}}
23-
<i class="octicon octicon-clock"></i> {{$.i18n.Tr "user.join_on"}} {{DateFmtShort .Created}}
24-
</div>
25-
</div>
26-
</div>
27-
{{else}}
28-
<div>{{$.i18n.Tr "explore.user_no_results"}}</div>
29-
{{end}}
7+
<div class="ui user list">
8+
{{range .Users}}
9+
<div class="item">
10+
<img class="ui avatar image" src="{{.RelAvatarLink}}">
11+
<div class="content">
12+
<span class="header"><a href="{{.HomeLink}}">{{.Name}}</a> {{.FullName}}</span>
13+
<div class="description">
14+
{{if .Location}}
15+
<i class="octicon octicon-location"></i> {{.Location}}
16+
{{end}}
17+
{{if and $.ShowUserEmail .Email $.IsSigned (not .KeepEmailPrivate)}}
18+
<i class="octicon octicon-mail"></i>
19+
<a href="mailto:{{.Email}}" rel="nofollow">{{.Email}}</a>
20+
{{end}}
21+
<i class="octicon octicon-clock"></i> {{$.i18n.Tr "user.join_on"}} {{DateFmtShort .Created}}
22+
</div>
23+
</div>
3024
</div>
31-
32-
{{template "base/paginate" .}}
33-
</div>
25+
{{else}}
26+
<div>{{$.i18n.Tr "explore.user_no_results"}}</div>
27+
{{end}}
3428
</div>
29+
30+
{{template "base/paginate" .}}
3531
</div>
3632
</div>
3733
{{template "base/footer" .}}

0 commit comments

Comments
 (0)