Commit graph

1383 commits

Author SHA1 Message Date
Jay Sitter ab92d7264d fix: Sass files don't need to refer to full node_modules path 2023-06-16 23:14:39 -04:00
SleeplessOne1917 958bb8c209
Merge pull request #1340 from jsit/fix/markdown-bootstrap-classes
fix: Remove inline styles and use Bootstrap classes
2023-06-17 02:50:48 +00:00
Jay Sitter cd259cd416
Merge branch 'main' into fix/markdown-bootstrap-classes 2023-06-16 21:48:33 -05:00
SleeplessOne1917 dad2bb17bf
Merge pull request #1336 from jsit/feat/add-badges-common-component
feat: Add Badges common component
2023-06-17 02:47:43 +00:00
Jay Sitter 133951bc84 fix: Remove inline styles and use Bootstrap classes 2023-06-16 22:43:46 -04:00
Jay Sitter fb678d10f8
Merge branch 'main' into feat/add-badges-common-component 2023-06-16 21:35:14 -05:00
SleeplessOne1917 cbbd0c0f82
Merge pull request #1251 from fheft/fix-nsfw-blur-spill
Fixed NSFW image blur spilling outside the preview
2023-06-17 02:32:25 +00:00
Jay Sitter 4ec7c26707
Merge branch 'main' into feat/add-badges-common-component 2023-06-16 21:31:03 -05:00
SleeplessOne1917 72655e0714
Merge branch 'main' into fix-nsfw-blur-spill 2023-06-17 02:29:33 +00:00
SleeplessOne1917 56500b6f0d
Merge pull request #1043 from LemmyNet/route-data-refactor
Route data refactor
2023-06-17 02:28:17 +00:00
Jay Sitter d951fb57da fix: Fix missing prop 2023-06-16 22:25:35 -04:00
SleeplessOne1917 6c998ed862
Merge branch 'main' into route-data-refactor 2023-06-17 02:25:18 +00:00
SleeplessOne1917 7407858dc9
Merge pull request #1246 from fheft/generate-theme-css
Generate theme css
2023-06-17 02:24:44 +00:00
SleeplessOne1917 61cbbfe57f
Merge branch 'main' into route-data-refactor 2023-06-17 02:22:36 +00:00
SleeplessOne1917 28023bb3a6
Merge branch 'main' into generate-theme-css 2023-06-17 02:22:10 +00:00
SleeplessOne1917 62e105f826
Merge pull request #1158 from skspade/1117-jump-to-main-content
1117 jump to main content
2023-06-17 02:22:01 +00:00
SleeplessOne1917 9165433282
Merge branch 'main' into 1117-jump-to-main-content 2023-06-17 02:19:59 +00:00
SleeplessOne1917 19b3de1bc2
Merge pull request #1334 from jsit/feat/markdown-format-bar-above
feat: Move text formatting bar above textarea
2023-06-17 02:19:02 +00:00
SleeplessOne1917 5033d03ed2
Merge branch 'main' into generate-theme-css 2023-06-17 02:17:45 +00:00
SleeplessOne1917 879e3b6f70
Merge branch 'main' into fix-nsfw-blur-spill 2023-06-17 02:17:04 +00:00
SleeplessOne1917 8b2bcd5a99
Merge branch 'main' into feat/markdown-format-bar-above 2023-06-17 02:16:36 +00:00
SleeplessOne1917 7a105942b0
Merge branch 'main' into feat/add-badges-common-component 2023-06-17 02:08:34 +00:00
SleeplessOne1917 5bd1b85e09
Merge pull request #1337 from jsit/fix/post-meta-vertical-align
fix: Vertically align icons in post listing
2023-06-17 02:08:21 +00:00
Jay Sitter ba3a565d2b fix: Vertically align icons in post listing 2023-06-16 21:50:31 -04:00
Jay Sitter f7f8ddcd7c fix: Add total users in site sidebar 2023-06-16 21:44:45 -04:00
Jay Sitter fe64edd2fc fix: Re-add 'number of communities' to site sidebar 2023-06-16 20:56:01 -04:00
Jay Sitter cb72180f97 fix: Fix broken link 2023-06-16 20:54:13 -04:00
Jay Sitter 8bbb6c9652 Merge remote-tracking branch 'origin/main' into feat/add-badges-common-component
* origin/main:
  handle login failures correctly
  wrap login call in try/catch for error handling
  Remove extra div in post sidebar
  Add a class to the more button on a comment node
  Switch navbar classes to ids
  Adding a few more 0.18.0 API changes. (#1324)
  Use aside semantic HTML tag for sidebars
  Use article semantic HTML tag for posts/comments
  Use footer semantic HTML tag
  Adding codeowners.
  Add lemmy-site class for easier detection
  Add ID's and classes to sidebars
  Add clases and ID's to post form/listing
  Add classes to post and comment repy textareas
  Rename markdown-textarea ID's
  Add nav and footer ID's
2023-06-16 20:35:44 -04:00
Jay Sitter e540b1e4a9
Merge branch 'main' into feat/markdown-format-bar-above 2023-06-16 19:14:48 -05:00
Jay Sitter f037220d5e fix: Fix rounded textarea in Markdown box 2023-06-16 20:13:25 -04:00
Jay Sitter 3d24a108ae feat: Fix some colors on dark mode 2023-06-16 20:02:07 -04:00
Jay Sitter f9f4caf260 feat: Redesign the format bar / textarea into a single bordered area with divider 2023-06-16 19:49:28 -04:00
Alec Armbruster b0c39ad5f5
and of course, yarn.lock 2023-06-16 19:22:12 -04:00
Alec Armbruster b3a25a3bb3
hopefully last merge fiasco cleanup 2023-06-16 19:20:43 -04:00
Alec Armbruster fbc13249ca
more cleanup 2023-06-16 19:18:06 -04:00
Alec Armbruster 768ed8ea94
even more cleanup 2023-06-16 19:16:00 -04:00
Alec Armbruster 8fcde4bdd0
more cleanup 2023-06-16 19:14:35 -04:00
Alec Armbruster e164a3b9a1
attempt to fix crazy merge fiasco 2023-06-16 19:10:25 -04:00
Alec Armbruster 3ee47d38b8
Merge branch 'LemmyNet:main' into breakout-role-utils 2023-06-16 18:57:20 -04:00
Alec Armbruster 9575b325e6
Merge branch 'breakout-role-utils' of https://github.com/alectrocute/lemmy-ui into breakout-role-utils 2023-06-16 18:56:31 -04:00
Alec Armbruster 6c6ddd5b51
reset, merge issues 2023-06-16 18:56:23 -04:00
Alec Armbruster 05aa483d89
pull latest main 2023-06-16 18:51:51 -04:00
Alec Armbruster 6126900bd5
forgot debounce 2023-06-16 18:49:28 -04:00
Alec Armbruster 6105c1e035
Merge branch 'main' into refactor-server-tidy 2023-06-16 18:41:44 -04:00
Jay Sitter f8f1f49250 feat: Move Badges to common component 2023-06-16 18:31:47 -04:00
SleeplessOne1917 f0a7b58ee3
Merge branch 'main' into route-data-refactor 2023-06-16 22:24:29 +00:00
SleeplessOne1917 1242d8d426
Merge pull request #1305 from ayan4m1/feature/login-error
Fix infinite spinner for login that results in failure
2023-06-16 22:24:00 +00:00
abias 9fb1a28763 Merge branch 'main' into route-data-refactor 2023-06-16 18:23:06 -04:00
Alec Armbruster d773f8c262
Merge branch 'main' into refactor-server-tidy 2023-06-16 18:21:14 -04:00
SleeplessOne1917 7e01c9e166
Merge branch 'main' into feature/login-error 2023-06-16 22:21:12 +00:00