diff --git a/.gitignore b/.gitignore index 2f081e2dc..ecd6009b6 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ config/docker.* todo.md startDB.bat startMViewer.bat +.vscode diff --git a/changelog.md b/changelog.md index fbf376035..132b63d99 100644 --- a/changelog.md +++ b/changelog.md @@ -1,6 +1,7 @@ ```css h5 { font-size: .35cm !important; + margin-top: 0.3cm; } .page ul ul { @@ -14,6 +15,11 @@ h5 { filter: brightness(1.1) drop-shadow(1px 2px 1px #222); } +.taskList ul { + margin-bottom: 0px; + margin-top: 0px; +} + .taskList li input[checked] { filter: sepia(100%) hue-rotate(60deg) saturate(3.5) contrast(4) brightness(1.1) drop-shadow(1px 2px 1px #222); } @@ -39,6 +45,68 @@ pre { ## changelog For a full record of development, visit our [Github Page](https://github.com/naturalcrit/homebrewery). +### Friday 19/10/2022 - v3.3.0 +{{taskList + +##### Calculuschild + +* [x] Fix for tables broken by Chrome v106 + + +##### G-Ambatte: + +* [x] Fix Table of Contents broken by Chrome v106 + +Fixes issues [#2437](https://github.com/naturalcrit/homebrewery/issues/2437) + +* [x] Show brew thumbnails on user page + +Fixes issues [#2331](https://github.com/naturalcrit/homebrewery/issues/2331) + +* [x] Allow longer URLs for brew thumbnails + +Fixes issues [#2351](https://github.com/naturalcrit/homebrewery/issues/2351) + +* [x] Code no longer unfolds when inserting a snippet + +Fixes issues [#2135](https://github.com/naturalcrit/homebrewery/issues/2135) + +* [x] Fix brew settings being lost on first save + +Fixes issues [#2427](https://github.com/naturalcrit/homebrewery/issues/2427) + + + + +##### Gazook: + +* [x] Several updates to bug reporting and error popups + +Fixes issues [#2376](https://github.com/naturalcrit/homebrewery/issues/2376) + +* [x] Fixes to userpage search bar + +Fixes issues [#1675](https://github.com/naturalcrit/homebrewery/issues/1675), [#2353](https://github.com/naturalcrit/homebrewery/issues/2353) + +* [x] Renderer *(legacy / V3)* now shown next to page # + +Fixes issues [#1928](https://github.com/naturalcrit/homebrewery/issues/1928) + +* [x] Prevent text selection when moving divider bar + +Fixes issues [#1632](https://github.com/naturalcrit/homebrewery/issues/1632) + +* [x] Tweak Monster Stat Block coloring + +Fixes issues [#2123](https://github.com/naturalcrit/homebrewery/issues/2123) + +* [x] Added dropdown button to toggle autosave + +Fixes issues [#1546](https://github.com/naturalcrit/homebrewery/issues/1546) + +}} + + ### Friday 08/09/2022 - v3.2.2 {{taskList diff --git a/client/homebrew/brewRenderer/brewRenderer.jsx b/client/homebrew/brewRenderer/brewRenderer.jsx index eca9a1f2d..46613d404 100644 --- a/client/homebrew/brewRenderer/brewRenderer.jsx +++ b/client/homebrew/brewRenderer/brewRenderer.jsx @@ -110,7 +110,12 @@ const BrewRenderer = createClass({ renderPageInfo : function(){ return
- {this.state.viewablePageNumber + 1} / {this.state.pages.length} +
+ {this.props.renderer} +
+
+ {this.state.viewablePageNumber + 1} / {this.state.pages.length} +
; }, diff --git a/client/homebrew/brewRenderer/brewRenderer.less b/client/homebrew/brewRenderer/brewRenderer.less index abb80fc5f..bde91c92e 100644 --- a/client/homebrew/brewRenderer/brewRenderer.less +++ b/client/homebrew/brewRenderer/brewRenderer.less @@ -21,11 +21,17 @@ right : 17px; bottom : 0; z-index : 1000; - padding : 8px 10px; background-color : #333; font-size : 10px; font-weight : 800; color : white; + div { + display: inline-block; + padding : 8px 10px; + &:not(:last-child){ + border-right: 1px solid #666; + } + } } .ppr_msg{ position : absolute; diff --git a/client/homebrew/editor/editor.jsx b/client/homebrew/editor/editor.jsx index de3a53a36..07946c132 100644 --- a/client/homebrew/editor/editor.jsx +++ b/client/homebrew/editor/editor.jsx @@ -19,11 +19,6 @@ const DEFAULT_STYLE_TEXT = dedent` color: black; }`; -const splice = function(str, index, inject){ - return str.slice(0, index) + inject + str.slice(index); -}; - - const Editor = createClass({ displayName : 'Editor', @@ -80,19 +75,7 @@ const Editor = createClass({ }, handleInject : function(injectText){ - let text; - if(this.isText()) text = this.props.brew.text; - if(this.isStyle()) text = this.props.brew.style ?? DEFAULT_STYLE_TEXT; - - const lines = text.split('\n'); - const cursorPos = this.refs.codeEditor.getCursorPosition(); - lines[cursorPos.line] = splice(lines[cursorPos.line], cursorPos.ch, injectText); - - const injectLines = injectText.split('\n'); - this.refs.codeEditor.setCursorPosition(cursorPos.line + injectLines.length, cursorPos.ch + injectLines[injectLines.length - 1].length); - - if(this.isText()) this.props.onTextChange(lines.join('\n')); - if(this.isStyle()) this.props.onStyleChange(lines.join('\n')); + this.refs.codeEditor?.injectText(injectText, false); }, handleViewChange : function(newView){ diff --git a/client/homebrew/editor/metadataEditor/metadataEditor.jsx b/client/homebrew/editor/metadataEditor/metadataEditor.jsx index 016e9aa67..372ae6784 100644 --- a/client/homebrew/editor/metadataEditor/metadataEditor.jsx +++ b/client/homebrew/editor/metadataEditor/metadataEditor.jsx @@ -232,21 +232,25 @@ const MetadataEditor = createClass({ value={this.props.metadata.title} onChange={(e)=>this.handleFieldChange('title', e)} /> -
- -