-
-
Notifications
You must be signed in to change notification settings - Fork 5.9k
Cleaner UI for explore page (#1253) #1255
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.
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
Merged
Merged
Changes from 9 commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
76ab450
Take navbar out of column
geek1011 747f6d3
Add styles to navbar
geek1011 b3efe4a
Update index.css
geek1011 2be3199
Changed navbar classes
geek1011 d1b6b63
Update organizations.tmpl
geek1011 fc1b73e
Update repos.tmpl
geek1011 4ddb4d0
Update users.tmpl
geek1011 fc41e7c
Update index.css
geek1011 6dedb99
Update _explore.less
geek1011 888b30b
Remove unneeded !important from index.css
geek1011 ee6a477
Remove unneeded !important from _explore.less
geek1011 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,11 @@ | ||
| <div class="four wide column"> | ||
| <div class="ui vertical menu navbar"> | ||
| <div class="header item">{{.i18n.Tr "explore"}}</div> | ||
| <a class="{{if .PageIsExploreRepositories}}active{{end}} item" href="{{AppSubUrl}}/explore/repos"> | ||
| <span class="octicon octicon-repo"></span> {{.i18n.Tr "explore.repos"}} | ||
| </a> | ||
| <a class="{{if .PageIsExploreUsers}}active{{end}} item" href="{{AppSubUrl}}/explore/users"> | ||
| <span class="octicon octicon-person"></span> {{.i18n.Tr "explore.users"}} | ||
| </a> | ||
| <a class="{{if .PageIsExploreOrganizations}}active{{end}} item" href="{{AppSubUrl}}/explore/organizations"> | ||
| <span class="octicon octicon-organization"></span> {{.i18n.Tr "explore.organizations"}} | ||
| </a> | ||
| </div> | ||
| <div class="ui secondary pointing tabular top attached borderless menu navbar"> | ||
| <a class="{{if .PageIsExploreRepositories}}active{{end}} item" href="{{AppSubUrl}}/explore/repos"> | ||
| <span class="octicon octicon-repo"></span> {{.i18n.Tr "explore.repos"}} | ||
| </a> | ||
| <a class="{{if .PageIsExploreUsers}}active{{end}} item" href="{{AppSubUrl}}/explore/users"> | ||
| <span class="octicon octicon-person"></span> {{.i18n.Tr "explore.users"}} | ||
| </a> | ||
| <a class="{{if .PageIsExploreOrganizations}}active{{end}} item" href="{{AppSubUrl}}/explore/organizations"> | ||
| <span class="octicon octicon-organization"></span> {{.i18n.Tr "explore.organizations"}} | ||
| </a> | ||
| </div> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,37 +1,33 @@ | ||
| {{template "base/head" .}} | ||
| <div class="explore users"> | ||
| {{template "explore/navbar" .}} | ||
| <div class="ui container"> | ||
| <div class="ui grid"> | ||
| {{template "explore/navbar" .}} | ||
| <div class="twelve wide column content"> | ||
| {{template "explore/search" .}} | ||
| {{template "explore/search" .}} | ||
|
|
||
| <div class="ui user list"> | ||
| {{range .Users}} | ||
| <div class="item"> | ||
| <img class="ui avatar image" src="{{.RelAvatarLink}}"> | ||
| <div class="content"> | ||
| <span class="header"><a href="{{.HomeLink}}">{{.Name}}</a> {{.FullName}}</span> | ||
| <div class="description"> | ||
| {{if .Location}} | ||
| <i class="octicon octicon-location"></i> {{.Location}} | ||
| {{end}} | ||
| {{if and .Website}} | ||
| <i class="octicon octicon-link"></i> | ||
| <a href="{{.Website}}" rel="nofollow">{{.Website}}</a> | ||
| {{end}} | ||
| <i class="octicon octicon-clock"></i> {{$.i18n.Tr "user.join_on"}} {{DateFmtShort .Created}} | ||
| </div> | ||
| </div> | ||
| </div> | ||
| {{else}} | ||
| <div>{{$.i18n.Tr "explore.org_no_results"}}</div> | ||
| {{end}} | ||
| <div class="ui user list"> | ||
| {{range .Users}} | ||
| <div class="item"> | ||
| <img class="ui avatar image" src="{{.RelAvatarLink}}"> | ||
| <div class="content"> | ||
| <span class="header"><a href="{{.HomeLink}}">{{.Name}}</a> {{.FullName}}</span> | ||
| <div class="description"> | ||
| {{if .Location}} | ||
| <i class="octicon octicon-location"></i> {{.Location}} | ||
| {{end}} | ||
| {{if and .Website}} | ||
| <i class="octicon octicon-link"></i> | ||
| <a href="{{.Website}}" rel="nofollow">{{.Website}}</a> | ||
| {{end}} | ||
| <i class="octicon octicon-clock"></i> {{$.i18n.Tr "user.join_on"}} {{DateFmtShort .Created}} | ||
| </div> | ||
| </div> | ||
| </div> | ||
|
|
||
| {{template "base/paginate" .}} | ||
| </div> | ||
| {{else}} | ||
| <div>{{$.i18n.Tr "explore.org_no_results"}}</div> | ||
| {{end}} | ||
| </div> | ||
|
|
||
| {{template "base/paginate" .}} | ||
| </div> | ||
| </div> | ||
| {{template "base/footer" .}} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,10 @@ | ||
| {{template "base/head" .}} | ||
| <div class="explore repositories"> | ||
| {{template "explore/navbar" .}} | ||
| <div class="ui container"> | ||
| <div class="ui grid"> | ||
| {{template "explore/navbar" .}} | ||
| <div class="twelve wide column content"> | ||
| {{template "explore/search" .}} | ||
| {{template "explore/repo_list" .}} | ||
| {{template "base/paginate" .}} | ||
| </div> | ||
| </div> | ||
| {{template "explore/search" .}} | ||
| {{template "explore/repo_list" .}} | ||
| {{template "base/paginate" .}} | ||
| </div> | ||
| </div> | ||
| {{template "base/footer" .}} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,37 +1,33 @@ | ||
| {{template "base/head" .}} | ||
| <div class="explore users"> | ||
| {{template "explore/navbar" .}} | ||
| <div class="ui container"> | ||
| <div class="ui grid"> | ||
| {{template "explore/navbar" .}} | ||
| <div class="twelve wide column content"> | ||
| {{template "explore/search" .}} | ||
| {{template "explore/search" .}} | ||
|
|
||
| <div class="ui user list"> | ||
| {{range .Users}} | ||
| <div class="item"> | ||
| <img class="ui avatar image" src="{{.RelAvatarLink}}"> | ||
| <div class="content"> | ||
| <span class="header"><a href="{{.HomeLink}}">{{.Name}}</a> {{.FullName}}</span> | ||
| <div class="description"> | ||
| {{if .Location}} | ||
| <i class="octicon octicon-location"></i> {{.Location}} | ||
| {{end}} | ||
| {{if and $.ShowUserEmail .Email $.IsSigned (not .KeepEmailPrivate)}} | ||
| <i class="octicon octicon-mail"></i> | ||
| <a href="mailto:{{.Email}}" rel="nofollow">{{.Email}}</a> | ||
| {{end}} | ||
| <i class="octicon octicon-clock"></i> {{$.i18n.Tr "user.join_on"}} {{DateFmtShort .Created}} | ||
| </div> | ||
| </div> | ||
| </div> | ||
| {{else}} | ||
| <div>{{$.i18n.Tr "explore.user_no_results"}}</div> | ||
| {{end}} | ||
| <div class="ui user list"> | ||
| {{range .Users}} | ||
| <div class="item"> | ||
| <img class="ui avatar image" src="{{.RelAvatarLink}}"> | ||
| <div class="content"> | ||
| <span class="header"><a href="{{.HomeLink}}">{{.Name}}</a> {{.FullName}}</span> | ||
| <div class="description"> | ||
| {{if .Location}} | ||
| <i class="octicon octicon-location"></i> {{.Location}} | ||
| {{end}} | ||
| {{if and $.ShowUserEmail .Email $.IsSigned (not .KeepEmailPrivate)}} | ||
| <i class="octicon octicon-mail"></i> | ||
| <a href="mailto:{{.Email}}" rel="nofollow">{{.Email}}</a> | ||
| {{end}} | ||
| <i class="octicon octicon-clock"></i> {{$.i18n.Tr "user.join_on"}} {{DateFmtShort .Created}} | ||
| </div> | ||
| </div> | ||
| </div> | ||
|
|
||
| {{template "base/paginate" .}} | ||
| </div> | ||
| {{else}} | ||
| <div>{{$.i18n.Tr "explore.user_no_results"}}</div> | ||
| {{end}} | ||
| </div> | ||
|
|
||
| {{template "base/paginate" .}} | ||
| </div> | ||
| </div> | ||
| {{template "base/footer" .}} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please don't use important, just be more specific and you can avoid that.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done