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
b4ea6ad1
Commit
b4ea6ad1
authored
Dec 11, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Few UI improvements to new sidebar implementation
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
617ba013
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
8 deletions
+13
-8
issuable_context.js.coffee
app/assets/javascripts/issuable_context.js.coffee
+1
-1
issuable.scss
app/assets/stylesheets/pages/issuable.scss
+6
-1
_sidebar.html.haml
app/views/shared/issuable/_sidebar.html.haml
+6
-6
No files found.
app/assets/javascripts/issuable_context.js.coffee
View file @
b4ea6ad1
...
...
@@ -18,7 +18,7 @@ class @IssuableContext
$
(
'.issuable-affix'
).
affix
offset
:
top
:
->
@
top
=
(
$
(
'.issuable-affix'
).
offset
().
top
-
7
0
)
@
top
=
(
$
(
'.issuable-affix'
).
offset
().
top
-
6
0
)
bottom
:
->
@
bottom
=
$
(
'.footer'
).
outerHeight
(
true
)
...
...
app/assets/stylesheets/pages/issuable.scss
View file @
b4ea6ad1
...
...
@@ -18,7 +18,7 @@
&
.affix
{
position
:
fixed
;
top
:
7
0px
;
top
:
6
0px
;
margin-right
:
35px
;
}
}
...
...
@@ -129,6 +129,11 @@
.btn-clipboard
{
color
:
$gl-gray
;
}
.participants
.avatar
{
margin-top
:
6px
;
margin-right
:
2px
;
}
}
.issuable-title
{
...
...
app/views/shared/issuable/_sidebar.html.haml
View file @
b4ea6ad1
...
...
@@ -4,14 +4,14 @@
.title
Cross-project reference
.cross-project-reference
%span
#cross-project-reference
.has_tooltip
{
title:
'Cross-project reference'
}
%span
#cross-project-reference
=
cross_project_reference
(
@project
,
issuable
)
=
clipboard_button
(
clipboard_target:
'span#cross-project-reference'
)
.block.assignee
.title
%label
Assignee
:
Assignee
-
if
can?
(
current_user
,
:"admin_
#{
issuable
.
to_ability_name
}
"
,
@project
)
.pull-right
=
link_to
'Edit'
,
'#'
,
class:
'edit-link'
...
...
@@ -19,7 +19,7 @@
-
if
issuable
.
assignee
%strong
=
link_to_member
(
@project
,
issuable
.
assignee
,
size:
24
)
-
else
None
.light
None
.selectbox
=
users_select_tag
(
"
#{
issuable
.
class
.
table_name
.
singularize
}
[assignee_id]"
,
placeholder:
'Select assignee'
,
class:
'custom-form-control js-select2 js-assignee'
,
selected:
issuable
.
assignee_id
,
project:
@target_project
,
null_user:
true
,
current_user:
true
,
first_user:
true
)
...
...
@@ -27,7 +27,7 @@
.block.milestone
.title
%label
Milestone
:
Milestone
-
if
can?
(
current_user
,
:"admin_
#{
issuable
.
to_ability_name
}
"
,
@project
)
.pull-right
=
link_to
'Edit'
,
'#'
,
class:
'edit-link'
...
...
@@ -39,7 +39,7 @@
=
icon
(
'clock-o'
)
=
issuable
.
milestone
.
title
-
else
None
.light
None
.selectbox
=
f
.
select
(
:milestone_id
,
milestone_options
(
issuable
),
{
include_blank:
true
},
{
class:
'select2 select2-compact js-select2 js-milestone'
,
data:
{
placeholder:
'Select milestone'
}})
=
hidden_field_tag
:issuable_context
...
...
@@ -57,7 +57,7 @@
-
issuable
.
labels
.
each
do
|
label
|
=
link_to_label
(
label
)
-
else
None
.light
None
.selectbox
=
f
.
collection_select
:label_ids
,
issuable
.
project
.
labels
.
all
,
:id
,
:name
,
{
selected:
issuable
.
label_ids
},
multiple:
true
,
class:
'select2 js-select2'
,
data:
{
placeholder:
"Select labels"
}
...
...
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