0
0
mirror of https://github.com/naturalcrit/homebrewery.git synced 2025-12-25 16:12:37 +00:00
Commit Graph

1301 Commits

Author SHA1 Message Date
Trevor Buckner
13ba5ebcc8 Fix snippets crashing in empty brew
If this.props.brew.text is an empty string, it will evaluate to `false` and, but since `isStyle()` is also false, `text` is just undefined.
2021-08-31 11:56:48 -04:00
Trevor Buckner
0e5ed35b6c Fixing drop caps inside columnWrap 2021-08-30 13:34:12 -04:00
Trevor Buckner
0d9981b3c6 Merge pull request #1543 from G-Ambatte/fixViewCountDuringEdit-#406
Stop view count being reduced by an open Edit page
2021-08-27 23:04:30 -04:00
Trevor Buckner
2b9362f7bf Merge pull request #1573 from G-Ambatte/addFilteringToUserPage
User Page filtering
2021-08-27 23:03:10 -04:00
Trevor Buckner
6b1b9bdce2 Merge branch 'master' into addFilteringToUserPage 2021-08-27 23:00:01 -04:00
G.Ambatte
22fb84ca32 Update client/homebrew/pages/userPage/userPage.jsx
Co-authored-by: Trevor Buckner <calculuschild@gmail.com>
2021-08-28 12:12:35 +12:00
Trevor Buckner
539b52ecbd Merge pull request #1594 from G-Ambatte/fixHandleInject-#1593
Handle `brew.style` being `undefined` when injecting snippets.
2021-08-27 19:35:05 -04:00
G.Ambatte
5f837f7b3c Update client/homebrew/pages/userPage/userPage.jsx
Co-authored-by: Trevor Buckner <calculuschild@gmail.com>
2021-08-28 11:09:33 +12:00
G.Ambatte
04b2421793 Update client/homebrew/editor/editor.jsx
Co-authored-by: Trevor Buckner <calculuschild@gmail.com>
2021-08-28 11:03:47 +12:00
Trevor Buckner
4ce915100b Merge pull request #1591 from Gazook89/fix-ink-friendly-snippet
minor fix for ink-friendly legacy snippet
2021-08-27 09:36:47 -04:00
Trevor Buckner
9b180a1c50 Merge pull request #1574 from Gazook89/metadata-panel-css-tweak
[very minor] Update metadataEditor.less "small" text
2021-08-27 09:35:28 -04:00
Trevor Buckner
1e8c285eef Just renaming/rearranging variables 2021-08-26 23:09:56 -04:00
Trevor Buckner
c09d0940d4 Merge pull request #1613 from naturalcrit/WrapperColsDiv
Fix column-wrapper on print page
2021-08-26 22:53:36 -04:00
Trevor Buckner
a7005d779a Fix /print, make .page outer element for consistency with legacy 2021-08-26 22:43:57 -04:00
G.Ambatte
1ed5c219ec Merge branch 'fixViewCountDuringEdit-#406' of https://github.com/G-Ambatte/homebrewery into fixViewCountDuringEdit-#406 2021-08-26 18:46:40 +12:00
G.Ambatte
4971c40e23 Remove undesired properties from brews prior to updating
Clean up tab/spacing in `googleActions.js`
2021-08-26 18:45:13 +12:00
G.Ambatte
ceb4667193 Unwind changes to EditPage 2021-08-26 18:44:13 +12:00
G.Ambatte
a1df68ed20 Remove brew.views for EditPage brew object 2021-08-26 18:44:13 +12:00
G.Ambatte
941bb94190 Remove undesired properties from brews prior to updating
Clean up tab/spacing in `googleActions.js`
2021-08-26 17:21:45 +12:00
G.Ambatte
8e841c6825 Unwind changes to EditPage 2021-08-26 17:20:03 +12:00
Trevor Buckner
85841d22f5 Merge pull request #1596 from naturalcrit/dependabot/npm_and_yarn/codemirror-5.62.3
Bump codemirror from 5.62.2 to 5.62.3
2021-08-25 21:48:01 -04:00
Trevor Buckner
2403d0a18a Merge pull request #1577 from Gazook89/Turn-Box-Shadows-to-Drop-Shadows
Turn box shadows to drop shadows
2021-08-25 21:47:33 -04:00
Trevor Buckner
a3354e9614 Move .note shadow to main box, not ::before element. 2021-08-25 21:46:59 -04:00
Trevor Buckner
9673a9a0f6 Merge pull request #1542 from G-Ambatte/fixGoogleModifiedTime-#1506
Set modifiedTime during view count update of Google brews
2021-08-24 23:55:57 -04:00
Trevor Buckner
e9939e7a0d Fix alignment 2021-08-24 23:55:03 -04:00
Trevor Buckner
7a74fc03fe Merge pull request #1277 from jsocol/column-fill-mode
Parametrize fillMode for .useColumns
2021-08-24 23:47:58 -04:00
Trevor Buckner
050a1d45fd Move to new theme file, make balance default 2021-08-24 23:47:31 -04:00
Trevor Buckner
b61f4e935a Merge branch 'column-fill-mode' of https://github.com/jsocol/homebrewery into pr/1277 2021-08-24 23:44:30 -04:00
Trevor Buckner
3233b7c23a Merge pull request #1597 from naturalcrit/WrapperColsDiv
Add wrapper to .page to improve `wide` behavior with columns
2021-08-23 23:04:47 -04:00
Trevor Buckner
039db01b31 Artificial column-break at page end
Inserting a \column into the end of the page (and a nbsp after). This makes the page emulate column-fill:auto (the standard "Homebrewery" behavior) since there is always at least one column-break, making the browser try less hard to aggressively "balance" the columns.

