Winged border on note blocks working

This commit is contained in:
Scott Tolksdorf committed 2016-05-14 14:37:07 -04:00
1 parent 5537d974ff
commit cd280eb8f0
7 files changed
+43 -58

No files matched your search

+7 -26
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} />
+8 -1
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

+1
View File
@@ -3,3 +3,4 @@
@backgroundImage: url(data:image/jpeg;base64,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 truncated
@redTriangleImage: url('/assets/homebrew/phbStyle/red.png');
@monsterBorderImage: url('/assets/homebrew/phbStyle/border.png');
@noteBorderImage: url('/assets/homebrew/phbStyle/note_border.png');
+8 -2
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
// *****************************/
+13 -26
View File
@@ -318,8 +318,10 @@ table {
margin-bottom: 1em;
padding: 5px 10px;
background-color: #e0e5c1;
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;
}
.phb blockquote em {
@@ -336,33 +338,16 @@ table {
font-size: 0.352cm;
line-height: 1.1em;
}
.phb pre + blockquote {
margin-top: 11px;
}
.phb hr + blockquote {
position: relative;
background-color: #FDF1DC;
padding-top: 15px;
border-image: url('/assets/homebrew/phbStyle/border.png') 10;
background-color: #FDF1DC;
border-style: solid;
border-width: 10px;
/*
//Top and Bottom Borders
&:after, &:before{
content : "";
position : absolute;
height : 4px;
width : 100%;
padding : 0px 3px;
background-color : #E69A28;
border : 1px solid black;
}
&:before{
top : 0px;
left : -3px;
}
&:after{
bottom : 0px;
left : -3px;
}
*/
border-image: url('/assets/homebrew/phbStyle/border.png') 10;
}
.phb hr + blockquote h2 {
margin-top: -8px;
@@ -398,6 +383,7 @@ table {
column-span: 1;
background-color: transparent;
border-image: none;
border-style: none;
-webkit-column-span: 1;
}
.phb hr + blockquote hr + table tbody tr:nth-child(odd),
@@ -414,11 +400,11 @@ table {
}
.phb hr + blockquote hr {
visibility: visible;
border: none;
height: 6px;
margin: 4px 0px;
background-image: url('/assets/homebrew/phbStyle/red.png');
background-size: 100% 100%;
border: none;
}
.phb hr + hr + blockquote {
column-count: 2;
@@ -439,6 +425,7 @@ table {
border-collapse: separate;
background-color: white;
border: initial;
border-style: solid;
border-image-outset: 37px 17px;
border-image-repeat: round;
border-image-slice: 150 200 150 200;
@@ -529,8 +516,8 @@ table {
.phb ol ol,
.phb ul ol,
.phb ol ul {
margin-left: 1.5em;
margin-bottom: 0px;
margin-left: 1.5em;
}
.phb.print blockquote {
box-shadow: none;
+6 -3
View File
@@ -1,6 +1,9 @@
# The Homebrewery
## v2.0.0 todo
X make a sproper staging environment
X make database backups
X Cleanup master
X Make statusbar un-fixed
X Simplify the panel css to remove the current issues
X Build new `BrewRenderer`, clean support for partial rendering
@@ -23,15 +26,15 @@ X Move snippets into their new groups
X Border shadows on second column renders much better
X Saving a pdf no uses the brew title
X add /source/shareId route
- Add stats nav item
X make both ids unique indexes in mongoose
X Fix main Page
- Write new welcome message
- Fix the edit page saving flow
- Fix title saving
X Fix the edit page saving flow
X Fix title saving
- Style the snippet groups
## v2.1.0
- Add stats nav item
- Adda better error page
- IMproved firefox support
- Add in window.resize handlers for the elements that need it