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

631 Commits

Author SHA1 Message Date
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
a7005d779a Fix /print, make .page outer element for consistency with legacy 2021-08-26 22:43:57 -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
Trevor Buckner
9c6d875524 Add wrapper to .page to improve wide behavior with columns 2021-08-22 23:00:43 -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
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
a97fd4f47f Check brew.title exists before sorting by it 2021-08-17 23:29:41 -04: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
42da4b4c43 Add a page count to User page 2021-08-17 19:30:17 +12:00
G.Ambatte
ee006b6b16 Eliminate spacer div in BrewItem 2021-08-17 19:30:01 +12:00
G.Ambatte
cfb98986cd Push pageCount to NewPage and EditPage 2021-08-17 19:30:01 +12:00
G.Ambatte
a908c5f5d5 Add a page count to User page 2021-08-17 19:27:54 +12:00
Trevor Buckner
1885a8d0cc Merge pull request #1541 from G-Ambatte/updateBrewTooltips
Update BrewItem tooltips
2021-08-16 23:26:01 -04:00
Gazook89
0d2624bf3b Merge branch 'master' into metadata-panel-css-tweak 2021-08-16 13:30:07 -05:00
Trevor Buckner
64b62c5e98 Merge pull request #1575 from naturalcrit/v3WelcomePage
V3 welcome page
2021-08-16 10:17:45 -04:00
Trevor Buckner
425d03f6b5 Link in metadata panel 2021-08-16 10:16:25 -04:00
Trevor Buckner
7977e869c3 Small tweaks. Move "Create your own" button slightly. 2021-08-16 00:52:34 -04:00
G.Ambatte
501b356344 Updates based on Gitter feedback 2021-08-15 19:15:43 +12:00
Trevor Buckner
ec92a0307b Merge pull request #1562 from Gazook89/Page-Snippet-Menu
Editor-Specific Snippet Groups, and Print Snippet Menu Changes
2021-08-15 00:45:47 -04:00
Trevor Buckner
edce4e5bbc Refactoring switching logic, formatting LESS 2021-08-15 00:45:01 -04:00
Gazook89
a7e6d0a513 Update metadataEditor.less "small" text 2021-08-14 23:34:12 -05:00
G.Ambatte
521c393b74 Add title filtering to User Page. 2021-08-15 15:51:24 +12:00
Trevor Buckner
28884d6774 Merge pull request #1509 from Gazook89/v3-Artist-Snippet
Add Artist Credit Snippet
2021-08-14 23:22:23 -04:00
Trevor Buckner
8f7d6a3eb5 Update color, snippet positioning, added into v3 Image and BackgroundImage 2021-08-14 23:21:13 -04:00
Gazook89
88c485ffe5 circleCI fix
hopefully last one..

circleCI fixes

circleCI fixes
2021-08-12 21:23:21 -05:00
Gazook89
562bf6d4ac Fix to snippets.js both legacy and v3 for CircleCI 2021-08-12 07:45:00 -05:00
Gazook89
807f865d8b Match Legacy snippets to v3, remove <style> from style snippets
- Matched the Legacy snippets to v3, with appropriate syntax.
- Small adjustments to Ink Friendly snippet (retains images, reduces drop shadows, sets more backgrounds to White)
- Adds commented snippet 'titles' for Page snippets
2021-08-12 07:42:08 -05:00
Gazook89
50c07a5c8e Change 'print' to 'page' on Legacy snippet.js
Tiny fix to change "Print" menu to "Page" menu on Legacy.
2021-08-12 07:00:51 -05:00
Gazook89
3545bdc586 Update snippetbar.jsx with filter for editor/view specific menus
Add logic to filter available snippet menus based on the view/editor that is open ("text" vs "style") for both Legacy and v3.
2021-08-12 06:59:55 -05:00
Gazook89
3d9f8ea142 Update snippet.js 'editor' to 'view'
Change new property 'editor' to 'view'  on  @calculuschild 's recommendation.
2021-08-12 06:01:48 -05:00
Gazook89
69a69bbb82 Add 'editor' property to snippets.js
Add another property to the snippet groups, "editor", with values either "text" or "style".
2021-08-11 21:44:39 -05:00
Trevor Buckner
0075b0836a Popup error when gDrive credentials are expired on both /edit and /new 2021-08-11 15:36:57 -04:00
Trevor Buckner
af8ca7141d Update welcome_msg_v3.md 2021-08-11 01:01:04 -04:00
Gazook89
a63949636e Update Ink Friendly snippet for v3
updated the ink friendly snippet so that it points to elements like .monster rather than hr+blockquote.

Goes further than original snippet by setting white background for monster, note, descriptive blocks.

Did not update Legacy.
2021-08-10 22:02:46 -05:00
Gazook89
9a44cc04b1 Add Square Page snippet
Add a snippet to Print menu (renamed to "Page") for a square page.  Reduces padding and removes columns as well.
2021-08-10 21:46:47 -05:00
Gazook89
9120c1d0eb Merge branch 'master' into v3-Artist-Snippet 2021-08-10 13:34:26 -05:00
Gazook89
a46370b81e Merge branch 'master' into v3-Artist-Snippet 2021-08-10 13:32:35 -05:00
G.Ambatte
479f9af08c Wrap Last Viewed tooltip with Moment 2021-08-10 21:31:02 +12:00
G.Ambatte
0ddfb6e4e7 Update following Gitter conversation 2021-08-10 20:47:49 +12:00
G.Ambatte
120e99959a Update BrewItem tooltips 2021-08-10 18:54:16 +12:00