mockup/master: Merge pull request #782 from plone/datakurre-theme-filemanag
GitHub <jenkins-z4DKO/[email protected]>
| Newsgroups | gmane.comp.web.zope.plone.cvs |
|---|---|
| Message-ID | <[email protected]> |
Repository: mockup Branch: refs/heads/master Date: 2017-06-27T18:38:34-05:00 Author: Oshane Bailey (b4oshany) <[email protected]> Commit: https://github.com/plone/mockup/commit/bd3cb616c69875fe922e37cdcc0cad3ad08b3826 Merge pull request #782 from plone/datakurre-theme-filemanager-searching-feature Theme filemanager searching feature fixes Files changed: M mockup/patterns/filemanager/pattern.js M mockup/patterns/thememapper/pattern.thememapper.less diff --git a/mockup/patterns/filemanager/pattern.js b/mockup/patterns/filemanager/pattern.js index d711e972..de0290dc 100644 --- a/mockup/patterns/filemanager/pattern.js +++ b/mockup/patterns/filemanager/pattern.js @@ -189,7 +189,8 @@ define([ findinFilesView.triggerView ], id: 'find', - app: self + app: self, + disable: function() {} }) self.views = [ diff --git a/mockup/patterns/thememapper/pattern.thememapper.less b/mockup/patterns/thememapper/pattern.thememapper.less index 7666065a..4c58cce6 100644 --- a/mockup/patterns/thememapper/pattern.thememapper.less +++ b/mockup/patterns/thememapper/pattern.thememapper.less @@ -1,6 +1,6 @@ @import "@{mockuplessPath}/ui.less"; /* just be lazy here and include all of bootstrap... */ -@import "@{mockupPath}/filemanager/pattern.filemanager.less"; +@import "@{mockup-patterns-filemanager}"; body.plone-toolbar-left-default { padding-left: 0px; ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot