-
-
-
-
+/* Test code
+
-
-
*/
\ No newline at end of file
diff --git a/client/homebrew/homebrew.less b/client/homebrew/homebrew.less
index bfd045d61..853108fad 100644
--- a/client/homebrew/homebrew.less
+++ b/client/homebrew/homebrew.less
@@ -23,44 +23,41 @@ html,body, #reactContainer{
flex-direction: column;
- nav{
- //height : 22px;
- }
-
.content{
- background-color: red;
flex: auto;
- //position: relative;
+ position: relative;
+ height: calc(~"100% - 29px");
+ //overflow-y: scroll;
+ .pane{
+
+ }
.woo{
background-color: @red;
}
- .cool{
- background-color: @green;
- height : 500px;
- }
-
-
.temp{
- flex: auto;
- overflow-y: scroll;
+ background-color: @green;
+ //max-height : 100%;
+ //height : 100%;
+ //overflow: scroll;
- .woo{
- width: 50px;
- height : 2000px;
- background-color: green;
+ .tooBig{
+ background-color: @purple;
+ width : 50px;
+ height : 5000px;
}
-
}
+
+
}
}
-
+/*
.paneSplit{
width : 100%;
height: 100vh;
@@ -90,4 +87,5 @@ html,body, #reactContainer{
}
}
+ */
}
\ No newline at end of file
diff --git a/client/homebrew/pageContainer/pageContainer.less b/client/homebrew/pageContainer/pageContainer.less
index dd3cb5f19..32d9d86da 100644
--- a/client/homebrew/pageContainer/pageContainer.less
+++ b/client/homebrew/pageContainer/pageContainer.less
@@ -2,9 +2,9 @@
.pageContainer{
background-color : @steel;
- overflow-y: scroll;
+// overflow-y: scroll;
-height :100%;
+//height :100%;
.pages{
diff --git a/client/homebrew/splitPane/splitPane.jsx b/client/homebrew/splitPane/splitPane.jsx
index dee3feb12..9652b38e9 100644
--- a/client/homebrew/splitPane/splitPane.jsx
+++ b/client/homebrew/splitPane/splitPane.jsx
@@ -3,15 +3,13 @@ var _ = require('lodash');
var cx = require('classnames');
var SplitPane = React.createClass({
-
getInitialState: function() {
return {
- storageKey : 'naturalcrit-pane-split-test',
+ storageKey : 'naturalcrit-pane-split',
size : null,
isDragging : false
};
},
-
componentDidMount: function() {
var paneSize = window.localStorage.getItem(this.props.storageKey);
if(paneSize){
@@ -22,10 +20,11 @@ var SplitPane = React.createClass({
},
handleUp : function(){
- this.setState({ isDragging : false })
+ this.setState({ isDragging : false });
},
handleDown : function(){
- this.setState({ isDragging : true })
+ this.setState({ isDragging : true });
+ this.unFocus()
},
handleMove : function(e){
if(!this.state.isDragging) return;
@@ -35,6 +34,14 @@ var SplitPane = React.createClass({
window.localStorage.setItem(this.props.storageKey, e.pageX);
},
+ unFocus : function() {
+ if(document.selection){
+ document.selection.empty();
+ }else{
+ window.getSelection().removeAllRanges();
+ }
+ },
+
renderDivider : function(){
return
-
{this.props.children[0]}
+
{this.props.children[0]}
{this.renderDivider()}
-
{this.props.children[1]}
+
{this.props.children[1]}
}
});
@@ -65,7 +72,6 @@ var Pane = React.createClass({
width : this.props.width + 'px'
}
}
-
return
{this.props.children}
diff --git a/client/homebrew/splitPane/splitPane.less b/client/homebrew/splitPane/splitPane.less
index 200c006da..046f66efd 100644
--- a/client/homebrew/splitPane/splitPane.less
+++ b/client/homebrew/splitPane/splitPane.less
@@ -7,6 +7,7 @@
flex-direction : row;
.pane{
flex : 1;
+ overflow-x: hidden;
}
.divider{
width : 5px;
diff --git a/shared/naturalCrit/nav/nav.less b/shared/naturalCrit/nav/nav.less
index 575cd4325..9ae0158f6 100644
--- a/shared/naturalCrit/nav/nav.less
+++ b/shared/naturalCrit/nav/nav.less
@@ -9,11 +9,9 @@
}
nav{
background-color : #333;
-
.navContent{
- display : flex;
-
- justify-content : space-between;
+ display : flex;
+ justify-content : space-between;
}
.navSection{
display : flex;
@@ -26,13 +24,10 @@ nav{
margin-left : 8px;
color : white;
text-decoration : none;
-
&:hover{
.name{ color : @orange; }
svg{ fill : @orange }
}
-
-
svg{
height : 13px;
margin-right : 0.2em;
@@ -58,11 +53,14 @@ nav{
padding : 8px 12px;
cursor : pointer;
background-color : #333;
- font-size : 12px;
+ font-size : 10px;
+ font-weight : 800;
color : white;
- text-decoration: none;
+ text-decoration : none;
+ text-transform : uppercase;
i{
margin-left : 5px;
+ font-size : 13px;
}
&.tealLight:hover{ background-color : @tealLight };
&.teal:hover{ background-color : @teal };
@@ -85,7 +83,6 @@ nav{
&.greyLight:hover{ background-color : @greyLight };
&.grey:hover{ background-color : @grey };
}
-
.navSection + .navSection .navItem{
border-left : 1px solid #666;
}
diff --git a/todo.md b/todo.md
index 10c1195d6..b10379c5b 100644
--- a/todo.md
+++ b/todo.md
@@ -1,14 +1,16 @@
# The Homebrewery
## v1.5 todo
-- Make statusbar un-fixed
-- Simplify the panel css to remove the current issues
+X Make statusbar un-fixed
+X Simplify the panel css to remove the current issues
+- Build new `BrewRenderer`, clean support for partial rendering
+- Add `infoBox` to BrewRenderer to show views, and current pages
+- Add in markdown editor
- Add bleed snippet (bump)
- Add the '/new' page and force save to reduce database size
-! Add pagniation and query to the homebrew api
-! Update the admin page with pagnition and a query box
-! Test the old/small brew filtering for deleteion
-- Make the status bar take children? Or just give it a string of booleans. Just simplify it
+X Add pagniation and query to the homebrew api
+X Update the admin page with pagnition and a query box
+X Test the old/small brew filtering for deleteion
- Partial rendering kills style tags on unrendered pages. Detect if pages have style tags and render them.
- Add in the link of Pateron?