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
Tatuya Kamada
gitlab-ce
Commits
6718f800
Commit
6718f800
authored
Oct 01, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix UI bug introduced in new project page
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
8e05ee36
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
42 additions
and
42 deletions
+42
-42
app/assets/stylesheets/pages/projects.scss
app/assets/stylesheets/pages/projects.scss
+41
-41
app/views/projects/show.html.haml
app/views/projects/show.html.haml
+1
-1
No files found.
app/assets/stylesheets/pages/projects.scss
View file @
6718f800
.alert_holder
{
.alert_holder
{
margin
:
-16px
;
margin
:
-16px
;
.alert-link
{
.alert-link
{
font-weight
:
normal
;
font-weight
:
normal
;
}
}
...
@@ -31,20 +31,20 @@
...
@@ -31,20 +31,20 @@
margin
:
-
$gl-padding
;
margin
:
-
$gl-padding
;
padding
:
$gl-padding
;
padding
:
$gl-padding
;
padding
:
44px
0
17px
0
;
padding
:
44px
0
17px
0
;
.project-identicon-holder
{
.project-identicon-holder
{
margin-bottom
:
16px
;
margin-bottom
:
16px
;
.avatar
,
.identicon
{
.avatar
,
.identicon
{
margin
:
0
auto
;
margin
:
0
auto
;
float
:
none
;
float
:
none
;
}
}
.identicon
{
.identicon
{
@include
border-radius
(
50%
);
@include
border-radius
(
50%
);
}
}
}
}
.project-home-dropdown
{
.project-home-dropdown
{
margin
:
11px
3px
0
;
margin
:
11px
3px
0
;
}
}
...
@@ -86,15 +86,15 @@
...
@@ -86,15 +86,15 @@
top
:
17px
;
top
:
17px
;
margin-bottom
:
44px
;
margin-bottom
:
44px
;
}
}
.project-repo-buttons
{
.project-repo-buttons
{
margin-top
:
12px
;
margin-top
:
12px
;
margin-bottom
:
0px
;
margin-bottom
:
0px
;
.btn
{
.btn
{
@include
bnt-project
;
@include
bnt-project
;
@include
btn-info
;
@include
btn-info
;
.count
{
.count
{
display
:
inline-block
;
display
:
inline-block
;
}
}
...
@@ -105,7 +105,7 @@
...
@@ -105,7 +105,7 @@
.split-one
{
.split-one
{
display
:
inline-table
;
display
:
inline-table
;
margin-right
:
12px
;
margin-right
:
12px
;
a
{
a
{
margin
:
-1px
!
important
;
margin
:
-1px
!
important
;
}
}
...
@@ -129,10 +129,10 @@
...
@@ -129,10 +129,10 @@
&
.git-protocols
{
&
.git-protocols
{
padding
:
0
;
padding
:
0
;
border
:
none
;
border
:
none
;
.input-group-btn
:last-child
>
.btn
{
.input-group-btn
:last-child
>
.btn
{
@include
border-radius-right
(
0
);
@include
border-radius-right
(
0
);
border-left
:
1px
solid
#c6cacf
;
border-left
:
1px
solid
#c6cacf
;
margin-left
:
-2px
!
important
;
margin-left
:
-2px
!
important
;
}
}
...
@@ -141,55 +141,55 @@
...
@@ -141,55 +141,55 @@
}
}
.projects-search-form
{
.projects-search-form
{
.input-group
.form-control
{
.input-group
.form-control
{
height
:
42px
;
height
:
42px
;
}
}
}
}
.input-group-btn
{
.input-group-btn
{
.btn
{
.btn
{
@include
bnt-project
;
@include
bnt-project
;
@include
btn-middle
;
@include
btn-middle
;
&
:hover
{
&
:hover
{
outline
:
none
;
outline
:
none
;
}
}
&
:focus
{
&
:focus
{
outline
:
none
;
outline
:
none
;
}
}
&
:active
{
&
:active
{
outline
:
none
;
outline
:
none
;
}
}
}
}
.active
{
.active
{
@include
box-shadow
(
inset
0
0
4px
rgba
(
0
,
0
,
0
,
0
.12
));
@include
box-shadow
(
inset
0
0
4px
rgba
(
0
,
0
,
0
,
0
.12
));
border
:
1px
solid
#c6cacf
!
important
;
border
:
1px
solid
#c6cacf
!
important
;
background-color
:
#e4e7ed
!
important
;
background-color
:
#e4e7ed
!
important
;
}
}
.btn-green
{
.btn-green
{
@include
btn-green
@include
btn-green
}
}
}
}
.split-repo-buttons
{
.split-repo-buttons
{
display
:
inline-table
;
display
:
inline-table
;
margin
:
0
12px
0
12px
;
margin
:
0
12px
0
12px
;
.btn
{
.btn
{
@include
bnt-project
;
@include
bnt-project
;
@include
btn-info
;
@include
btn-info
;
}
}
.dropdown-toggle
{
.dropdown-toggle
{
margin
:
-5px
;
margin
:
-5px
;
}
}
}
}
#notification-form
{
#notification-form
{
...
@@ -202,7 +202,7 @@
...
@@ -202,7 +202,7 @@
.open
>
.dropdown-new.btn
{
.open
>
.dropdown-new.btn
{
@include
box-shadow
(
inset
0
0
4px
rgba
(
0
,
0
,
0
,
0
.12
));
@include
box-shadow
(
inset
0
0
4px
rgba
(
0
,
0
,
0
,
0
.12
));
border
:
1px
solid
#c6cacf
!
important
;
border
:
1px
solid
#c6cacf
!
important
;
background-color
:
#e4e7ed
!
important
;
background-color
:
#e4e7ed
!
important
;
text-transform
:
uppercase
;
text-transform
:
uppercase
;
...
@@ -214,21 +214,21 @@
...
@@ -214,21 +214,21 @@
.dropdown-menu
{
.dropdown-menu
{
@include
box-shadow
(
rgba
(
76
,
86
,
103
,
0
.247059
)
0px
0px
1px
0px
,
rgba
(
31
,
37
,
50
,
0
.317647
)
0px
2px
18px
0px
);
@include
box-shadow
(
rgba
(
76
,
86
,
103
,
0
.247059
)
0px
0px
1px
0px
,
rgba
(
31
,
37
,
50
,
0
.317647
)
0px
2px
18px
0px
);
@include
border-radius
(
0px
);
@include
border-radius
(
0px
);
border
:
none
;
border
:
none
;
padding
:
16px
0
;
padding
:
16px
0
;
font-size
:
14px
;
font-size
:
14px
;
font-weight
:
100
;
font-weight
:
100
;
li
a
{
li
a
{
color
:
#5f697a
;
color
:
#5f697a
;
line-height
:
30px
;
line-height
:
30px
;
&
:hover
{
&
:hover
{
background-color
:
#3084bb
!
important
;
background-color
:
#3084bb
!
important
;
}
}
}
}
.fa-fw
{
.fa-fw
{
margin-right
:
8px
;
margin-right
:
8px
;
}
}
...
@@ -370,7 +370,7 @@ table.table.protected-branches-list tr.no-border {
...
@@ -370,7 +370,7 @@ table.table.protected-branches-list tr.no-border {
ul
.nav-pills
{
ul
.nav-pills
{
display
:inline-block
;
display
:inline-block
;
}
}
.nav-pills
li
{
.nav-pills
li
{
display
:inline
;
display
:inline
;
}
}
...
@@ -378,12 +378,12 @@ table.table.protected-branches-list tr.no-border {
...
@@ -378,12 +378,12 @@ table.table.protected-branches-list tr.no-border {
.nav
>
li
>
a
{
.nav
>
li
>
a
{
@include
btn-info
;
@include
btn-info
;
@include
bnt-project
;
@include
bnt-project
;
background-color
:
transparent
;
background-color
:
transparent
;
border
:
1px
solid
#f7f8fa
;
border
:
1px
solid
#f7f8fa
;
margin-left
:
12px
;
margin-left
:
12px
;
}
}
li
{
li
{
display
:inline
;
display
:inline
;
}
}
...
@@ -418,27 +418,27 @@ pre.light-well {
...
@@ -418,27 +418,27 @@ pre.light-well {
.git-empty
{
.git-empty
{
margin
:
0
7px
0
7px
;
margin
:
0
7px
0
7px
;
h5
{
h5
{
color
:
#5c5d5e
;
color
:
#5c5d5e
;
}
}
.light-well
{
.light-well
{
@include
border-radius
(
2px
);
@include
border-radius
(
2px
);
color
:
#5b6169
;
color
:
#5b6169
;
font-size
:
13px
;
font-size
:
13px
;
line-height
:
1
.6em
;
line-height
:
1
.6em
;
}
}
}
}
.pr
epend-top-20
{
.pr
oject-footer
{
margin-top
:
20px
;
margin-top
:
20px
;
.btn-remove
{
.btn-remove
{
@include
btn-middle
;
@include
btn-middle
;
@include
btn-remove
;
@include
btn-remove
;
float
:
left
!
important
;
float
:
left
!
important
;
}
}
}
}
...
@@ -446,7 +446,7 @@ pre.light-well {
...
@@ -446,7 +446,7 @@ pre.light-well {
/*
/*
* Projects list rendered on dashboard and user page
* Projects list rendered on dashboard and user page
*/
*/
.projects-list
{
.projects-list
{
@include
basic-list
;
@include
basic-list
;
...
...
app/views/projects/show.html.haml
View file @
6718f800
...
@@ -75,7 +75,7 @@
...
@@ -75,7 +75,7 @@
-
if
current_user
-
if
current_user
-
access
=
user_max_access_in_project
(
current_user
,
@project
)
-
access
=
user_max_access_in_project
(
current_user
,
@project
)
-
if
access
-
if
access
.prepend-top-20
.prepend-top-20
.project-footer
.gray-content-block.footer-block.center
.gray-content-block.footer-block.center
You have
#{
access
}
access to this project.
You have
#{
access
}
access to this project.
-
if
@project
.
project_member_by_id
(
current_user
)
-
if
@project
.
project_member_by_id
(
current_user
)
...
...
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