BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
c11e4314
Unverified
Commit
c11e4314
authored
Aug 25, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make some visual improvements to dashboard page after we moved activity
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
8f68c387
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
46 additions
and
44 deletions
+46
-44
projects_list.js.coffee
app/assets/javascripts/projects_list.js.coffee
+1
-1
dashboard.scss
app/assets/stylesheets/pages/dashboard.scss
+1
-37
projects.scss
app/assets/stylesheets/pages/projects.scss
+31
-0
_projects.html.haml
app/views/dashboard/_projects.html.haml
+6
-3
show.html.haml
app/views/dashboard/show.html.haml
+1
-1
_projects.html.haml
app/views/groups/_projects.html.haml
+1
-1
_project.html.haml
app/views/shared/_project.html.haml
+5
-1
No files found.
app/assets/javascripts/projects_list.js.coffee
View file @
c11e4314
...
...
@@ -8,7 +8,7 @@ class @ProjectsList
$
(
".projects-list-filter"
).
keyup
->
terms
=
$
(
this
).
val
()
uiBox
=
$
(
this
).
closest
(
'.p
anel
'
)
uiBox
=
$
(
this
).
closest
(
'.p
rojects-list-holder
'
)
if
terms
==
""
||
terms
==
undefined
uiBox
.
find
(
".projects-list li"
).
show
()
else
...
...
app/assets/stylesheets/pages/dashboard.scss
View file @
c11e4314
...
...
@@ -23,41 +23,6 @@
}
}
.project-row
,
.group-row
{
padding
:
0
!
important
;
font-size
:
14px
;
line-height
:
24px
;
a
{
display
:
block
;
padding
:
8px
15px
;
}
.project-name
,
.group-name
{
font-weight
:
500
;
}
.arrow
{
float
:
right
;
margin
:
0
;
font-size
:
20px
;
}
.last-activity
{
float
:
right
;
font-size
:
12px
;
color
:
#AAA
;
display
:
block
;
.date
{
color
:
#777
;
}
}
}
.project-description
{
overflow
:
hidden
;
}
.project-access-icon
{
margin-left
:
10px
;
float
:
left
;
...
...
@@ -73,10 +38,9 @@
float
:
left
;
.avatar
{
margin-top
:
-8px
;
margin-left
:
-15px
;
@include
border-radius
(
0px
);
}
.identicon
{
line-height
:
40px
;
}
...
...
app/assets/stylesheets/pages/projects.scss
View file @
c11e4314
...
...
@@ -316,3 +316,34 @@ table.table.protected-branches-list tr.no-border {
pre
.light-well
{
border-color
:
#f1f1f1
;
}
.projects-search-form
{
max-width
:
600px
;
margin
:
0
auto
;
margin-bottom
:
20px
;
input
{
border-color
:
#BBB
;
}
}
.project-row
{
.project-full-name
{
font-weight
:
bold
;
font-size
:
15px
;
}
.project-description
{
color
:
#888
;
font-size
:
13px
;
p
{
margin-bottom
:
0
;
color
:
#888
;
}
}
}
.my-projects
.project-row
{
padding
:
10px
0
;
}
app/views/dashboard/_projects.html.haml
View file @
c11e4314
.p
anel.panel-default
.p
anel-heading.clearfix
.p
rojects-list-holder
.p
rojects-search-form
.input-group
=
search_field_tag
:filter_projects
,
nil
,
placeholder:
'Filter by name'
,
class:
'projects-list-filter form-control'
-
if
current_user
.
can_create_project?
...
...
@@ -7,4 +7,7 @@
=
link_to
new_project_path
,
class:
'btn btn-success'
do
New project
=
render
'shared/projects_list'
,
projects:
@projects
,
projects_limit:
20
%ul
.projects-list.bordered-list.my-projects
-
@projects
.
each
do
|
project
|
%li
.project-row
=
render
partial:
'shared/project'
,
locals:
{
project:
project
,
avatar:
true
,
stars:
true
}
app/views/dashboard/show.html.haml
View file @
c11e4314
...
...
@@ -5,6 +5,6 @@
=
render
'dashboard/projects_head'
-
if
@projects
.
any?
=
render
'
sidebar
'
=
render
'
projects
'
-
else
=
render
"zero_authorized_projects"
app/views/groups/_projects.html.haml
View file @
c11e4314
.panel.panel-default
.panel.panel-default
.projects-list-holder
.panel-heading.clearfix
.input-group
=
search_field_tag
:filter_projects
,
nil
,
placeholder:
'Filter by name'
,
class:
'projects-list-filter form-control'
...
...
app/views/shared/_project.html.haml
View file @
c11e4314
...
...
@@ -3,7 +3,7 @@
-
if
avatar
.dash-project-avatar
=
project_icon
(
project
,
alt:
''
,
class:
'avatar project-avatar s40'
)
%span
.str-truncated
%span
.str-truncated
.project-full-name
%span
.namespace-name
-
if
project
.
namespace
=
project
.
namespace
.
human_name
...
...
@@ -14,3 +14,7 @@
%span
.pull-right.light
%i
.fa.fa-star
=
project
.
star_count
-
if
project
.
description
.
present?
.project-description
.str-truncated
=
markdown
(
project
.
description
,
pipeline: :description
)
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