1
0
mirror of https://github.com/stolksdorf/homebrewery.git synced 2025-12-20 00:31:31 +00:00

Winged border on note blocks working

This commit is contained in:
Scott Tolksdorf
2016-05-14 14:37:07 -04:00
parent 5537d974ff
commit cd280eb8f0
7 changed files with 44 additions and 59 deletions

View File

@@ -40,27 +40,20 @@ var EditPage = React.createClass({
return {
title : this.props.brew.title,
text: this.props.brew.text,
isSaving : false,
isPending : false,
errors : null,
lastUpdated : this.props.brew.updatedAt
};
},
savedBrew : null,
componentDidMount: function(){
this.debounceSave = _.debounce(this.save, SAVE_TIMEOUT);
window.onbeforeunload = ()=>{
//do state checks
//return "You have unsaved changes!";
if(this.state.isSaving || this.state.isPending){
return 'You have unsaved changes!';
}
}
},
componentWillUnmount: function() {
@@ -112,7 +105,6 @@ var EditPage = React.createClass({
},
save : function(){
console.log('saving!');
this.debounceSave.cancel();
this.setState({
isSaving : true
@@ -125,7 +117,6 @@ var EditPage = React.createClass({
title : this.state.title
})
.end((err, res) => {
console.log('done', res.body);
this.savedBrew = res.body;
this.setState({
isPending : false,
@@ -136,34 +127,24 @@ var EditPage = React.createClass({
},
renderSaveButton : function(){
if(this.state.isSaving){
return <Nav.item icon="fa-spinner fa-spin">saving...</Nav.item>
return <Nav.item className='save' icon="fa-spinner fa-spin">saving...</Nav.item>
}
if(!this.state.isPending && !this.state.isSaving){
return <Nav.item>saved.</Nav.item>
return <Nav.item className='save saved'>saved.</Nav.item>
}
if(this.state.isPending && this.hasChanges()){
return <Nav.item onClick={this.save} color='blue'>Save Now</Nav.item>
return <Nav.item className='save' onClick={this.save} color='blue' icon='fa-save'>Save Now</Nav.item>
}
},
renderNavbar : function(){
return <Navbar>
<Nav.section>
<EditTitle title={this.state.title} onChange={this.handleTitleChange} />
</Nav.section>
<Nav.section>
{this.renderSaveButton()}
<Nav.item newTab={true} href={'/homebrew/share/' + this.props.brew.shareId} color='teal' icon='fa-share'>
<Nav.item newTab={true} href={'/homebrew/share/' + this.props.brew.shareId} color='teal' icon='fa-share-alt'>
Share
</Nav.item>
<PrintLink shareId={this.props.brew.shareId} />

View File

@@ -1,5 +1,12 @@
.editPage{
.navItem.save{
width : 75px;
text-align: center;
&.saved{
color : #666;
cursor : initial;
}
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 530 B

File diff suppressed because one or more lines are too long

View File

@@ -171,14 +171,20 @@
margin-bottom : 1em;
padding : 5px 10px;
background-color : @noteGreen;
border-top : 2px black solid;
border-bottom : 2px black solid;
border-style: solid;
border-width: 11px;
border-image: url('/assets/homebrew/phbStyle/note_border.png') 11;
border-image-outset: 9px 0px;
box-shadow : 1px 4px 14px #888;
p, ul{
font-size : 0.352cm;
line-height : 1.1em;
}
}
//If a note starts a column, give it space at the top to render border
pre+blockquote{
margin-top: 11px;
}
//*****************************
// * MONSTER STAT BLOCK
// *****************************/