5f388ed41f
Merge pull request #1491 from G-Ambatte/addPageCountToUserPage
...
Display Brew page count on User Page
2021-08-18 10:52:42 -04:00
a834c79b49
Fix BrewItem locations and overlapping.
2021-08-18 18:07:17 +12:00
cb8c3a016a
BETTER property alignment in googleActions
2021-08-18 16:25:08 +12:00
7a081e1147
Property alignment in googleActions.js
2021-08-18 16:20:27 +12:00
72360be3e9
up version to 2.13.4
2021-08-17 23:58:16 -04:00
a97fd4f47f
Check brew.title exists before sorting by it
2021-08-17 23:29:41 -04:00
0db37bc204
Update editor.less for .pageLine
...
Change the .pageLine (page break) border from bottom to top, since any text on the same line is part of the following page rather than the preceding page.
2021-08-17 19:47:23 -05:00
bc7911b0bc
Add Watermark snippet
2021-08-17 16:04:59 -05:00
c33083814e
Merge branch 'master' into Images-Snippet-Menu
2021-08-17 15:49:40 -05:00
ff3320c8dc
reveal v3
2021-08-17 15:49:16 -05:00
bd368c4c64
add 'view' property
...
[minor fix] fix missing apostrophe
2021-08-17 12:46:22 -05:00
c051ec19f2
Add voidTags whitelist and functionality
2021-08-17 20:50:41 +12:00
2be0d82a35
Fix typo.
2021-08-17 20:37:07 +12:00
bdfcde7661
Fix issue with <a>/<aside>
2021-08-17 20:23:26 +12:00
f609962d44
Merge branch 'addPageCountToUserPage' of https://github.com/G-Ambatte/homebrewery into addPageCountToUserPage
2021-08-17 19:31:54 +12:00
15f4aef7ef
Eliminate duplicate section
2021-08-17 19:30:20 +12:00
4218078502
Eliminate hanging comma
2021-08-17 19:30:20 +12:00
18cd851674
Eliminate spacer div in BrewItem
2021-08-17 19:30:20 +12:00
2c6c148da8
Push pageCount to NewPage and EditPage
2021-08-17 19:30:19 +12:00
42da4b4c43
Add a page count to User page
2021-08-17 19:30:17 +12:00
ee006b6b16
Eliminate spacer div in BrewItem
2021-08-17 19:30:01 +12:00
cfb98986cd
Push pageCount to NewPage and EditPage
2021-08-17 19:30:01 +12:00
0fd7921a50
Lint fix.
2021-08-17 19:30:01 +12:00
e0e86dff7c
Update server/googleActions.js
...
Co-authored-by: Trevor Buckner <calculuschild@gmail.com >
2021-08-17 19:29:25 +12:00
7e30fb19d4
Update server/googleActions.js
...
Co-authored-by: Trevor Buckner <calculuschild@gmail.com >
2021-08-17 19:29:25 +12:00
df07e0401a
Add support for Google Brews.
2021-08-17 19:27:56 +12:00
a908c5f5d5
Add a page count to User page
2021-08-17 19:27:54 +12:00
cdaa0b3ac2
Eliminate duplicate section
2021-08-17 19:26:03 +12:00
6573ada881
Eliminate hanging comma
2021-08-17 19:25:39 +12:00
2a7bde7e44
Eliminate spacer div in BrewItem
2021-08-17 19:05:30 +12:00
eca58bb27e
Push pageCount to NewPage and EditPage
2021-08-17 19:05:30 +12:00
2e68cd77fa
Add a page count to User page
2021-08-17 19:03:23 +12:00
f1d19d2d63
Eliminate spacer div in BrewItem
2021-08-17 18:01:07 +12:00
a13759130d
Push pageCount to NewPage and EditPage
2021-08-17 17:36:26 +12:00
a99cf75b2e
Lint fix.
2021-08-17 17:07:19 +12:00
3b7a52a60f
Update client/homebrew/pages/userPage/brewItem/brewItem.jsx
...
Co-authored-by: Trevor Buckner <calculuschild@gmail.com >
2021-08-17 16:02:50 +12:00
6489a29436
Update server/googleActions.js
...
Co-authored-by: Trevor Buckner <calculuschild@gmail.com >
2021-08-17 15:51:05 +12:00
c907d32779
Update server/googleActions.js
...
Co-authored-by: Trevor Buckner <calculuschild@gmail.com >
2021-08-17 15:50:40 +12:00
1885a8d0cc
Merge pull request #1541 from G-Ambatte/updateBrewTooltips
...
Update BrewItem tooltips
2021-08-16 23:26:01 -04:00
5c46ecbebd
Merge branch 'master' into ClassTable-Revisions
2021-08-16 13:35:07 -05:00
f993a7022c
Merge branch 'master' into Images-Snippet-Menu
2021-08-16 13:30:28 -05:00
0d2624bf3b
Merge branch 'master' into metadata-panel-css-tweak
2021-08-16 13:30:07 -05:00
801703a7a5
Merge branch 'master' into Turn-Box-Shadows-to-Drop-Shadows
2021-08-16 13:29:47 -05:00
64b62c5e98
Merge pull request #1575 from naturalcrit/v3WelcomePage
...
V3 welcome page
2021-08-16 10:17:45 -04:00
425d03f6b5
Link in metadata panel
2021-08-16 10:16:25 -04:00
7977e869c3
Small tweaks. Move "Create your own" button slightly.
2021-08-16 00:52:34 -04:00
1b7729ca01
reverting change to .note:before
...
setting back to what it was. apparently :before is necessary due to border-image spacing.
2021-08-15 20:17:15 -05:00
0773dd24ab
change box-shadows to drop-shadows
...
monster blocks, descriptive notes, regular notes.
2021-08-15 19:57:20 -05:00
76a6c9c2d3
Remove :before on .note
...
Move all properties from :before to the base .note....don't see a need to add a superfluous pseudo element.
2021-08-15 19:52:12 -05:00
3a2477949b
Resolve merge conflict
2021-08-15 21:19:09 +12:00
Trevor Buckner