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
3b0cf49f
Commit
3b0cf49f
authored
May 05, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix project description and avatar alignment
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
2a1be883
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
25 additions
and
70 deletions
+25
-70
app/assets/stylesheets/pages/projects.scss
app/assets/stylesheets/pages/projects.scss
+20
-64
app/views/layouts/_head_panel.html.haml
app/views/layouts/_head_panel.html.haml
+2
-1
app/views/projects/_home_panel.html.haml
app/views/projects/_home_panel.html.haml
+3
-4
app/views/projects/show.html.haml
app/views/projects/show.html.haml
+0
-1
No files found.
app/assets/stylesheets/pages/projects.scss
View file @
3b0cf49f
...
@@ -17,31 +17,25 @@
...
@@ -17,31 +17,25 @@
.project-home-panel
{
.project-home-panel
{
margin-bottom
:
20px
;
margin-bottom
:
20px
;
position
:
relative
;
position
:
relative
;
padding-left
:
85px
;
padding-left
:
65px
;
border-bottom
:
1px
solid
#DDD
;
&
.empty-project
{
padding-bottom
:
10px
;
border-bottom
:
0px
;
padding-top
:
5px
;
padding-bottom
:
15px
;
min-height
:
50px
;
margin-bottom
:
0px
;
}
.project-identicon-holder
{
.project-identicon-holder
{
position
:
absolute
;
position
:
absolute
;
left
:
0
;
left
:
0
;
top
:
-
2
0px
;
top
:
-
1
0px
;
.avatar
{
.avatar
{
width
:
6
0px
;
width
:
5
0px
;
height
:
6
0px
;
height
:
5
0px
;
}
}
.identicon
{
.identicon
{
font-size
:
28px
;
font-size
:
26px
;
line-height
:
60px
;
line-height
:
50px
;
}
.avatar
,
.identicon
{
box-shadow
:
0
1px
2px
#ddd
;
}
}
}
}
...
@@ -199,50 +193,22 @@ ul.nav.nav-projects-tabs {
...
@@ -199,50 +193,22 @@ ul.nav.nav-projects-tabs {
}
}
.project-side
{
.project-side
{
.btn-block
{
background-image
:
none
;
.btn
,
&
.btn
{
white-space
:
normal
;
text-align
:
left
;
padding
:
10px
15px
;
&
.dropdown-toggle
{
text-align
:
center
;
}
&
:hover
{
background-color
:
#eee
;
border-color
:
#DDD
;
}
}
.count
{
float
:
right
;
font-weight
:
500
;
text-shadow
:
0
1px
#FFF
;
}
&
.btn-group-justified
{
.btn
{
width
:
100%
;
}
.dropdown-toggle
{
width
:
30px
;
padding
:
10px
;
}
ul
{
width
:
100%
;
}
}
}
.project-fork-icon
{
.project-fork-icon
{
float
:
left
;
float
:
left
;
font-size
:
26px
;
font-size
:
26px
;
margin-right
:
10px
;
margin-right
:
10px
;
line-height
:
1
.5
;
line-height
:
1
.5
;
}
}
.well
{
h4
{
font-weight
:
normal
;
}
.nav-pills
a
{
padding
:
10px
;
}
}
}
}
.transfer-project
.select2-container
{
.transfer-project
.select2-container
{
...
@@ -312,13 +278,3 @@ table.table.protected-branches-list tr.no-border {
...
@@ -312,13 +278,3 @@ table.table.protected-branches-list tr.no-border {
float
:
left
;
float
:
left
;
margin-right
:
10px
;
margin-right
:
10px
;
}
}
.project-home-dropdown
{
margin-top
:
8px
;
a
{
padding
:
4px
10px
;
color
:
#888
;
border-color
:
#ddd
;
}
}
app/views/layouts/_head_panel.html.haml
View file @
3b0cf49f
...
@@ -4,7 +4,8 @@
...
@@ -4,7 +4,8 @@
=
link_to
root_path
,
class:
'home'
,
title:
'Dashboard'
,
id:
'js-shortcuts-home'
,
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
}
do
=
link_to
root_path
,
class:
'home'
,
title:
'Dashboard'
,
id:
'js-shortcuts-home'
,
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
}
do
=
brand_header_logo
=
brand_header_logo
%h3
GitLab
%h3
GitLab
%h1
.title
=
title
%h1
.title
=
title
%button
.navbar-toggle
{
type:
'button'
,
data:
{
target:
'.navbar-collapse'
,
toggle:
'collapse'
}}
%button
.navbar-toggle
{
type:
'button'
,
data:
{
target:
'.navbar-collapse'
,
toggle:
'collapse'
}}
%span
.sr-only
Toggle navigation
%span
.sr-only
Toggle navigation
...
...
app/views/projects/_home_panel.html.haml
View file @
3b0cf49f
-
empty_repo
=
@project
.
empty_repo?
-
empty_repo
=
@project
.
empty_repo?
.project-home-panel
{
:class
=>
(
"empty-project"
if
empty_repo
)}
.project-home-panel
.clearfix
{
:class
=>
(
"empty-project"
if
empty_repo
)}
.project-identicon-holder
.project-identicon-holder
=
project_icon
(
@project
,
alt:
''
,
class:
'avatar project-avatar'
)
=
project_icon
(
@project
,
alt:
''
,
class:
'avatar project-avatar'
)
.project-home-row.project-home-row-top
.project-home-row.project-home-row-top
...
@@ -9,7 +9,7 @@
...
@@ -9,7 +9,7 @@
-
if
can?
(
current_user
,
:admin_project
,
@project
)
-
if
can?
(
current_user
,
:admin_project
,
@project
)
–
–
=
link_to
'Edit'
,
edit_namespace_project_path
=
link_to
'Edit'
,
edit_namespace_project_path
-
elsif
!
@project
.
empty_repo?
&&
@repository
.
readme
-
elsif
!
empty_repo
&&
@repository
.
readme
-
readme
=
@repository
.
readme
-
readme
=
@repository
.
readme
–
–
=
link_to
namespace_project_blob_path
(
@project
.
namespace
,
@project
,
tree_join
(
@repository
.
root_ref
,
readme
.
name
))
do
=
link_to
namespace_project_blob_path
(
@project
.
namespace
,
@project
,
tree_join
(
@repository
.
root_ref
,
readme
.
name
))
do
...
@@ -26,7 +26,7 @@
...
@@ -26,7 +26,7 @@
Star
Star
%span
.count
%span
.count
=
@project
.
star_count
=
@project
.
star_count
-
unless
@project
.
empty_repo?
-
unless
empty_repo
-
if
current_user
&&
can?
(
current_user
,
:fork_project
,
@project
)
&&
@project
.
namespace
!=
current_user
.
namespace
-
if
current_user
&&
can?
(
current_user
,
:fork_project
,
@project
)
&&
@project
.
namespace
!=
current_user
.
namespace
.inline.fork-buttons.prepend-left-10
.inline.fork-buttons.prepend-left-10
-
if
current_user
.
already_forked?
(
@project
)
&&
current_user
.
manageable_namespaces
.
size
<
2
-
if
current_user
.
already_forked?
(
@project
)
&&
current_user
.
manageable_namespaces
.
size
<
2
...
@@ -35,4 +35,3 @@
...
@@ -35,4 +35,3 @@
-
else
-
else
=
link_to
new_namespace_project_fork_path
(
@project
.
namespace
,
@project
),
title:
"Fork project"
,
class:
'btn btn-sm btn-default'
do
=
link_to
new_namespace_project_fork_path
(
@project
.
namespace
,
@project
),
title:
"Fork project"
,
class:
'btn btn-sm btn-default'
do
=
link_to_toggle_fork
=
link_to_toggle_fork
%hr
app/views/projects/show.html.haml
View file @
3b0cf49f
...
@@ -7,7 +7,6 @@
...
@@ -7,7 +7,6 @@
=
render
'shared/no_password'
=
render
'shared/no_password'
=
render
"home_panel"
=
render
"home_panel"
=
render
'shared/show_aside'
=
render
'shared/show_aside'
.row
.row
...
...
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