diff --git a/dict/main.go b/dict/main.go
index 2261a1c..523a5be 100644
--- a/dict/main.go
+++ b/dict/main.go
@@ -136,7 +136,12 @@ type Entry struct {
type Definition struct {
Definition string
- PartOfSpeech []string
+ PartOfSpeech []PartOfSpeech
+}
+
+type PartOfSpeech struct {
+ Description string
+ Type string
}
func ParseEntry(entry *jmdict.JmdictEntry, furiganaInfo *string) Entry {
@@ -159,9 +164,31 @@ func ParseEntry(entry *jmdict.JmdictEntry, furiganaInfo *string) Entry {
definition += "; " + glossary.Content
}
}
+ pos := make([]PartOfSpeech, len(sense.PartsOfSpeech))
+ for i, posFull := range sense.PartsOfSpeech {
+ class := ""
+ if strings.Contains(posFull, "noun") {
+ class = "noun"
+ } else if strings.Contains(posFull, "adjective") {
+ class = "adjective"
+ } else if strings.Contains(posFull, "adverb") {
+ class = "adverb"
+ } else if strings.Contains(posFull, "verb") {
+ class = "verb"
+ } else if strings.Contains(posFull, "particle") {
+ class = "particle"
+ } else if strings.Contains(posFull, "phrase") {
+ class = "phrase"
+ }
+ pos[i] = PartOfSpeech{
+ Description: posFull,
+ Type: class,
+ }
+ }
+
definitions[i] = Definition{
Definition: definition,
- PartOfSpeech: sense.PartsOfSpeech,
+ PartOfSpeech: pos,
}
}
// 1:ねが;3:いた
diff --git a/dict/static/overrides.css b/dict/static/overrides.css
new file mode 100644
index 0000000..7c09cc5
--- /dev/null
+++ b/dict/static/overrides.css
@@ -0,0 +1,55 @@
+:root {
+ --bg: #282828 !important;
+ --fg: #ebdbb2 !important;
+
+ --box-bg: #3c3836 !important; /* bg1 */
+ --graphical-fg: #928374 !important; /* gray */
+
+ --info-graphical-fg: red !important;
+}
+
+chip {
+ white-space: nowrap;
+}
+
+.noun {
+ --box-bg: #79740e;
+ --accent: #b8bb26;
+ --graphical-fg: #98971a;
+}
+
+.adjective {
+ --box-bg: #9d0006;
+ --accent: #fb4934;
+ --graphical-fg: #cc241d;
+}
+
+.verb, .adverb {
+ --box-bg: #076678;
+ --accent: #83a598;
+ --graphical-fg: #458588;
+}
+
+.particle {
+ --box-bg: #b57614;
+ --accent: #fabd2f;
+ --graphical-fg: #d79921;
+}
+
+.phrase {
+ --box-bg: #8f3f71;
+ --accent: #d3869b;
+ --graphical-fg: #b16286;
+}
+
+li {
+ margin-top: 0.75em;
+}
+
+#results .box h3 a {
+ color: inherit;
+}
+
+#results .box h3 a:not(:hover) {
+ text-decoration: none;
+}
\ No newline at end of file
diff --git a/dict/templates/index.html b/dict/templates/index.html
index 308a442..87670a2 100644
--- a/dict/templates/index.html
+++ b/dict/templates/index.html
@@ -6,17 +6,7 @@
{{ block "title" . }}{{ template "sitetitle" . }}{{ end }}
-
+
diff --git a/dict/templates/partials/definition.html b/dict/templates/partials/definition.html
index cc826d4..67554ea 100644
--- a/dict/templates/partials/definition.html
+++ b/dict/templates/partials/definition.html
@@ -1,3 +1,3 @@
{{- define "definition" -}}
-{{ if .PartOfSpeech }}{{ .PartOfSpeech }}
{{ end }}{{ highlight .Definition -}}
+{{ if .PartOfSpeech }}{{ range .PartOfSpeech }}{{ .Description }} {{ end }}
{{ end }}{{ highlight .Definition -}}
{{ end }}
\ No newline at end of file