Then, when a user inserts `wide` or `column-span` elements, `column-fill: balance` will be able to take over and work as we expect.
2021-08-23 23:03:57 -04:00
dependabot[bot]
3de95a4f95 Bump codemirror from 5.62.2 to 5.62.3
Bumps [codemirror](https://github.com/codemirror/CodeMirror) from 5.62.2 to 5.62.3.
- [Release notes](https://github.com/codemirror/CodeMirror/releases)
- [Changelog](https://github.com/codemirror/CodeMirror/blob/master/CHANGELOG.md)
- [Commits](https://github.com/codemirror/CodeMirror/compare/5.62.2...5.62.3)

---
updated-dependencies:
- dependency-name: codemirror
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-08-23 03:01:02 +00:00
Trevor Buckner
9c6d875524 Add wrapper to .page to improve wide behavior with columns 2021-08-22 23:00:43 -04:00
Trevor Buckner
653fd513ad inject newlines around \column so its DIV isn't consumed as markdown 2021-08-21 01:36:25 -04:00
Trevor Buckner
ecdf4aee50 Merge pull request #1547 from Gazook89/Fix-improper-css-values
Fix two css values throwing errors in console
2021-08-21 00:55:18 -04:00
Trevor Buckner
9cdfbc7459 Fix Table of Content spacing 2021-08-21 00:15:53 -04:00
G.Ambatte
31c348baff Handle brew.style being undefined when inject snippets. 2021-08-21 11:37:01 +12:00
Gazook89
043ade6e34 minor fix for ink-friendly legacy snippet 2021-08-20 10:36:28 -05:00
Trevor Buckner
519d102a6e Throw errors in listGoogleBrews() and getGoogleFolder() 2021-08-20 01:45:50 -04:00
Trevor Buckner
5f388ed41f Merge pull request #1491 from G-Ambatte/addPageCountToUserPage
Display Brew page count on User Page
2021-08-18 10:52:42 -04:00
G.Ambatte
a834c79b49 Fix BrewItem locations and overlapping. 2021-08-18 18:07:17 +12:00
G.Ambatte
cb8c3a016a BETTER property alignment in googleActions 2021-08-18 16:25:08 +12:00
G.Ambatte
7a081e1147 Property alignment in googleActions.js 2021-08-18 16:20:27 +12:00
Trevor Buckner
72360be3e9 up version to 2.13.4 2021-08-17 23:58:16 -04:00
G.Ambatte
a97fd4f47f Check brew.title exists before sorting by it 2021-08-17 23:29:41 -04:00
G.Ambatte
f609962d44 Merge branch 'addPageCountToUserPage' of https://github.com/G-Ambatte/homebrewery into addPageCountToUserPage 2021-08-17 19:31:54 +12:00
G.Ambatte
15f4aef7ef Eliminate duplicate section 2021-08-17 19:30:20 +12:00
G.Ambatte
4218078502 Eliminate hanging comma 2021-08-17 19:30:20 +12:00
G.Ambatte
18cd851674 Eliminate spacer div in BrewItem 2021-08-17 19:30:20 +12:00
G.Ambatte
2c6c148da8 Push pageCount to NewPage and EditPage 2021-08-17 19:30:19 +12:00
G.Ambatte
42da4b4c43 Add a page count to User page 2021-08-17 19:30:17 +12:00