third_party
/
gitea
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleaner UI for explore page (#1253) (#1255)

Browse Source 
* Take navbar out of column
* Add styles to navbar
* Changed navbar classes
* Remove unneeded !important from index.css
* Remove unneeded !important from _explore.less
tokarchuk/v1.17
Patrick G 8 years ago committed by Kim "BKC" Carlbäcker
parent 780cb692d6
commit 03d79983ee
6 changed files with 78 additions and 78 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 8
      public/css/index.css
  2. 9
      public/less/_explore.less
  3. 23
      templates/explore/navbar.tmpl
  4. 52
      templates/explore/organizations.tmpl
  5. 12
      templates/explore/repos.tmpl
  6. 52
      templates/explore/users.tmpl

8
public/css/index.css
Unescape View File

@ -2944,6 +2944,14 @@ footer .ui.language .menu {
padding-top: 15px; padding-top: 15px;
padding-bottom: 80px; padding-bottom: 80px;
} }
.explore .navbar {
justify-content: center;
padding-top: 15px !important;
margin-top: -15px !important;
margin-bottom: 15px !important;
background-color: #FAFAFA !important;
border-width: 1px !important;
}
.explore .navbar .octicon { .explore .navbar .octicon {
width: 16px; width: 16px;
text-align: center; text-align: center;

9
public/less/_explore.less
Unescape View File

@ -3,6 +3,13 @@
padding-bottom: @footer-margin * 2; padding-bottom: @footer-margin * 2;
.navbar { .navbar {
justify-content: center;
padding-top: 15px !important;
margin-top: -15px !important;
margin-bottom: 15px !important;
background-color: #FAFAFA !important;
border-width: 1px !important;
.octicon { .octicon {
width: 16px; width: 16px;
text-align: center; text-align: center;
@ -72,4 +79,4 @@
} }
} }
} }
} }

23
templates/explore/navbar.tmpl
Unescape View File

@ -1,14 +1,11 @@
<div class="four wide column"> <div class="ui secondary pointing tabular top attached borderless menu navbar">
<div class="ui vertical menu navbar"> <a class="{{if .PageIsExploreRepositories}}active{{end}} item" href="{{AppSubUrl}}/explore/repos">
<div class="header item">{{.i18n.Tr "explore"}}</div> <span class="octicon octicon-repo"></span> {{.i18n.Tr "explore.repos"}}
<a class="{{if .PageIsExploreRepositories}}active{{end}} item" href="{{AppSubUrl}}/explore/repos"> </a>
<span class="octicon octicon-repo"></span> {{.i18n.Tr "explore.repos"}} <a class="{{if .PageIsExploreUsers}}active{{end}} item" href="{{AppSubUrl}}/explore/users">
</a> <span class="octicon octicon-person"></span> {{.i18n.Tr "explore.users"}}
<a class="{{if .PageIsExploreUsers}}active{{end}} item" href="{{AppSubUrl}}/explore/users"> </a>
<span class="octicon octicon-person"></span> {{.i18n.Tr "explore.users"}} <a class="{{if .PageIsExploreOrganizations}}active{{end}} item" href="{{AppSubUrl}}/explore/organizations">
</a> <span class="octicon octicon-organization"></span> {{.i18n.Tr "explore.organizations"}}
<a class="{{if .PageIsExploreOrganizations}}active{{end}} item" href="{{AppSubUrl}}/explore/organizations"> </a>
<span class="octicon octicon-organization"></span> {{.i18n.Tr "explore.organizations"}}
</a>
</div>
</div> </div>

52
templates/explore/organizations.tmpl
Unescape View File

