summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CHANGELOG.txt11
-rw-r--r--css/content.css1
-rw-r--r--css/copyrightNotice.css12
-rw-r--r--css/navigationBar.css3
-rw-r--r--css/page.css33
-rw-r--r--html/about.html11
-rw-r--r--html/topic/astronomy.html1
-rw-r--r--html/topic/chemistry.html1
-rw-r--r--html/topic/french.html1
-rw-r--r--html/topic/german.html1
-rw-r--r--html/topic/greek.html1
-rw-r--r--html/topic/history.html1
-rw-r--r--html/topic/latin.html93
-rw-r--r--html/topic/mathematics.html1
-rw-r--r--html/topic/physics.html1
-rw-r--r--html/topic/social-science.html1
-rw-r--r--html/topic/spanish.html1
-rw-r--r--shtml/copyrightNotice.shtml2
-rw-r--r--shtml/head.shtml1
-rw-r--r--shtml/titleSuffix.shtml2
-rw-r--r--svg/achernar.svg3
21 files changed, 161 insertions, 21 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 5777293..cf6c220 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,3 +1,14 @@
+# A
+
+* css: Update navigation bar and copyright notice;
+* svg: Update logo;
+* html: Give each page it's own title;
+* latin: Add grammar section;
+* html: Use hyphen in interval in copyright notice;
+* css: Add footnotes;
+* latin: Explain cases more;
+* latin: Add glossary section;
+
# 9
* styling: Add specific styling for notes;
diff --git a/css/content.css b/css/content.css
index 3763889..4208b4d 100644
--- a/css/content.css
+++ b/css/content.css
@@ -1,6 +1,7 @@
div.content {
background-color:var(--foregroundColour);
border-radius: 1rem;
+ color: var(--backgroundColour);
margin: 0 auto;
max-width: var(--maximumPageWidth);
min-width: var(--minimumPageWidth);
diff --git a/css/copyrightNotice.css b/css/copyrightNotice.css
index d98ec70..ba2b5c7 100644
--- a/css/copyrightNotice.css
+++ b/css/copyrightNotice.css
@@ -1,10 +1,10 @@
div.copyrightNotice {
- color: var(--backgroundColour);
- font-weight:bold;
- margin: 0 auto;
- margin-top: 1rem;
- text-align: center;
- width: fit-content;
+ background-color:none;
+ font-weight: bold;
+ margin: 0 auto;
+ margin-top: 1rem;
+ text-align: center;
+ width: fit-content;
}
div.copyrightNotice p.projectName {
diff --git a/css/navigationBar.css b/css/navigationBar.css
index 2005eda..7494ff1 100644
--- a/css/navigationBar.css
+++ b/css/navigationBar.css
@@ -1,7 +1,6 @@
div.navigationBar {
- background-color:var(--foregroundColour);
+ background-color:none;
border-radius: 1rem;
- color: var(--backgroundColour);
font-family: var(--sansSerifFont);
font-weight: bold;
padding: 1rem 2rem;
diff --git a/css/page.css b/css/page.css
index 1a845f9..3280281 100644
--- a/css/page.css
+++ b/css/page.css
@@ -1,11 +1,21 @@
div.page {
background-color:var(--backgroundColour);
border-radius: 1rem;
+ color: var(--foregroundColour);
padding: 1rem 2rem;
text-align: left;
width: 100%;
}
+div.page span.footnote {
+ font-size: calc(2rem / 3);
+ vertical-align:sub;
+}
+
+div.page span.footnote::before {
+ content:"\0020";
+}
+
div.page p.pageHeading,div.page div.section p.sectionHeading {
font-family:var(--sansSerifFont);
font-weight:bold;
@@ -18,6 +28,19 @@ div.page p.pageHeading {
text-align: right;
}
+div.page p.vocable + p.vocable {
+ margin-top:calc(1rem / 2);
+}
+
+div.page p.vocable span.vocable {
+ font-style:italic;
+}
+
+div.page p.vocable span.vocable + span.vocable::before {
+ content: "\0020\2014\0020";
+ font-style:normal;
+}
+
div.page p.note {
font-style:italic;
}
@@ -30,6 +53,16 @@ div.page p.note span.emphasis {
font-weight:bold;
}
+div.page p.footnote {
+ font-size: calc(2rem / 3);
+ font-style:italic;
+ margin-top:calc(1rem / 2);
+}
+
+div.page p + p.footnote {
+ margin-top:1rem;
+}
+
div.page table tr.small {
font-size:calc(2rem / 3);
}
diff --git a/html/about.html b/html/about.html
index 23879e3..a50c5f3 100644
--- a/html/about.html
+++ b/html/about.html
@@ -1,6 +1,7 @@
<!DOCTYPE html>
<html lang="da">
<!--#include virtual="/shtml/head.shtml"-->
+ <title>Om<!--#include virtual="/shtml/titleSuffix.shtml"--></title>
<body>
<!--#include virtual="/shtml/logotype.shtml"-->
<div class="content">
@@ -18,16 +19,16 @@
<p>Naturvidenskab</p>
<ul>
<li>
- <p><a href="/html/topic/astronomy.html">Astronomi</a><sub> &dagger;</sub></p>
+ <p><a href="/html/topic/astronomy.html">Astronomi</a><span class="footnote">&dagger;</span></p>
</li>
<li>
- <p><a href="/html/topic/chemistry.html">Kemi</a><sub> &dagger;</sub></p>
+ <p><a href="/html/topic/chemistry.html">Kemi</a><span class="footnote">&dagger;</span></p>
</li>
<li>
- <p><a href="/html/topic/physics.html">Fysik</a><sub> &dagger;</sub></p>
+ <p><a href="/html/topic/physics.html">Fysik</a><span class="footnote">&dagger;</span></p>
</li>
<li>
- <p><a href="/html/topic/mathematics.html">Matematik</a><sub> &dagger;</sub></p>
+ <p><a href="/html/topic/mathematics.html">Matematik</a><span class="footnote">&dagger;</span></p>
</li>
</ul>
</li>
@@ -63,7 +64,7 @@
</ul>
</li>
</ul>
- <p><sup>&dagger;</sup><sub> Kræver JavaScript for at udtrykke formler korrekt.</sub></p>
+ <p class="footnote">&dagger; Kræver JavaScript for at udtrykke formler korrekt.</p>
</div>
</div>
<!--#include virtual="/shtml/copyrightNotice.shtml"-->
diff --git a/html/topic/astronomy.html b/html/topic/astronomy.html
index c273693..4aa93c2 100644
--- a/html/topic/astronomy.html
+++ b/html/topic/astronomy.html
@@ -2,6 +2,7 @@
<html lang="da">
<!--#include virtual="/shtml/head.shtml"-->
<!--#include virtual="/shtml/mathJax.shtml"-->
+ <title>Astronomi<!--#include virtual="/shtml/titleSuffix.shtml"--></title>
<body>
<!--#include virtual="/shtml/logotype.shtml"-->
<div class="content">
diff --git a/html/topic/chemistry.html b/html/topic/chemistry.html
index 39c079d..0eebdcc 100644
--- a/html/topic/chemistry.html
+++ b/html/topic/chemistry.html
@@ -2,6 +2,7 @@
<html lang="da">
<!--#include virtual="/shtml/head.shtml"-->
<!--#include virtual="/shtml/mathJax.shtml"-->
+ <title>Kemi<!--#include virtual="/shtml/titleSuffix.shtml"--></title>
<body>
<!--#include virtual="/shtml/logotype.shtml"-->
<div class="content">
diff --git a/html/topic/french.html b/html/topic/french.html
index 364a6ba..c3aec57 100644
--- a/html/topic/french.html
+++ b/html/topic/french.html
@@ -1,6 +1,7 @@
<!DOCTYPE html>
<html lang="da">
<!--#include virtual="/shtml/head.shtml"-->
+ <title>Fransk<!--#include virtual="/shtml/titleSuffix.shtml"--></title>
<body>
<!--#include virtual="/shtml/logotype.shtml"-->
<div class="content">
diff --git a/html/topic/german.html b/html/topic/german.html
index cd61e60..89ba63c 100644
--- a/html/topic/german.html
+++ b/html/topic/german.html
@@ -1,6 +1,7 @@
<!DOCTYPE html>
<html lang="da">
<!--#include virtual="/shtml/head.shtml"-->
+ <title>Tysk<!--#include virtual="/shtml/titleSuffix.shtml"--></title>
<body>
<!--#include virtual="/shtml/logotype.shtml"-->
<div class="content">
diff --git a/html/topic/greek.html b/html/topic/greek.html
index 04d3597..f080838 100644
--- a/html/topic/greek.html
+++ b/html/topic/greek.html
@@ -1,6 +1,7 @@
<!DOCTYPE html>
<html lang="da">
<!--#include virtual="/shtml/head.shtml"-->
+ <title>Græsk<!--#include virtual="/shtml/titleSuffix.shtml"--></title>
<body>
<!--#include virtual="/shtml/logotype.shtml"-->
<div class="content">
diff --git a/html/topic/history.html b/html/topic/history.html
index ac54fb9..e1afdf5 100644
--- a/html/topic/history.html
+++ b/html/topic/history.html
@@ -1,6 +1,7 @@
<!DOCTYPE html>
<html lang="da">
<!--#include virtual="/shtml/head.shtml"-->
+ <title>Historie<!--#include virtual="/shtml/titleSuffix.shtml"--></title>
<body>
<!--#include virtual="/shtml/logotype.shtml"-->
<div class="content">
diff --git a/html/topic/latin.html b/html/topic/latin.html
index c91f9a7..d981592 100644
--- a/html/topic/latin.html
+++ b/html/topic/latin.html
@@ -1,6 +1,7 @@
<!DOCTYPE html>
<html lang="da">
<!--#include virtual="/shtml/head.shtml"-->
+ <title>Latin<!--#include virtual="/shtml/titleSuffix.shtml"--></title>
<body>
<!--#include virtual="/shtml/logotype.shtml"-->
<div class="content">
@@ -8,6 +9,40 @@
<div class="page">
<p class="pageHeading">Latin</p>
<div class="section" id="roman-numerals">
+ <p class="sectionHeading">Grammatik</p>
+ <table>
+ <tr>
+ <th>Sætningsled</th>
+ <th>Tegn</th>
+ </tr>
+ <tr>
+ <td>Subjekt</td>
+ <td>&times;</td>
+ </tr>
+ <tr>
+ <td>Subjektsprædikat</td>
+ <td>&otimes;</td>
+ </tr>
+ <tr>
+ <td>Direkte objekt</td>
+ <td>&#9651;</td>
+ </tr>
+ <tr>
+ <td>Indirekte objekt</td>
+ <td>&#9633;</td>
+ </tr>
+ <tr>
+ <td>Verballed</td>
+ <td>&#9675;</td>
+ </tr>
+ <tr>
+ <td>Adverbialled</td>
+ <td>&#65103;</td>
+ </tr>
+ </table>
+ <p>I modsætning til sprog som dansk, fransk og tysk, så har latin ikke nogen formele regler for rækkefølgen af de forskellige sætningsled. Til gengæld, så har sproget i stedet et system af <span class="emphasis">kasus</span> (fald), hvori sætningens substantiver, pronominer og adjektiver bøjes ud fra deres sætningsled (se <a href="#declension">deklination</a>).</p>
+ </div>
+ <div class="section" id="roman-numerals">
<p class="sectionHeading">Romertal</p>
<p>Romertal er den primære måde at udtrykke tal i latin, samt andre europæiske sprog op til skiftet til arabertal. Romertal bruger tegn fra det latinske alfabet til at udtrykke værdier. Det bruger ikke cifre (i modsætning til arabertal).</p>
<table>
@@ -19,7 +54,7 @@
</thead>
<tbod>
<tr>
- <td>N<sub> &dagger;</sub></td>
+ <td>N<span class="footnote"> &dagger;</span></td>
<td class="rightAlign">0</td>
</tr>
<tr>
@@ -52,7 +87,7 @@
</tr>
</tbod>
</table>
- <p class="graphicText"><sup>&dagger;</sup> Per konventien, fra ordet "nulla".</p>
+ <p class="footnote">&dagger; Per konventien, fra ordet "nulla".</p>
<p>For at udtrykke talværdier uden et tilsvarende tegn, så opstiller man dem som en kombination af tegn. Skriver man et mindre tegn (lige) før et større, så trækkes det mindre fra det større. Står det største først, så lægges de sammen.</p>
<br />
<p>For eksempel, så bliver fire (4) til IV (5&minus;1), og seks (6) bliver til VI (5+1). I nogle traditioner bruger man ikke subtration, og i således en ville fire blive til IIII (1+1+1+1).</p>
@@ -190,6 +225,34 @@
<div class="section" id="declension">
<p class="sectionHeading">Deklination</p>
<table>
+ <tr>
+ <th>Kasus</th>
+ <th>Sætningsled</th>
+ </tr>
+ <tr>
+ <td>Nominativ (nævnefald)</td>
+ <td>Subjekt</td>
+ </tr>
+ <tr>
+ <td>Vokativ</td>
+ </tr>
+ <tr>
+ <td>Akkusativ (genstandsfald)</td>
+ <td>Direkte objekt (el. adverbialled ved præp.)</td>
+ </tr>
+ <tr>
+ <td>Genitiv (ejefald)</td>
+ </tr>
+ <tr>
+ <td>Dativ (hensynsfald)</td>
+ <td>Indirekte objekt</td>
+ </tr>
+ <tr>
+ <td>Ablativ</td>
+ <td>Adverbialled</td>
+ </tr>
+ </table>
+ <table>
<thead>
<tr class="small">
<th></th>
@@ -310,13 +373,13 @@
</tr>
<tr>
<th>Vocātīvus</th>
- <td>de&thinsp;<b><span class="emphasis">us</span></b></td>
- <td>vīr&thinsp;<b><span class="emphasis">us</span></b></td>
+ <td>de&thinsp;<b><i>us</i></b></td>
+ <td>vīr&thinsp;<b><i>us</i></b></td>
</tr>
<tr>
<th>Accūsātīvus</th>
<td>de&thinsp;<b>um</b></td>
- <td>vīr&thinsp;<b><span class="emphasis">us</span></b></td>
+ <td>vīr&thinsp;<b><i>us</i></b></td>
</tr>
<tr>
<th>Genetīvus</th>
@@ -370,6 +433,26 @@
</tbody>
</table>
</div>
+ <div class="section" id="glossary">
+ <p class="sectionHeading">Gloseliste</p>
+ <p class="vocable"><span class="vocable">aedificō vb.</span><span class="vocable">jeg bygger, jeg opfører</span></p>
+ <p class="vocable"><span class="vocable">amō vb.</span><span class="vocable">jeg elsker, jeg holder af</span></p>
+ <p class="vocable"><span class="vocable">arx sb. f3</span><span class="vocable">borg, fort, fæstning</span></p>
+ <p class="vocable"><span class="vocable">castellum sb. n2</span><span class="vocable">borg, palads</span></p>
+ <p class="vocable"><span class="vocable">contra (akk) præp.</span><span class="vocable">imod, mod</span></p>
+ <p class="vocable"><span class="vocable">creō vb.</span><span class="vocable">jeg skaber</span></p>
+ <p class="vocable"><span class="vocable">dominus sb. m2</span><span class="vocable">herre (religion), hersker, kejser</span></p>
+ <p class="vocable"><span class="vocable">egō pron.</span><span class="vocable">jeg</span></p>
+ <p class="vocable"><span class="vocable">ex (abl) præp.</span><span class="vocable">fra</span></p>
+ <p class="vocable"><span class="vocable">habeō vb.</span><span class="vocable">jeg har</span></p>
+ <p class="vocable"><span class="vocable">hic adj.</span><span class="vocable">denne/dette</span></p>
+ <p class="vocable"><span class="vocable">hic pron.</span><span class="vocable">denne/dette</span></p>
+ <p class="vocable"><span class="vocable">in (abl/akk) præp.</span><span class="vocable">i/på (abl, som mål med akk)</span></p>
+ <p class="vocable"><span class="vocable">magnus adj.</span><span class="vocable">stor, storartet</span></p>
+ <p class="vocable"><span class="vocable">rēgīna sb. f1</span><span class="vocable">dronning</span></p>
+ <p class="vocable"><span class="vocable">rēx sb. m3</span><span class="vocable">konge</span></p>
+ <p class="vocable"><span class="vocable">sum vb.</span><span class="vocable">jeg er</span></p>
+ </div>
</div>
<!--#include virtual="/shtml/copyrightNotice.shtml"-->
</div>
diff --git a/html/topic/mathematics.html b/html/topic/mathematics.html
index 6dd6f11..3c39bcf 100644
--- a/html/topic/mathematics.html
+++ b/html/topic/mathematics.html
@@ -2,6 +2,7 @@
<html lang="da">
<!--#include virtual="/shtml/head.shtml"-->
<!--#include virtual="/shtml/mathJax.shtml"-->
+ <title>Matematik<!--#include virtual="/shtml/titleSuffix.shtml"--></title>
<body>
<!--#include virtual="/shtml/logotype.shtml"-->
<div class="content">
diff --git a/html/topic/physics.html b/html/topic/physics.html
index 1fb400d..63bb7eb 100644
--- a/html/topic/physics.html
+++ b/html/topic/physics.html
@@ -2,6 +2,7 @@
<html lang="da">
<!--#include virtual="/shtml/head.shtml"-->
<!--#include virtual="/shtml/mathJax.shtml"-->
+ <title>Fysik<!--#include virtual="/shtml/titleSuffix.shtml"--></title>
<body>
<!--#include virtual="/shtml/logotype.shtml"-->
<div class="content">
diff --git a/html/topic/social-science.html b/html/topic/social-science.html
index a30c0d3..b39c63a 100644
--- a/html/topic/social-science.html
+++ b/html/topic/social-science.html
@@ -1,6 +1,7 @@
<!DOCTYPE html>
<html lang="da">
<!--#include virtual="/shtml/head.shtml"-->
+ <title>Samfundsfag<!--#include virtual="/shtml/titleSuffix.shtml"--></title>
<body>
<!--#include virtual="/shtml/logotype.shtml"-->
<div class="content">
diff --git a/html/topic/spanish.html b/html/topic/spanish.html
index c68b117..7b9b57d 100644
--- a/html/topic/spanish.html
+++ b/html/topic/spanish.html
@@ -1,6 +1,7 @@
<!DOCTYPE html>
<html lang="da">
<!--#include virtual="/shtml/head.shtml"-->
+ <title>Spansk<!--#include virtual="/shtml/titleSuffix.shtml"--></title>
<body>
<!--#include virtual="/shtml/logotype.shtml"-->
<div class="content">
diff --git a/shtml/copyrightNotice.shtml b/shtml/copyrightNotice.shtml
index d41b2da..8dc68e0 100644
--- a/shtml/copyrightNotice.shtml
+++ b/shtml/copyrightNotice.shtml
@@ -1,5 +1,5 @@
<div class="copyrightNotice">
<p class="projectName">Fagligt Opslagsværk</p>
- <p class="info">Copyright 2022-2023</p>
+ <p class="info">Copyright 2022&hyphen;2023</p>
<p class="info">Gabriel Jensen</p>
</div>
diff --git a/shtml/head.shtml b/shtml/head.shtml
index 2c9a1da..f96d453 100644
--- a/shtml/head.shtml
+++ b/shtml/head.shtml
@@ -1,6 +1,5 @@
<head>
<meta charset="UTF-8" />
- <title>Fagligt Opslagsværk &ndash; Achernar</title>
<link href="/svg/achernar.svg" rel="icon" />
<link href="/css/main.css" rel="stylesheet" />
<noscript>
diff --git a/shtml/titleSuffix.shtml b/shtml/titleSuffix.shtml
new file mode 100644
index 0000000..c2f2243
--- /dev/null
+++ b/shtml/titleSuffix.shtml
@@ -0,0 +1,2 @@
+ &ndash; Fagligt Opslagsværk &ndash; Achernar
+ \ No newline at end of file
diff --git a/svg/achernar.svg b/svg/achernar.svg
index 6250dc6..2c7d650 100644
--- a/svg/achernar.svg
+++ b/svg/achernar.svg
@@ -1,4 +1,5 @@
<svg height="60" width="60" xmlns="http://www.w3.org/2000/svg">
- <rect fill="#5F7C9C" height="60" width="60" x="0" y="0" />
+ <rect fill="#1B1A1A" height="60" rx="12" width="60" x="0" y="0" />
+ <rect fill="#1B1A1A" height="12" width="12" x="0" y="0" />
<polygon fill="#F6F4F4" points="12,48 30,12 48,48 37.267,48 27.317,28.1 17.367,48" />
</svg>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 03:19:10 +0100