diff --git a/client/homebrew/editor/editor.less b/client/homebrew/editor/editor.less index f77d1c4..2399283 100644 --- a/client/homebrew/editor/editor.less +++ b/client/homebrew/editor/editor.less @@ -4,6 +4,7 @@ height : 100%; min-height : 100%; width : 100%; + margin-top: 25px; display: flex; flex-direction: column; .textIcons{ diff --git a/client/homebrew/homebrew.less b/client/homebrew/homebrew.less index d9a4717..f454f1b 100644 --- a/client/homebrew/homebrew.less +++ b/client/homebrew/homebrew.less @@ -16,9 +16,10 @@ html,body, #reactContainer{ .paneSplit{ width : 100%; height: 100vh; - padding-top: 25px; + //padding-top: 25px; position: relative; box-sizing: border-box; + overflow: hidden; .leftPane, .rightPane{ display: inline-block; @@ -26,6 +27,7 @@ html,body, #reactContainer{ position: relative; height: 100%; min-height: 100%; + //margin-top: 25px; } .leftPane{ @@ -34,8 +36,9 @@ html,body, #reactContainer{ .rightPane{ width : 60%; height: 100%; + //overflow-y: scroll; - overflow-y: scroll; + overflow: hidden; } } diff --git a/client/homebrew/pageContainer/pageContainer.jsx b/client/homebrew/pageContainer/pageContainer.jsx index 5a79390..8ff5df7 100644 --- a/client/homebrew/pageContainer/pageContainer.jsx +++ b/client/homebrew/pageContainer/pageContainer.jsx @@ -4,23 +4,52 @@ var cx = require('classnames'); var Markdown = require('marked'); +var PAGE_HEIGHT = 1056 + 30; + var PageContainer = React.createClass({ getDefaultProps: function() { return { text : "" }; }, + getInitialState: function() { + return { + scrollPosition: 0 + }; + }, + + handleScroll : function(e){ + this.setState({ + scrollPosition : e.target.scrollTop + }); + }, + + getViewablePageIndex : function(){ + return Math.floor(this.state.scrollPosition / PAGE_HEIGHT); + }, + + renderDummyPage : function(key){ + return