Skip to content

INT-412 kill broken sidebar-controls panel #85

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 16, 2015
Merged

INT-412 kill broken sidebar-controls panel #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/sidebar/index.jade
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,3 @@ div
div.scout-logo
div(data-hook='collection-filter-subview')
div(data-hook='collection-list-subview')
div(data-hook='sidebar-control-subview')
13 changes: 0 additions & 13 deletions src/sidebar/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ var _ = require('lodash');
var mousetrap = require('mousetrap');
var CollectionFilterView = require('./collection-filter');
var CollectionListView = require('./collection-list');
var SidebarControlsView = require('./sidebar-controls');
var app = require('ampersand-app');

function fast_filter_collection(collection, pattern) {
Expand Down Expand Up @@ -60,22 +59,10 @@ var SidebarView = View.extend({
});
return view;
}
},
sidebar_control: {
hook: 'sidebar-control-subview',
prepareView: function(el) {
return new SidebarControlsView({
el: el
});
}
}
},
filterCollections: function(pattern) {
_.defer(fast_filter_collection, this.collection, pattern);
},
filterFields: function(pattern) {
var collection = app.schema.fields;
_.defer(fast_filter_collection, collection, pattern);
}
});

Expand Down
4 changes: 0 additions & 4 deletions src/sidebar/sidebar-controls.jade
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions src/sidebar/sidebar-controls.js
View file
Open in desktop

This file was deleted.

12 changes: 1 addition & 11 deletions styles/sidebar.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
line-height: 24px;
position: absolute;
top: 128px;
bottom: 60px;
bottom: 0px;
overflow-y: auto;
width: 100%;
z-index: -1;
Expand Down Expand Up @@ -111,16 +111,6 @@
}
}
}
.sidebar-controls {
position: absolute;
width: @sidebar-width;
bottom: 0;
height: 60px;

.list-filter {
box-shadow: 0 -2px 0 rgba(0,0,0,0.2);
}
}
}

.sidebar {
Expand Down