Alec Armbruster
7f48a38b72
Merge branch 'main' into breakout-role-utils
2023-06-17 08:44:47 -04:00
Alec Armbruster
96abf25d00
fix merge conflicts
2023-06-17 08:07:25 -04:00
Alec Armbruster
e6005daadf
Merge branch 'main' into refactor-server-tidy
2023-06-17 08:02:46 -04:00
SleeplessOne1917
4bdddb1710
Add default profile picture for users who do not set one ( #1339 )
2023-06-17 08:00:13 -04:00
Marcin Mróz
7c2a471031
feat(navbar): Add labels for navbar items on mobile ( #1323 )
...
* feat(navbar): Add labels for navbar items on mobile
* fix(navbar): Fix icons positioning on desktop
---------
Co-authored-by: Marcin Mróz <marcin.mroz@displate.com>
Co-authored-by: SleeplessOne1917 <abias1122@gmail.com>
Co-authored-by: Dessalines <dessalines@users.noreply.github.com>
2023-06-17 07:55:59 -04:00
SleeplessOne1917
35a59a4ebf
Merge pull request #1344 from jsit/fix/fix-markdown-textarea-top-round
2023-06-17 11:25:27 +00:00
Ivo Barros
3ca24607fb
add hours as sorting options
2023-06-17 09:37:03 +01:00
Jay Sitter
fef03525f1
fix: Fix rounded top corners in markdown textarea
2023-06-17 01:43:05 -04:00
Jay Sitter
b59ddb1810
fix: Fix input-bg for darkly theme
2023-06-17 01:39:48 -04:00
Jay Sitter
9885bc31eb
chore: Fix a missing theme color
2023-06-17 01:20:49 -04:00
Jay Sitter
f0bbbd181d
chore: Remove some more redundancies
2023-06-17 01:19:45 -04:00
Jay Sitter
87cf5d9b6c
chore: Remove some more redundancies
2023-06-17 01:18:35 -04:00
Jay Sitter
d2dac88cd8
chore: Fix vars
2023-06-17 00:53:44 -04:00
Jay Sitter
fb60612066
Merge remote-tracking branch 'origin/main' into chore/sass-cleanup
...
* origin/main:
Revert "fix: Sass files don't need to refer to full node_modules path"
2023-06-17 00:39:13 -04:00
Jay Sitter
42c46c18ca
chore: Remove some redundant Sass variable declarations and re-organize them
2023-06-17 00:38:30 -04:00
SleeplessOne1917
207b19dffe
Merge pull request #1342 from jsit/fix/revert-node_modules-remove
2023-06-17 04:15:52 +00:00
Jay Sitter
a41079929d
fix: Fix imports
2023-06-17 00:12:01 -04:00
Jay Sitter
366acfe106
Revert "fix: Sass files don't need to refer to full node_modules path"
...
This reverts commit ab92d7264d
2023-06-16 23:32:59 -04:00
SleeplessOne1917
28ed38c821
Merge pull request #1341 from jsit/fix/remove-node_module-paths
2023-06-17 03:19:06 +00:00
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
