diff --git a/README.md b/README.md index 4c17ef0..ee99f9e 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # mlmym a familiar desktop experience for [lemmy](https://join-lemmy.org). -![screenshot](https://raw.githubusercontent.com/rystaf/mlmym/main/screenshot.png?raw=true) +![screenshot](https://raw.githubusercontent.com/rystaf/mlmym/main/screenshot1.png?raw=true) ### deployment diff --git a/public/style.css b/public/style.css index 4aaddd3..857722a 100644 --- a/public/style.css +++ b/public/style.css @@ -76,6 +76,7 @@ code { } .comment .content { overflow:hidden; + max-width: 840px; } .comment.hidden .score { display: none; @@ -93,10 +94,10 @@ code { line-height: 17px; } .score form.like.link-btn input:first-child, .score .like div { - color: orangered; + color: #3880ff; } .score form.dislike.link-btn input:last-child, .score .dislike div { - color: #8080FF; + color: #eb445a; } .score form div { @@ -104,16 +105,19 @@ code { top: 2px; } .title a { - color: #0000ff; + color: #006414; font-size: medium; text-decoration: none; } +.title a p { + display: inline; +} .post.distinguished .title a { - color: #228822; + color: #f1641e; font-weight: bold; } .dark .title a { - color: #dedede; + color: #a0d798; } .post.deleted .title a { text-decoration: line-through; @@ -121,7 +125,7 @@ code { [disabled] { cursor: not-allowed; } -#loadmore [disabled] { +#loadmore [disabled], .link-btn [disabled] { cursor: wait; } .post .title { @@ -222,14 +226,14 @@ code { text-decoration: underline; } .comment .meta a.submitter { - background-color: #0055df; + background-color: #006414; color: white; font-weight: bold; border-radius: 3px; padding: 0px 2px; } .comment .meta a.distinguished { - background-color: #228822; + background-color: #f1641e; color: white; font-weight: bold; border-radius: 3px; @@ -482,6 +486,9 @@ form.nsfw div { font-size: 14px; overflow: auto; } +.expand .md img { + max-width: 100%; +} .dark .expando .md { background-color: #262626; color: #ddd; @@ -526,6 +533,9 @@ form.nsfw div { padding-right: 5px; margin-bottom: 10px; } +.side img, .md img{ + max-width: 100%; +} main { position: relative; } @@ -594,17 +604,17 @@ main { } .create a div { margin: 5px 0px; - background-color: #EFF7FF; + background-color: #EFFFEF; text-align: center; padding: 5px; - border: 1px solid #369; + border: 1px solid #008909; } .dark .create a div { background-color: #444444; border: 0; } .create a div:hover { - background-color: #369; + background-color: #0f7d1b; } .dark .create a div:hover { background-color: #333333; @@ -613,7 +623,7 @@ main { font-weight: bold; text-decoration: none; font-size: 13px; - color: #369; + color: #0f7d1b; } .dark .create a { color: white; @@ -622,7 +632,7 @@ main { color: white; } .dark .create a:hover{ - color: #1496dc; + color: #0cbe30; } .dark .create input[type=submit], .dark .search .query input, @@ -682,8 +692,8 @@ h1, h2 { margin-left: 36px; } nav { - border-bottom: 1px solid #5f99cf; - background-color: #cee3f8; + border-bottom: 1px solid #00a846; + background-color: #9ad59b; z-index: 99; margin-bottom: 5px; position: relative; @@ -718,6 +728,7 @@ nav .communities a.more { font-weight: bold; position: absolute; right: 0; + margin: 0; } .dark nav .communities a.more { background-color: #cccccc; @@ -743,7 +754,7 @@ nav .title, nav > span { font-variant: small-caps; } .dark nav .title, .dark nav > span { - color: #8cb3d9;; + color: #ececec; } nav a.title { margin-left: 70px; @@ -794,12 +805,12 @@ nav li { nav ul a { background-color: #eff7ff; text-decoration: none; - color: #369; + color: #006414; padding: 2px 6px 0 6px; } .dark nav ul a { background-color: #262626; - color: #6a98af; + color: #dadada; } .selected { @@ -809,7 +820,7 @@ nav ul a { nav .selected a { color: orangered; background-color: white; - border: 1px solid #5f99cf; + border: 1px solid #00a846; border-bottom: 1px solid white; } .dark nav .selected a { @@ -819,10 +830,12 @@ nav .selected a { nav .right { position: absolute; right: 0px; - background-color: #EFF7FF; + background-color: #EFFFEF; padding: 4px 6px; line-height: 12px; border-bottom-left-radius: 7px; + border-bottom-right-radius: 7px; + margin-right: 10px; color: gray; font-size: 10px; z-index: 101; @@ -837,11 +850,11 @@ nav .right a.mailbox { color: gray; } nav .right a, .right input[type=submit] { - color: #369; + color: #006414; text-decoration: none; } .dark nav .right a, .dark .right input[type=submit]{ - color: #8cb3d9; + color: #dadada; } nav .right form, .comment form, form.link-btn { display: inline-block; @@ -898,7 +911,7 @@ form.create { form.create div { margin: 10px 0px; padding: 5px 5px 10px 5px; - background-color: #cee3f8; + background-color: #9ad59b; border-radius: 4px; } .dark form.create div { diff --git a/public/utils.js b/public/utils.js index b8d57d3..50d150b 100644 --- a/public/utils.js +++ b/public/utils.js @@ -44,6 +44,7 @@ function commentClick(e) { params = new URLSearchParams(data).toString() params += "&" + e.target.name + "=" + e.target.value params += "&xhr=1" + e.target.disabled = "disabled" request(targ.target, params, function(res){ targ.outerHTML = res }) @@ -139,6 +140,7 @@ function formSubmit(e) { params = new URLSearchParams(data).toString() params += "&" + e.submitter.name + "=" + e.submitter.value params += "&xhr=1" + e.submitter.disabled = "disabled" request(targ.target, params, function(res){ targ.outerHTML = res }) diff --git a/routes.go b/routes.go index 1c465d2..9061e12 100644 --- a/routes.go +++ b/routes.go @@ -128,6 +128,8 @@ var funcMap = template.FuncMap{ converted = re.ReplaceAllString(converted, `href="/`+host+`/$1`) re = regexp.MustCompile(` !([a-zA-Z0-9]+)@([a-zA-Z0-9\.\-]+) `) converted = re.ReplaceAllString(converted, ` !$1@$2 `) + re = regexp.MustCompile(`::: spoiler ([^\n]*)\n([\S\s\n]*):::`) + converted = re.ReplaceAllString(converted, "
$1$2
") return template.HTML(converted) }, "rmmarkdown": func(body string) string { diff --git a/screenshot.png b/screenshot.png deleted file mode 100644 index ca97abe..0000000 Binary files a/screenshot.png and /dev/null differ diff --git a/screenshot1.png b/screenshot1.png new file mode 100644 index 0000000..d05c42c Binary files /dev/null and b/screenshot1.png differ diff --git a/templates/frontpage.html b/templates/frontpage.html index 93b37c6..6777a29 100644 --- a/templates/frontpage.html +++ b/templates/frontpage.html @@ -2,7 +2,7 @@ {{ if and .Community (ne .Community.CommunityView.Community.Title "")}}{{.Community.CommunityView.Community.Title}}{{else if ne .CommunityName ""}}/c/{{.CommunityName}}{{ else if .User}}overview for {{.User.PersonView.Person.Name}}{{else}}{{ host .Host }}{{end}} - + @@ -55,6 +55,6 @@ {{ template "sidebar.html" . }} {{ end }} - + diff --git a/templates/login.html b/templates/login.html index 700d16e..4d842ff 100644 --- a/templates/login.html +++ b/templates/login.html @@ -2,7 +2,7 @@ {{ host .Host }}: sign up or log in - + diff --git a/templates/main.html b/templates/main.html index ff58533..04ccd46 100644 --- a/templates/main.html +++ b/templates/main.html @@ -3,7 +3,7 @@ {{if and .Posts .PostID }}{{ (index .Posts 0).Post.Name}} : {{.CommunityName}}{{else if and .Community (ne .Community.CommunityView.Community.Title "")}}{{.Community.CommunityView.Community.Title}}{{else if ne .CommunityName ""}}/c/{{.CommunityName}}{{ else if .User}}overview for {{.User.PersonView.Person.Name}}{{else}}{{ host .Host }}{{end}} - +