Commit 91cbab7b authored by Bryce Johnson's avatar Bryce Johnson Committed by Phil Hughes

Bulk update sidebar UI polish

parent c66db38d
...@@ -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());
} }
......
...@@ -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;
......
...@@ -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 {
......
...@@ -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 {
......
- 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"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment