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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
91cbab7b
Commit
91cbab7b
authored
Jul 24, 2017
by
Bryce Johnson
Committed by
Phil Hughes
Jul 24, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bulk update sidebar UI polish
parent
c66db38d
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
28 additions
and
11 deletions
+28
-11
app/assets/javascripts/issuable_bulk_update_sidebar.js
app/assets/javascripts/issuable_bulk_update_sidebar.js
+13
-0
app/assets/stylesheets/framework/nav.scss
app/assets/stylesheets/framework/nav.scss
+0
-8
app/assets/stylesheets/framework/sidebar.scss
app/assets/stylesheets/framework/sidebar.scss
+9
-1
app/assets/stylesheets/new_sidebar.scss
app/assets/stylesheets/new_sidebar.scss
+4
-0
app/views/shared/issuable/_bulk_update_sidebar.html.haml
app/views/shared/issuable/_bulk_update_sidebar.html.haml
+2
-2
No files found.
app/assets/javascripts/issuable_bulk_update_sidebar.js
View file @
91cbab7b
...
@@ -86,10 +86,23 @@ export default class IssuableBulkUpdateSidebar {
...
@@ -86,10 +86,23 @@ export default class IssuableBulkUpdateSidebar {
this
.
toggleCheckboxDisplay
(
enable
);
this
.
toggleCheckboxDisplay
(
enable
);
if
(
enable
)
{
if
(
enable
)
{
this
.
initAffix
();
SidebarHeightManager
.
init
();
SidebarHeightManager
.
init
();
}
}
}
}
initAffix
()
{
if
(
!
this
.
$sidebar
.
hasClass
(
'
affix-top
'
))
{
const
offsetTop
=
$
(
'
.scrolling-tabs-container
'
).
outerHeight
()
+
$
(
'
.sub-nav-scroll
'
).
outerHeight
();
this
.
$sidebar
.
affix
({
offset
:
{
top
:
offsetTop
,
},
});
}
}
updateSelectedIssuableIds
()
{
updateSelectedIssuableIds
()
{
this
.
$issuableIdsInput
.
val
(
IssuableBulkUpdateSidebar
.
getCheckedIssueIds
());
this
.
$issuableIdsInput
.
val
(
IssuableBulkUpdateSidebar
.
getCheckedIssueIds
());
}
}
...
...
app/assets/stylesheets/framework/nav.scss
View file @
91cbab7b
...
@@ -190,14 +190,6 @@
...
@@ -190,14 +190,6 @@
display
:
none
;
display
:
none
;
}
}
.btn
,
.dropdown
,
.dropdown-toggle
,
input
,
form
{
height
:
35px
;
}
input
{
input
{
display
:
inline-block
;
display
:
inline-block
;
position
:
relative
;
position
:
relative
;
...
...
app/assets/stylesheets/framework/sidebar.scss
View file @
91cbab7b
...
@@ -92,7 +92,6 @@
...
@@ -92,7 +92,6 @@
@mixin
maintain-sidebar-dimensions
{
@mixin
maintain-sidebar-dimensions
{
display
:
block
;
display
:
block
;
width
:
$gutter-width
;
width
:
$gutter-width
;
padding
:
10px
0
;
}
}
.issues-bulk-update.right-sidebar
{
.issues-bulk-update.right-sidebar
{
...
@@ -104,6 +103,15 @@
...
@@ -104,6 +103,15 @@
&
.right-sidebar-expanded
{
&
.right-sidebar-expanded
{
@include
maintain-sidebar-dimensions
;
@include
maintain-sidebar-dimensions
;
width
:
$gutter-width
;
width
:
$gutter-width
;
.issuable-sidebar-header
{
// matches `.top-area .nav-controls` for issuable index pages
padding
:
11px
0
;
}
.block
:last-of-type
{
border
:
none
;
}
}
}
&
.right-sidebar-collapsed
{
&
.right-sidebar-collapsed
{
...
...
app/assets/stylesheets/new_sidebar.scss
View file @
91cbab7b
...
@@ -23,6 +23,10 @@ $new-sidebar-width: 220px;
...
@@ -23,6 +23,10 @@ $new-sidebar-width: 220px;
position
:
fixed
;
position
:
fixed
;
height
:
100%
;
height
:
100%
;
}
}
.issues-bulk-update.right-sidebar.right-sidebar-expanded
.issuable-sidebar-header
{
padding
:
10px
0
15px
;
}
}
}
.context-header
{
.context-header
{
...
...
app/views/shared/issuable/_bulk_update_sidebar.html.haml
View file @
91cbab7b
-
type
=
local_assigns
.
fetch
(
:type
)
-
type
=
local_assigns
.
fetch
(
:type
)
%aside
.issues-bulk-update.js-right-sidebar.right-sidebar
.affix-top
{
data:
{
"offset-top"
=>
"50"
,
"spy"
=>
"affix"
},
"aria-live"
=>
"polite"
}
%aside
.issues-bulk-update.js-right-sidebar.right-sidebar
{
"aria-live"
=>
"polite"
,
data:
{
'signed-in'
:
current_user
.
present?
}
}
.issuable-sidebar.hidden
.issuable-sidebar.hidden
=
form_tag
[
:bulk_update
,
@project
.
namespace
.
becomes
(
Namespace
),
@project
,
type
],
method: :post
,
class:
"bulk-update"
do
=
form_tag
[
:bulk_update
,
@project
.
namespace
.
becomes
(
Namespace
),
@project
,
type
],
method: :post
,
class:
"bulk-update"
do
.block
.block
.issuable-sidebar-header
.filter-item.inline.update-issues-btn.pull-left
.filter-item.inline.update-issues-btn.pull-left
=
button_tag
"Update all"
,
class:
"btn update-selected-issues btn-info"
,
disabled:
true
=
button_tag
"Update all"
,
class:
"btn update-selected-issues btn-info"
,
disabled:
true
=
button_tag
"Cancel"
,
class:
"btn btn-default js-bulk-update-menu-hide pull-right"
=
button_tag
"Cancel"
,
class:
"btn btn-default js-bulk-update-menu-hide pull-right"
...
...
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