diff --git a/blog.tmpl b/blog.tmpl index ecc3186..afd88a0 100644 --- a/blog.tmpl +++ b/blog.tmpl @@ -14,9 +14,10 @@
{{if eq .CurrentPage "blog"}} diff --git a/style.tmpl b/style.tmpl index c49c957..48b1090 100644 --- a/style.tmpl +++ b/style.tmpl @@ -83,11 +83,17 @@ ul { .menu{ display: flex; justify-content: center; - padding-bottom: 40px; + padding-bottom: 20px; +} + +.menuselect{ + background-color: #687fad; } .menuElement{ - padding: 20px + border: 20px; + padding: 10px; + text-decoration: none; } .menuElement:hover { diff --git a/websiteTemplate.go b/websiteTemplate.go index 5fb24d1..d7c6319 100644 --- a/websiteTemplate.go +++ b/websiteTemplate.go @@ -11,7 +11,6 @@ import ( //Page : Is exported to PostCollection type Page struct { Title string - MenuItems []template.HTML Posts []Post CurrentPage string } @@ -19,11 +18,6 @@ type Page struct { var style = `` var name = "takunomi" var posts []Post -var sections = []template.HTML{ - `about`, - `past`, - `contact`, -} var templates = template.Must(template.ParseFiles("blog.tmpl", "about.tmpl", "past.tmpl", "contact.tmpl", "blog_roll.tmpl", "style.tmpl", "post.tmpl")) func main() { @@ -59,29 +53,29 @@ func blogHandler(w http.ResponseWriter, req *http.Request) { return } posts = getNewestPosts(3) - page := Page{name, sections, posts, "blog"} + page := Page{name, posts, "blog"} renderTemplates(w, page) } func postHandler(w http.ResponseWriter, r *http.Request) { title := strings.TrimPrefix(r.URL.Path, "/post/") posts := []Post{getPostByURLTitle(title)} - page := Page{name, sections, posts, "blog"} + page := Page{name, posts, "blog"} renderTemplates(w, page) } func aboutHandler(w http.ResponseWriter, r *http.Request) { - page := Page{name, sections, []Post{}, "about"} + page := Page{name, []Post{}, "about"} renderTemplates(w, page) } func pastHandler(w http.ResponseWriter, r *http.Request) { - page := Page{name, sections, posts, "past"} + page := Page{name, posts, "past"} renderTemplates(w, page) } func contactHandler(w http.ResponseWriter, r *http.Request) { - page := Page{name, sections, []Post{}, "contact"} + page := Page{name, []Post{}, "contact"} renderTemplates(w, page) }