diff --git a/src/sidebar/index.jade b/src/sidebar/index.jade index 889792f5617..ee5074b4ad1 100644 --- a/src/sidebar/index.jade +++ b/src/sidebar/index.jade @@ -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') diff --git a/src/sidebar/index.js b/src/sidebar/index.js index 63e81e8f069..bd07f7ad84f 100644 --- a/src/sidebar/index.js +++ b/src/sidebar/index.js @@ -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) { @@ -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); } }); diff --git a/src/sidebar/sidebar-controls.jade b/src/sidebar/sidebar-controls.jade deleted file mode 100644 index 9f0afe37fec..00000000000 --- a/src/sidebar/sidebar-controls.jade +++ /dev/null @@ -1,4 +0,0 @@ -.sidebar-controls - .list-filter - i.search.octicon-search - input(type='search', placeholder='filter fields', data-hook='search') diff --git a/src/sidebar/sidebar-controls.js b/src/sidebar/sidebar-controls.js deleted file mode 100644 index 6b90b923c42..00000000000 --- a/src/sidebar/sidebar-controls.js +++ /dev/null @@ -1,9 +0,0 @@ -var CollectionFilterView = require('./collection-filter'); -var SidebarControlsView = CollectionFilterView.extend({ - template: require('./sidebar-controls.jade'), - applyFilter: function() { - this.parent.filterFields(this.search); - } -}); - -module.exports = SidebarControlsView; diff --git a/styles/sidebar.less b/styles/sidebar.less index 66243eded93..0f145ec819d 100644 --- a/styles/sidebar.less +++ b/styles/sidebar.less @@ -46,7 +46,7 @@ line-height: 24px; position: absolute; top: 128px; - bottom: 60px; + bottom: 0px; overflow-y: auto; width: 100%; z-index: -1; @@ -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 {