Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
1a0a687f
Commit
1a0a687f
authored
Mar 03, 2016
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improve UI for explore projects page
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
617bb109
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
42 additions
and
39 deletions
+42
-39
app/assets/stylesheets/framework/nav.scss
app/assets/stylesheets/framework/nav.scss
+4
-0
app/views/explore/projects/_filter.html.haml
app/views/explore/projects/_filter.html.haml
+36
-37
app/views/explore/projects/index.html.haml
app/views/explore/projects/index.html.haml
+2
-2
No files found.
app/assets/stylesheets/framework/nav.scss
View file @
1a0a687f
...
@@ -79,6 +79,10 @@
...
@@ -79,6 +79,10 @@
>
.dropdown
{
>
.dropdown
{
margin-right
:
$gl-padding-top
;
margin-right
:
$gl-padding-top
;
display
:
inline-block
;
display
:
inline-block
;
&
:last-child
{
margin-right
:
0
;
}
}
}
>
.btn
{
>
.btn
{
...
...
app/views/explore/projects/_filter.html.haml
View file @
1a0a687f
.pull-right.hidden-sm.hidden-xs
-
if
current_user
-
if
current_user
.dropdown
.dropdown.inline.append-right-10
%a
.dropdown-toggle.btn
{
href:
'#'
,
"data-toggle"
=>
"dropdown"
}
%a
.dropdown-toggle.btn
{
href:
'#'
,
"data-toggle"
=>
"dropdown"
}
%i
.fa.fa-globe
%i
.fa.fa-globe
%span
.light
Visibility:
%span
.light
Visibility:
-
if
params
[
:visibility_level
].
present?
-
if
params
[
:visibility_level
].
present?
=
visibility_level_label
(
params
[
:visibility_level
].
to_i
)
=
visibility_level_label
(
params
[
:visibility_level
].
to_i
)
-
else
-
else
Any
%b
.caret
%ul
.dropdown-menu
%li
=
link_to
explore_projects_filter_path
(
visibility_level:
nil
)
do
Any
Any
%b
.caret
-
Gitlab
::
VisibilityLevel
.
values
.
each
do
|
level
|
%ul
.dropdown-menu
%li
{
class:
(
level
.
to_s
==
params
[
:visibility_level
])
?
'active'
:
'light'
}
%li
=
link_to
explore_projects_filter_path
(
visibility_level:
level
)
do
=
link_to
explore_projects_filter_path
(
visibility_level:
nil
)
do
=
visibility_level_icon
(
level
)
Any
=
visibility_level_label
(
level
)
-
Gitlab
::
VisibilityLevel
.
values
.
each
do
|
level
|
%li
{
class:
(
level
.
to_s
==
params
[
:visibility_level
])
?
'active'
:
'light'
}
=
link_to
explore_projects_filter_path
(
visibility_level:
level
)
do
=
visibility_level_icon
(
level
)
=
visibility_level_label
(
level
)
-
if
@tags
.
present?
-
if
@tags
.
present?
.dropdown.inline.append-right-10
.dropdown
%a
.dropdown-toggle.btn
{
href:
'#'
,
"data-toggle"
=>
"dropdown"
}
%a
.dropdown-toggle.btn
{
href:
'#'
,
"data-toggle"
=>
"dropdown"
}
%i
.fa.fa-tags
%i
.fa.fa-tags
%span
.light
Tags:
%span
.light
Tags:
-
if
params
[
:tag
].
present?
-
if
params
[
:tag
].
present?
=
params
[
:tag
]
=
params
[
:tag
]
-
else
-
else
Any
%b
.caret
%ul
.dropdown-menu
%li
=
link_to
explore_projects_filter_path
(
tag:
nil
)
do
Any
Any
%b
.caret
%ul
.dropdown-menu
%li
=
link_to
explore_projects_filter_path
(
tag:
nil
)
do
Any
-
@tags
.
each
do
|
tag
|
-
@tags
.
each
do
|
tag
|
%li
{
class:
(
tag
.
name
==
params
[
:tag
])
?
'active'
:
'light'
}
%li
{
class:
(
tag
.
name
==
params
[
:tag
])
?
'active'
:
'light'
}
=
link_to
explore_projects_filter_path
(
tag:
tag
.
name
)
do
=
link_to
explore_projects_filter_path
(
tag:
tag
.
name
)
do
%i
.fa.fa-tag
%i
.fa.fa-tag
=
tag
.
name
=
tag
.
name
app/views/explore/projects/index.html.haml
View file @
1a0a687f
...
@@ -9,7 +9,7 @@
...
@@ -9,7 +9,7 @@
.top-area
.top-area
=
render
'explore/projects/nav'
=
render
'explore/projects/nav'
.gray-content-block.second-block.clearfix
.nav-controls
=
render
'filter'
=
render
'filter'
=
render
'projects'
,
projects:
@projects
=
render
'projects'
,
projects:
@projects
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment