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
Jérome Perrin
gitlab-ce
Commits
57ab639c
Commit
57ab639c
authored
Dec 31, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Dashboard css improvements
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
0392669c
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
49 additions
and
49 deletions
+49
-49
app/assets/stylesheets/common.scss
app/assets/stylesheets/common.scss
+6
-0
app/assets/stylesheets/sections/dashboard.scss
app/assets/stylesheets/sections/dashboard.scss
+0
-7
app/views/dashboard/projects.html.haml
app/views/dashboard/projects.html.haml
+2
-2
app/views/dashboard/show.html.haml
app/views/dashboard/show.html.haml
+2
-2
app/views/shared/_filter.html.haml
app/views/shared/_filter.html.haml
+38
-37
app/views/shared/_no_ssh.html.haml
app/views/shared/_no_ssh.html.haml
+1
-1
No files found.
app/assets/stylesheets/common.scss
View file @
57ab639c
...
@@ -395,3 +395,9 @@ table {
...
@@ -395,3 +395,9 @@ table {
font-weight
:
bolder
;
font-weight
:
bolder
;
}
}
}
}
.side-filters
{
fieldset
{
margin-bottom
:
15px
;
}
}
app/assets/stylesheets/sections/dashboard.scss
View file @
57ab639c
.dashboard
{
.dashboard
{
@extend
.row
;
.activities
{
}
.side
{
.side
{
@extend
.pull-right
;
.ui-box
{
.ui-box
{
margin
:
0px
;
margin
:
0px
;
box-shadow
:
none
;
box-shadow
:
none
;
...
@@ -108,7 +102,6 @@
...
@@ -108,7 +102,6 @@
padding
:
8px
12px
;
padding
:
8px
12px
;
border-radius
:
50px
;
border-radius
:
50px
;
background
:
#f5f5f5
;
background
:
#f5f5f5
;
width
:
16px
;
text-align
:
center
;
text-align
:
center
;
i
{
i
{
...
...
app/views/dashboard/projects.html.haml
View file @
57ab639c
...
@@ -25,7 +25,7 @@
...
@@ -25,7 +25,7 @@
All projects you have access to are listed here. Public projects are not included here unless you are a member
All projects you have access to are listed here. Public projects are not included here unless you are a member
%hr
%hr
.row
.row
.col-md-3
.col-md-3
.col-sm-4
%ul
.nav.nav-pills.nav-stacked
%ul
.nav.nav-pills.nav-stacked
=
nav_tab
:scope
,
nil
do
=
nav_tab
:scope
,
nil
do
=
link_to
projects_dashboard_filter_path
(
scope:
nil
)
do
=
link_to
projects_dashboard_filter_path
(
scope:
nil
)
do
...
@@ -81,7 +81,7 @@
...
@@ -81,7 +81,7 @@
%i
.icon-tag
%i
.icon-tag
=
label
.
name
=
label
.
name
.col-md-9
.col-md-9
.col-sm-8
%ul
.bordered-list.my-projects.top-list
%ul
.bordered-list.my-projects.top-list
-
@projects
.
each
do
|
project
|
-
@projects
.
each
do
|
project
|
%li
.my-project-row
%li
.my-project-row
...
...
app/views/dashboard/show.html.haml
View file @
57ab639c
-
if
@has_authorized_projects
-
if
@has_authorized_projects
.dashboard
.dashboard
.row
.activities.col-md-8
.activities.col-md-8
=
render
'activities'
=
render
'activities'
.side.col-md-4
.side.col-md-4
.hidden-xs.hidden-sm
=
render
'sidebar'
=
render
'sidebar'
-
else
-
else
...
...
app/views/shared/_filter.html.haml
View file @
57ab639c
=
form_tag
filter_path
(
entity
),
method:
'get'
do
.side-filters
%fieldset
.scope-filter
=
form_tag
filter_path
(
entity
),
method:
'get'
do
%ul
.nav.nav-pills.nav-stacked
%fieldset
.scope-filter
%li
{
class:
(
"active"
if
params
[
:scope
].
blank?
)}
%ul
.nav.nav-pills.nav-stacked
=
link_to
filter_path
(
entity
,
scope:
nil
)
do
%li
{
class:
(
"active"
if
params
[
:scope
].
blank?
)}
Assigned to me
=
link_to
filter_path
(
entity
,
scope:
nil
)
do
%li
{
class:
(
"active"
if
params
[
:scope
]
==
'authored'
)}
Assigned to me
=
link_to
filter_path
(
entity
,
scope:
'authored'
)
do
%li
{
class:
(
"active"
if
params
[
:scope
]
==
'authored'
)}
Created by me
=
link_to
filter_path
(
entity
,
scope:
'authored'
)
do
%li
{
class:
(
"active"
if
params
[
:scope
]
==
'all'
)}
Created by me
=
link_to
filter_path
(
entity
,
scope:
'all'
)
do
%li
{
class:
(
"active"
if
params
[
:scope
]
==
'all'
)}
All
=
link_to
filter_path
(
entity
,
scope:
'all'
)
do
All
%fieldset
.status-filter
%fieldset
.status-filter
%ul
.nav.nav-pills.nav-stacked
%ul
.nav.nav-pills.nav-stacked
%li
{
class:
(
"active"
if
params
[
:status
].
blank?
)}
%li
{
class:
(
"active"
if
params
[
:status
].
blank?
)}
=
link_to
filter_path
(
entity
,
status:
nil
)
do
=
link_to
filter_path
(
entity
,
status:
nil
)
do
Open
Open
%li
{
class:
(
"active"
if
params
[
:status
]
==
'closed'
)}
%li
{
class:
(
"active"
if
params
[
:status
]
==
'closed'
)}
=
link_to
filter_path
(
entity
,
status:
'closed'
)
do
=
link_to
filter_path
(
entity
,
status:
'closed'
)
do
Closed
Closed
%li
{
class:
(
"active"
if
params
[
:status
]
==
'all'
)}
%li
{
class:
(
"active"
if
params
[
:status
]
==
'all'
)}
=
link_to
filter_path
(
entity
,
status:
'all'
)
do
=
link_to
filter_path
(
entity
,
status:
'all'
)
do
All
All
%fieldset
%fieldset
.hidden-xs.hidden-sm
%legend
Projects
%legend
Projects
%ul
.nav.nav-pills.nav-pills-small.nav-stacked
%ul
.nav.nav-pills.nav-pills-small.nav-stacked
-
@projects
.
each
do
|
project
|
-
@projects
.
each
do
|
project
|
-
unless
entities_per_project
(
project
,
entity
).
zero?
-
unless
entities_per_project
(
project
,
entity
).
zero?
%li
{
class:
(
"active"
if
params
[
:project_id
]
==
project
.
id
.
to_s
)}
%li
{
class:
(
"active"
if
params
[
:project_id
]
==
project
.
id
.
to_s
)}
=
link_to
filter_path
(
entity
,
project_id:
project
.
id
)
do
=
link_to
filter_path
(
entity
,
project_id:
project
.
id
)
do
=
project
.
name_with_namespace
=
project
.
name_with_namespace
%small
.pull-right
=
entities_per_project
(
project
,
entity
)
%small
.pull-right
=
entities_per_project
(
project
,
entity
)
%fieldset
%fieldset
-
if
params
[
:status
].
present?
||
params
[
:project_id
].
present?
-
if
params
[
:status
].
present?
||
params
[
:project_id
].
present?
=
link_to
filter_path
(
entity
,
status:
nil
,
project_id:
nil
),
class:
'pull-right cgray'
do
=
link_to
filter_path
(
entity
,
status:
nil
,
project_id:
nil
),
class:
'pull-right cgray'
do
%i
.icon-remove
%i
.icon-remove
%strong
Clear filter
%strong
Clear filter
app/views/shared/_no_ssh.html.haml
View file @
57ab639c
-
if
cookies
[
:hide_no_ssh_message
].
blank?
&&
current_user
.
require_ssh_key?
&&
!
current_user
.
gl
-
hide_no_ssh_key
-
if
cookies
[
:hide_no_ssh_message
].
blank?
&&
current_user
.
require_ssh_key?
&&
!
current_user
.
hide_no_ssh_key
.no-ssh-key-message
.no-ssh-key-message
.container
.container
You won't be able to pull or push project code via SSH until you
#{
link_to
'add an SSH key'
,
new_profile_key_path
}
to your profile
You won't be able to pull or push project code via SSH until you
#{
link_to
'add an SSH key'
,
new_profile_key_path
}
to your profile
...
...
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