0
0
mirror of https://github.com/naturalcrit/homebrewery.git synced 2026-05-09 14:08:40 +00:00
Commit Graph

4772 Commits

Author SHA1 Message Date
G.Ambatte cfb98986cd Push pageCount to NewPage and EditPage 2021-08-17 19:30:01 +12:00
G.Ambatte 0fd7921a50 Lint fix. 2021-08-17 19:30:01 +12:00
G.Ambatte e0e86dff7c Update server/googleActions.js
Co-authored-by: Trevor Buckner <calculuschild@gmail.com>
2021-08-17 19:29:25 +12:00
G.Ambatte 7e30fb19d4 Update server/googleActions.js
Co-authored-by: Trevor Buckner <calculuschild@gmail.com>
2021-08-17 19:29:25 +12:00
G.Ambatte df07e0401a Add support for Google Brews. 2021-08-17 19:27:56 +12:00
G.Ambatte a908c5f5d5 Add a page count to User page 2021-08-17 19:27:54 +12:00
G.Ambatte cdaa0b3ac2 Eliminate duplicate section 2021-08-17 19:26:03 +12:00
G.Ambatte 6573ada881 Eliminate hanging comma 2021-08-17 19:25:39 +12:00
G.Ambatte 2a7bde7e44 Eliminate spacer div in BrewItem 2021-08-17 19:05:30 +12:00
G.Ambatte eca58bb27e Push pageCount to NewPage and EditPage 2021-08-17 19:05:30 +12:00
G.Ambatte 2e68cd77fa Add a page count to User page 2021-08-17 19:03:23 +12:00
G.Ambatte f1d19d2d63 Eliminate spacer div in BrewItem 2021-08-17 18:01:07 +12:00
G.Ambatte a13759130d Push pageCount to NewPage and EditPage 2021-08-17 17:36:26 +12:00
G.Ambatte a99cf75b2e Lint fix. 2021-08-17 17:07:19 +12:00
G.Ambatte 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
G.Ambatte 6489a29436 Update server/googleActions.js
Co-authored-by: Trevor Buckner <calculuschild@gmail.com>
2021-08-17 15:51:05 +12:00
G.Ambatte c907d32779 Update server/googleActions.js
Co-authored-by: Trevor Buckner <calculuschild@gmail.com>
2021-08-17 15:50:40 +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 5c46ecbebd Merge branch 'master' into ClassTable-Revisions 2021-08-16 13:35:07 -05:00
Gazook89 f993a7022c Merge branch 'master' into Images-Snippet-Menu 2021-08-16 13:30:28 -05:00
Gazook89 0d2624bf3b Merge branch 'master' into metadata-panel-css-tweak 2021-08-16 13:30:07 -05:00
Gazook89 801703a7a5 Merge branch 'master' into Turn-Box-Shadows-to-Drop-Shadows 2021-08-16 13:29:47 -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
Gazook89 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
Gazook89 0773dd24ab change box-shadows to drop-shadows
monster blocks, descriptive notes, regular notes.
2021-08-15 19:57:20 -05:00
Gazook89 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
G.Ambatte 3a2477949b Resolve merge conflict 2021-08-15 21:19:09 +12:00
G.Ambatte 1edc62d023 Hide pageCount on User Page if the brew only has one page 2021-08-15 21:02:56 +12:00
G.Ambatte 7b0f5cec97 Add support for Google Brews. 2021-08-15 21:02:46 +12:00
G.Ambatte f0a0c0c11d Add a page count to User page 2021-08-15 21:00:17 +12:00
G.Ambatte 3489a76a1d Hide pageCount on User Page if the brew only has one page 2021-08-15 20:32:23 +12:00
G.Ambatte 3cf05e551f Add support for Google Brews. 2021-08-15 20:17:50 +12:00
G.Ambatte 501b356344 Updates based on Gitter feedback 2021-08-15 19:15:43 +12:00
Trevor Buckner 3f395ad4f3 Lint 2021-08-15 00:51:22 -04: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
Gazook89 2874bcc5f7 Merge branch 'master' into Images-Snippet-Menu 2021-08-14 22:51:40 -05:00
G.Ambatte 521c393b74 Add title filtering to User Page. 2021-08-15 15:51:24 +12:00
Trevor Buckner d853643874 Inherit colors 2021-08-14 23:40:38 -04: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 4653fcd782 Remove reference to hotkeys in Style Comments
Removed reference to hotkeys for commenting in the Style Editor since that is not implemented yet.  can be added back to match the Text Editor commenting snippet once implemented.
2021-08-14 20:24:51 -05:00
Gazook89 84698aa68f Match changes in commit 143d390 to Legacy
Matching legacy to v3 (adds another menu to style editor, etc).
2021-08-14 20:18:11 -05:00
Gazook89 143d390895 Add "Style Editor" menu to Style pane
And other tweaks:
- Move drop caps snippets to Style Editor menu
- retitle Editor menu to either Text Editor or Style Editor
- minor:  removed old unnecessary comments in code from earlier (my own).
- Removed leading spaces on drop cap comment
- added drop cap comment on "remove drop caps" snippet.
2021-08-14 20:16:33 -05:00
Trevor Buckner 58568468f6 Fix font in v3. Clean up LESS formatting. 2021-08-14 00:52:35 -04:00
Trevor Buckner 53de59940f Merge pull request #1561 from naturalcrit/dependabot/npm_and_yarn/mongoose-5.13.7
Bump mongoose from 5.13.6 to 5.13.7
2021-08-13 20:34:56 -04:00
dependabot[bot] 4588e02faf Bump mongoose from 5.13.6 to 5.13.7
Bumps [mongoose](https://github.com/Automattic/mongoose) from 5.13.6 to 5.13.7.
- [Release notes](https://github.com/Automattic/mongoose/releases)
- [Changelog](https://github.com/Automattic/mongoose/blob/master/History.md)
- [Commits](https://github.com/Automattic/mongoose/commits/5.13.7)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-08-13 19:03:49 +00:00