@ -1,37 +1,33 @@
{{template "base/head" .}} {{template "base/head" .}}
<div class="explore users"> <div class="explore users">
{{template "explore/navbar" .}}
<div class="ui container"> <div class="ui container">
<div class="ui grid"> {{template "explore/search" .}}
{{template "explore/navbar" .}}
<div class="twelve wide column content">
{{template "explore/search" .}}
<div class="ui user list"> <div class="ui user list">
{{range .Users}} {{range .Users}}
<div class="item"> <div class="item">
<img class="ui avatar image" src="{{.RelAvatarLink}}"> <img class="ui avatar image" src="{{.RelAvatarLink}}">
<div class="content"> <div class="content">
<span class="header"><a href="{{.HomeLink}}">{{.Name}}</a> {{.FullName}}</span> <span class="header"><a href="{{.HomeLink}}">{{.Name}}</a> {{.FullName}}</span>
<div class="description"> <div class="description">
{{if .Location}} {{if .Location}}
<i class="octicon octicon-location"></i> {{.Location}} <i class="octicon octicon-location"></i> {{.Location}}
{{end}} {{end}}
{{if and .Website}} {{if and .Website}}
<i class="octicon octicon-link"></i> <i class="octicon octicon-link"></i>
<a href="{{.Website}}" rel="nofollow">{{.Website}}</a> <a href="{{.Website}}" rel="nofollow">{{.Website}}</a>
{{end}} {{end}}
<i class="octicon octicon-clock"></i> {{$.i18n.Tr "user.join_on"}} {{DateFmtShort .Created}} <i class="octicon octicon-clock"></i> {{$.i18n.Tr "user.join_on"}} {{DateFmtShort .Created}}
</div> </div>
</div> </div>
</div>
{{else}}
<div>{{$.i18n.Tr "explore.org_no_results"}}</div>
{{end}}
</div> </div>
{{else}}
{{template "base/paginate" .}} <div>{{$.i18n.Tr "explore.org_no_results"}}</div>
</div> {{end}}
</div> </div>
{{template "base/paginate" .}}
</div> </div>
</div> </div>
{{template "base/footer" .}} {{template "base/footer" .}}

12
templates/explore/repos.tmpl
Unescape View File

@ -1,14 +1,10 @@
{{template "base/head" .}} {{template "base/head" .}}
<div class="explore repositories"> <div class="explore repositories">
{{template "explore/navbar" .}}
<div class="ui container"> <div class="ui container">
<div class="ui grid"> {{template "explore/search" .}}
{{template "explore/navbar" .}} {{template "explore/repo_list" .}}
<div class="twelve wide column content"> {{template "base/paginate" .}}
{{template "explore/search" .}}
{{template "explore/repo_list" .}}
{{template "base/paginate" .}}
</div>
</div>
</div> </div>
</div> </div>
{{template "base/footer" .}} {{template "base/footer" .}}

52
templates/explore/users.tmpl
Unescape View File

@ -1,37 +1,33 @@
{{template "base/head" .}} {{template "base/head" .}}
<div class="explore users"> <div class="explore users">
{{template "explore/navbar" .}}
<div class="ui container"> <div class="ui container">
<div class="ui grid"> {{template "explore/search" .}}
{{template "explore/navbar" .}}
<div class="twelve wide column content">
{{template "explore/search" .}}
<div class="ui user list"> <div class="ui user list">
{{range .Users}} {{range .Users}}
<div class="item"> <div class="item">
<img class="ui avatar image" src="{{.RelAvatarLink}}"> <img class="ui avatar image" src="{{.RelAvatarLink}}">
<div class="content"> <div class="content">
<span class="header"><a href="{{.HomeLink}}">{{.Name}}</a> {{.FullName}}</span> <span class="header"><a href="{{.HomeLink}}">{{.Name}}</a> {{.FullName}}</span>
<div class="description"> <div class="description">
{{if .Location}} {{if .Location}}
<i class="octicon octicon-location"></i> {{.Location}} <i class="octicon octicon-location"></i> {{.Location}}
{{end}} {{end}}
{{if and $.ShowUserEmail .Email $.IsSigned (not .KeepEmailPrivate)}} {{if and $.ShowUserEmail .Email $.IsSigned (not .KeepEmailPrivate)}}
<i class="octicon octicon-mail"></i> <i class="octicon octicon-mail"></i>
<a href="mailto:{{.Email}}" rel="nofollow">{{.Email}}</a> <a href="mailto:{{.Email}}" rel="nofollow">{{.Email}}</a>
{{end}} {{end}}
<i class="octicon octicon-clock"></i> {{$.i18n.Tr "user.join_on"}} {{DateFmtShort .Created}} <i class="octicon octicon-clock"></i> {{$.i18n.Tr "user.join_on"}} {{DateFmtShort .Created}}
</div> </div>
</div> </div>
</div>
{{else}}
<div>{{$.i18n.Tr "explore.user_no_results"}}</div>
{{end}}
</div> </div>
{{else}}
{{template "base/paginate" .}} <div>{{$.i18n.Tr "explore.user_no_results"}}</div>
</div> {{end}}
</div> </div>
{{template "base/paginate" .}}
</div> </div>
</div> </div>
{{template "base/footer" .}} {{template "base/footer" .}}

Write Preview
Loading…
Cancel
Save