From 6284f1e7ef609def769d5f801fc389e91cc7e4ea Mon Sep 17 00:00:00 2001 From: Max Nullov Date: Sat, 15 Feb 2025 10:56:34 +0300 Subject: [PATCH] Block margin fix + matrix link --- web/static/styling/basic-styling.templ | 4 +- web/static/styling/basic-styling_templ.go | 4 +- web/templates/blog.templ | 6 +-- web/templates/blog_templ.go | 61 ++++++++++------------- web/templates/constructionBlocks.templ | 2 +- web/templates/constructionBlocks_templ.go | 2 +- 6 files changed, 34 insertions(+), 45 deletions(-) diff --git a/web/static/styling/basic-styling.templ b/web/static/styling/basic-styling.templ index 21d1dd5..e1acc88 100644 --- a/web/static/styling/basic-styling.templ +++ b/web/static/styling/basic-styling.templ @@ -52,8 +52,8 @@ css Textcontainer() { css BlogContainer() { font-size: 16px; font-family: Roboto; - margin-right: 150px; - margin-left: 150px; + margin-right: 10%; + margin-left: 10%; position: relative; color: { textColor }; } diff --git a/web/static/styling/basic-styling_templ.go b/web/static/styling/basic-styling_templ.go index f7d441f..440edbe 100644 --- a/web/static/styling/basic-styling_templ.go +++ b/web/static/styling/basic-styling_templ.go @@ -90,8 +90,8 @@ func BlogContainer() templ.CSSClass { templ_7745c5c3_CSSBuilder := templruntime.GetBuilder() templ_7745c5c3_CSSBuilder.WriteString(`font-size:16px;`) templ_7745c5c3_CSSBuilder.WriteString(`font-family:Roboto;`) - templ_7745c5c3_CSSBuilder.WriteString(`margin-right:150px;`) - templ_7745c5c3_CSSBuilder.WriteString(`margin-left:150px;`) + templ_7745c5c3_CSSBuilder.WriteString(`margin-right:10%;`) + templ_7745c5c3_CSSBuilder.WriteString(`margin-left:10%;`) templ_7745c5c3_CSSBuilder.WriteString(`position:relative;`) templ_7745c5c3_CSSBuilder.WriteString(string(templ.SanitizeCSS(`color`, textColor))) templ_7745c5c3_CSSID := templ.CSSID(`BlogContainer`, templ_7745c5c3_CSSBuilder.String()) diff --git a/web/templates/blog.templ b/web/templates/blog.templ index ca2963e..6d64193 100644 --- a/web/templates/blog.templ +++ b/web/templates/blog.templ @@ -74,10 +74,8 @@ templ ShowBlogPage(posts []repositories.Post) { for i := len(posts) - 1; i>=0; i-- {
-

- - {posts[i].Header} - +

+ {posts[i].Header}

{{ diff --git a/web/templates/blog_templ.go b/web/templates/blog_templ.go index ea3eb86..eb4ca58 100644 --- a/web/templates/blog_templ.go +++ b/web/templates/blog_templ.go @@ -392,7 +392,7 @@ func ShowBlogPage(posts []repositories.Post) templ.Component { if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 20, "\">

") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 20, "\">") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } @@ -401,7 +401,7 @@ func ShowBlogPage(posts []repositories.Post) templ.Component { if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 21, "") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - var templ_7745c5c3_Var27 templ.SafeURL = templ.URL(fmt.Sprintf("/post/%v", posts[i].Id)) - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(string(templ_7745c5c3_Var27))) + var templ_7745c5c3_Var27 string + templ_7745c5c3_Var27, templ_7745c5c3_Err = templ.JoinStringErrs(posts[i].Header) + if templ_7745c5c3_Err != nil { + return templ.Error{Err: templ_7745c5c3_Err, FileName: `web/templates/blog.templ`, Line: 78, Col: 32} + } + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var27)) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 23, "\">") - if templ_7745c5c3_Err != nil { - return templ_7745c5c3_Err - } - var templ_7745c5c3_Var28 string - templ_7745c5c3_Var28, templ_7745c5c3_Err = templ.JoinStringErrs(posts[i].Header) - if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `web/templates/blog.templ`, Line: 79, Col: 36} - } - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var28)) - if templ_7745c5c3_Err != nil { - return templ_7745c5c3_Err - } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 24, "

") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 23, "") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } @@ -446,51 +437,51 @@ func ShowBlogPage(posts []repositories.Post) templ.Component { postWords := strings.Fields(posts[i].Content) postCap := int(math.Sqrt(float64(len(postWords)) * 5)) shortStr := postWords[:postCap] - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 25, "

") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 24, "

") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - var templ_7745c5c3_Var29 string - templ_7745c5c3_Var29, templ_7745c5c3_Err = templ.JoinStringErrs(strings.Join(shortStr, " ")) + var templ_7745c5c3_Var28 string + templ_7745c5c3_Var28, templ_7745c5c3_Err = templ.JoinStringErrs(strings.Join(shortStr, " ")) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `web/templates/blog.templ`, Line: 92, Col: 62} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `web/templates/blog.templ`, Line: 90, Col: 62} } - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var29)) + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var28)) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 26, "...

") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 25, "...

") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - var templ_7745c5c3_Var30 = []any{styling.HighlightText()} - templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var30...) + var templ_7745c5c3_Var29 = []any{styling.HighlightText()} + templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var29...) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 27, "Читать полностью...
") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 28, "\">Читать полностью...") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } diff --git a/web/templates/constructionBlocks.templ b/web/templates/constructionBlocks.templ index b723d88..38f9712 100644 --- a/web/templates/constructionBlocks.templ +++ b/web/templates/constructionBlocks.templ @@ -57,7 +57,7 @@ templ UsefulLinks() {

Telegram - "@nullmax17"

-

Signal - "nullmax.17"

+

Matrix - "@nullmax17:matrix.org"

My friends: Lunf diff --git a/web/templates/constructionBlocks_templ.go b/web/templates/constructionBlocks_templ.go index 1578142..6ab9f61 100644 --- a/web/templates/constructionBlocks_templ.go +++ b/web/templates/constructionBlocks_templ.go @@ -128,7 +128,7 @@ func UsefulLinks() templ.Component { if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 5, "\">

You can find source code of this website here.

Telegram - \"@nullmax17\"

Signal - \"nullmax.17\"

My friends: Lunf Madam_ovi

") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 5, "\">

You can find source code of this website here.

Telegram - \"@nullmax17\"

Matrix - \"@nullmax17:matrix.org\"

My friends: Lunf Madam_ovi

") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err }