summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.txt12
-rw-r--r--reference/css/base.css8
-rw-r--r--reference/css/page.css29
-rw-r--r--reference/css/pageFooter.css11
-rw-r--r--reference/css/pageHeader.css25
-rw-r--r--reference/css/root.css6
-rw-r--r--reference/html/about.html8
-rw-r--r--reference/html/astronomy.html6
-rw-r--r--reference/html/chemistry.html12
-rw-r--r--reference/html/french.html4
-rw-r--r--reference/html/german.html29
-rw-r--r--reference/html/history.html2
-rw-r--r--reference/html/latin.html8
-rw-r--r--reference/html/mathematics.html12
-rw-r--r--reference/html/physics.html24
-rw-r--r--reference/html/social-science.html2
-rw-r--r--reference/js/setTheme.js20
-rw-r--r--reference/shtml/pageFooter.shtml4
18 files changed, 146 insertions, 76 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index d295ffa..786329c 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,3 +1,15 @@
+# 1
+
+* reference: styling: Rename backgroundColour0 to bodyColour and backgroundColour1 to backgroundColour;
+* reference: Update about page text;
+* reference: german: Add conjugation of sein;
+* reference: physics: Use different terms;
+* reference: styling: Implement small table rows;
+* reference: styling: Implement subheadings;
+* reference: styling: Rename sectionTitle and pageTitle to sectionHeading and pageHeading;
+* reference: styling: Align page headings to the right;
+* reference: Add copyright notice to the page footer;
+
# 0
* Move encyclopedia frome fadaesen-webservice (and rename to reference);
diff --git a/reference/css/base.css b/reference/css/base.css
index 16de65a..04ef0ad 100644
--- a/reference/css/base.css
+++ b/reference/css/base.css
@@ -8,7 +8,6 @@ li p + ul,li p + ol {
p a,p a:visited {
color: var(--colour);
- font-weight: bold;
text-decoration:none;
}
@@ -17,8 +16,9 @@ p a:hover {
}
p.math,span.math,td.math {
- font-size:calc(3rem / 2);
- padding: calc(1rem / 3) 0;
+ font-size: calc(3rem / 2);
+ padding: calc(1rem / 3) 0;
+ user-select:none;
}
table {
@@ -34,7 +34,7 @@ td,th {
th {
background-color:var(--foregroundColour);
- color: var(--backgroundColour1);
+ color: var(--backgroundColour);
text-align: center;
}
diff --git a/reference/css/page.css b/reference/css/page.css
index 7b6354e..f1f30ce 100644
--- a/reference/css/page.css
+++ b/reference/css/page.css
@@ -1,5 +1,5 @@
div.page {
- background-color: var(--backgroundColour1);
+ background-color: var(--backgroundColour);
border-radius: 1rem;
border-top-left-radius: 0;
border-top-right-radius:0;
@@ -11,19 +11,27 @@ div.page {
width: 100%;
}
-div.page p.pageTitle,div.page div.section p.sectionTitle {
+div.page p.pageHeading,div.page div.section p.sectionHeading {
font-family:"Helvetica","sans-serif";
font-weight:bold;
}
-div.page p.pageTitle {
+div.page p.pageHeading {
font-size: 3rem;
letter-spacing:calc(1rem / 12);
margin-bottom: 1rem;
- text-align: center;
+ text-align: right;
}
-div.page div.section p.sectionTitle {
+div.page table tr.small {
+ font-size:calc(2rem / 3);
+}
+
+div.page div.section + div.section {
+ margin-top:1rem;
+}
+
+div.page div.section p.sectionHeading {
border-top-color:var(--foregroundColour);
border-top-style:solid;
border-top-width:calc(1rem / 3);
@@ -32,6 +40,13 @@ div.page div.section p.sectionTitle {
width: fit-content;
}
-div.page div.section + div.section {
- margin-top:1rem;
+div.page div.section p.subHeading {
+ font-size: calc(2rem / 3);
+ font-weight:bold;
+ margin-top: 0;
}
+
+div.page div.section p.subHeading::before {
+ content: "\0020\2014\0020";
+ font-weight:normal;
+} \ No newline at end of file
diff --git a/reference/css/pageFooter.css b/reference/css/pageFooter.css
index e69de29..2e6afed 100644
--- a/reference/css/pageFooter.css
+++ b/reference/css/pageFooter.css
@@ -0,0 +1,11 @@
+div.copyrightNotice {
+ font-weight:bold;
+ margin: 0 auto;
+ margin-top: 1rem;
+ text-align: center;
+ width: fit-content;
+}
+
+div.copyrightNotice p + p {
+ margin-top:calc(1rem / 2);
+}
diff --git a/reference/css/pageHeader.css b/reference/css/pageHeader.css
index 23321f5..a69501e 100644
--- a/reference/css/pageHeader.css
+++ b/reference/css/pageHeader.css
@@ -1,11 +1,11 @@
div.logotype {
- background-color: var(--colour);
- border-radius: calc(6rem * 12/60);
- border-top-left-radius: 0;
- height: 6rem;
- margin: 0 auto;
- margin-bottom: 1rem;
- width: 6rem;
+ background-color: var(--colour);
+ border-radius: calc(6rem * 12/60);
+ border-top-left-radius:0;
+ height: 6rem;
+ margin: 0 auto;
+ margin-bottom: 1rem;
+ width: 6rem;
}
div.logotype img {
@@ -24,7 +24,8 @@ p.title {
div.navigationBar {
background-color: var(--foregroundColour);
- color: var(--backgroundColour1);
+ color: var(--backgroundColour);
+ font-weight: bold;
margin: 0 auto;
max-width: var(--maximumPageWidth);
min-width: var(--minimumPageWidth);
@@ -34,12 +35,12 @@ div.navigationBar {
}
div.navigationBar img.themeToggler {
- background-color:var(--backgroundColour1);
- border-color: var(--backgroundColour1);
+ background-color:var(--backgroundColour);
+ border-color: var(--backgroundColour);
border-radius: calc(1rem / 3 * 2);
border-width: calc(1rem / 3);
border-style: solid;
- color: var(--backgroundColour1);
+ color: var(--backgroundColour);
cursor: pointer;
display: block;
height: calc(3rem - 1rem / 2 * 2);
@@ -58,7 +59,7 @@ div.navigationBar p,div.navigationBar p span + span::before {
}
div.navigationBar p,div.navigationBar p span a,div.navigationBar p span a:hover {
- color:var(--backgroundColour1);
+ color:var(--backgroundColour);
}
div.navigationBar p span a:hover {
diff --git a/reference/css/root.css b/reference/css/root.css
index b7d29e9..519e82f 100644
--- a/reference/css/root.css
+++ b/reference/css/root.css
@@ -5,8 +5,8 @@
--white: #F6F4F4; /* 31/32 */
--blue: #5F7C9C; /* oklch(62.5% 0.118 259.065) */
- --backgroundColour0:var(--black);
- --backgroundColour1:var(--darkgrey);
+ --bodyColour:var(--black);
+ --backgroundColour:var(--darkgrey);
--foregroundColour: var(--white);
--colour: var(--blue);
@@ -24,7 +24,7 @@
}
body {
- background-color:var(--backgroundColour0);
+ background-color:var(--bodyColour);
color: var(--foregroundColour);
padding: 1rem;
}
diff --git a/reference/html/about.html b/reference/html/about.html
index 25fcc1e..3f1c57b 100644
--- a/reference/html/about.html
+++ b/reference/html/about.html
@@ -4,12 +4,13 @@
<body>
<!--#include virtual="/shtml/pageHeader.shtml"-->
<div class="page">
- <p class="pageTitle">Om</p>
+ <p class="pageHeading">Om</p>
<div class="section">
- <p><i>Fagligt Opslagsværk</i> er et leksikon.</p>
+ <p><i>Fagligt Opslagsværk</i> er et leksikon til diverse videnskablige emner inden for natur, samfund og sprog. Finder du fejl, så bedes du venligst indberette dem til mig, Gabriel.</p>
+ <p>Denne side blev oprindeligt <i>serveret</i> på <a href="https://fadaesen.dk"><i>Fadaesens</i> hjemmeside</a>. Kildekoden til den kan findes på <a href="https://mandelbrot.dk/achernar"><i>mandelbrot.dk</i></a>.</p>
</div>
<div class="section">
- <p class="sectionTitle">Emner</p>
+ <p class="sectionHeading">Emner</p>
<ul>
<li>
<p>Naturvidenskab</p>
@@ -57,5 +58,6 @@
<p><sup>&dagger;</sup><sub> Kræver JavaScript for at udtrykke formler korrekt.</sub></p>
</div>
</div>
+ <!--#include virtual="/shtml/pageFooter.shtml"-->
</body>
</html>
diff --git a/reference/html/astronomy.html b/reference/html/astronomy.html
index bbe2728..2b6fff0 100644
--- a/reference/html/astronomy.html
+++ b/reference/html/astronomy.html
@@ -5,10 +5,10 @@
<body>
<!--#include virtual="/shtml/pageHeader.shtml"-->
<div class="page">
- <p class="pageTitle">Astronomi</p>
+ <p class="pageHeading">Astronomi</p>
<div class="section" id="measures-and-units">
- <p class="sectionTitle">Mål og Enheder</p>
- <p class="small">Jf. <a href="/html/physics.html">fysikkens mål og enheder</a>.</p>
+ <p class="sectionHeading">Mål og Enheder</p>
+ <p class="subHeading">Jf. <a href="/html/physics.html">fysikkens mål og enheder</a>.</p>
<p>Mål med variante enheder:</p>
<table>
<tr>
diff --git a/reference/html/chemistry.html b/reference/html/chemistry.html
index ea0c6b1..bc9bd12 100644
--- a/reference/html/chemistry.html
+++ b/reference/html/chemistry.html
@@ -5,10 +5,10 @@
<body>
<!--#include virtual="/shtml/pageHeader.shtml"-->
<div class="page">
- <p class="pageTitle">Kemi</p>
+ <p class="pageHeading">Kemi</p>
<div class="section" id="measures-and-units">
- <p class="sectionTitle">Mål og Enheder</p>
- <p class="small">Jf. <a href="/html/physics.html#measures-and-units">fysikkens mål og enheder</a>.</p>
+ <p class="sectionHeading">Mål og Enheder</p>
+ <p class="subHeading">Jf. <a href="/html/physics.html#measures-and-units">fysikkens mål og enheder</a>.</p>
<table>
<tr>
<th>Mål</th>
@@ -110,7 +110,7 @@
<p class="math">\(1\ L=\frac {1}{10^3}\ m^3\)</p>
</div>
<div class="section" id="formulas">
- <p class="sectionTitle">Formler</p>
+ <p class="sectionHeading">Formler</p>
<p class="math">\(c_i=\frac {n_i}{\sum_j V_j}\)</p>
<br />
<p class="math">\(M=\frac {m}{n}\)</p>
@@ -126,8 +126,8 @@
<p class="math">\(\phi_i=\frac {V_i}{\sum_j V_j}\)</p>
</div>
<div class="section" id="constants">
- <p class="sectionTitle">Konstanter</p>
- <p class="small">Jf. <a href="/html/physics.html#constants">fysikkens</a> og <a href="/html/mathematics.html#constants">matematikkens</a> konstanter.</p>
+ <p class="sectionHeading">Konstanter</p>
+ <p class="subHeading">Jf. <a href="/html/physics.html#constants">fysikkens</a> og <a href="/html/mathematics.html#constants">matematikkens</a> konstanter.</p>
<table>
<tr>
<th>Navn</th>
diff --git a/reference/html/french.html b/reference/html/french.html
index e688e81..fce0b63 100644
--- a/reference/html/french.html
+++ b/reference/html/french.html
@@ -4,9 +4,9 @@
<body>
<!--#include virtual="/shtml/pageHeader.shtml"-->
<div class="page">
- <p class="pageTitle">Fransk</p>
+ <p class="pageHeading">Fransk</p>
<div class="section" id="conjugation">
- <p class="sectionTitle">Konjugation</p>
+ <p class="sectionHeading">Konjugation</p>
<table>
<tr>
<th></th>
diff --git a/reference/html/german.html b/reference/html/german.html
index 06ca657..2c8d46e 100644
--- a/reference/html/german.html
+++ b/reference/html/german.html
@@ -4,9 +4,34 @@
<body>
<!--#include virtual="/shtml/pageHeader.shtml"-->
<div class="page">
- <p class="pageTitle">Tysk</p>
+ <p class="pageHeading">Tysk</p>
<div class="section">
- <p>Kommer senere.</p>
+ <table>
+ <tr>
+ <th></th>
+ <th colspan="2">sein</th>
+ </tr>
+ <tr>
+ <th></th>
+ <th>Singularis</th>
+ <th>Pluralis</th>
+ </tr>
+ <tr>
+ <th>Førsteperson</th>
+ <td>bin</td>
+ <td>sind</td>
+ </tr>
+ <tr>
+ <th>Andenperson</th>
+ <td>bist</td>
+ <td>seid</td>
+ </tr>
+ <tr>
+ <th>Tredjeperson</th>
+ <td>ist</td>
+ <td>sind</td>
+ </tr>
+ </table>
</div>
</div>
<!--#include virtual="/shtml/pageFooter.shtml"-->
diff --git a/reference/html/history.html b/reference/html/history.html
index b1cbc62..e282bd3 100644
--- a/reference/html/history.html
+++ b/reference/html/history.html
@@ -4,7 +4,7 @@
<body>
<!--#include virtual="/shtml/pageHeader.shtml"-->
<div class="page">
- <p class="pageTitle">Historie</p>
+ <p class="pageHeading">Historie</p>
<div class="section">
<p>Kommer senere.</p>
</div>
diff --git a/reference/html/latin.html b/reference/html/latin.html
index 14213b8..0f53103 100644
--- a/reference/html/latin.html
+++ b/reference/html/latin.html
@@ -4,9 +4,9 @@
<body>
<!--#include virtual="/shtml/pageHeader.shtml"-->
<div class="page">
- <p class="pageTitle">Latin</p>
+ <p class="pageHeading">Latin</p>
<div class="section" id="roman-numerals">
- <p class="sectionTitle">Romertal</p>
+ <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>
<tr>
@@ -52,7 +52,7 @@
<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>
</div>
<div class="section" id="conjugation">
- <p class="sectionTitle">Konjugation</p>
+ <p class="sectionHeading">Konjugation</p>
<table>
<tr class="small">
<th></th>
@@ -174,7 +174,7 @@
</table>
</div>
<div class="section" id="declension">
- <p class="sectionTitle">Deklination</p>
+ <p class="sectionHeading">Deklination</p>
<table>
<tr class="small">
<th></th>
diff --git a/reference/html/mathematics.html b/reference/html/mathematics.html
index 2c03f6b..d057f39 100644
--- a/reference/html/mathematics.html
+++ b/reference/html/mathematics.html
@@ -5,9 +5,9 @@
<body>
<!--#include virtual="/shtml/pageHeader.shtml"-->
<div class="page">
- <p class="pageTitle">Matematik</p>
+ <p class="pageHeading">Matematik</p>
<div class="section" id="rules">
- <p class="sectionTitle">Regneregler</p>
+ <p class="sectionHeading">Regneregler</p>
<p class="math">\(x+y=z\)</p>
<p class="math">\(z-y=x\)</p>
<p class="math">\(z-x=y\)</p>
@@ -48,14 +48,14 @@
<p class="math">\(\frac {x^a}{x^b}=x^{a-b}\)</p>
</div>
<div class="section" id="equations">
- <p class="sectionTitle">Ligninger</p>
+ <p class="sectionHeading">Ligninger</p>
<p>Andengrads:</p>
<p class="math">\(ax^2+bx+c=0\)</p>
<p class="math">\(d=b^2-4ac\)</p>
<p class="math">\(x=\frac {-b \pm \sqrt[2] {d}}{2a}\)</p>
</div>
<div class="section" id="functions">
- <p class="sectionTitle">Funktioner</p>
+ <p class="sectionHeading">Funktioner</p>
<p class="math">\(y=f(x)\)</p>
<p class="math">\(x=f^{-1}(y)\)</p>
<br />
@@ -82,7 +82,7 @@
<p class="math">\(f(x)=ax^2+bx+c\)</p>
</div>
<div class="section" id="trigonometry">
- <p class="sectionTitle">Trigonometri</p>
+ <p class="sectionHeading">Trigonometri</p>
<p class="math">\(modliggende_{\alpha}=hosliggende_{\beta}=a\)</p>
<p class="math">\(hosliggende_{\alpha}=modliggende_{\beta}=b\)</p>
<p class="math">\(hypotenuse=modliggende_{\gamma}=c\)</p>
@@ -156,7 +156,7 @@
<p class="math">\(A_1=A_0 k^2\)</p>
</div>
<div class="section" id="constants">
- <p class="sectionTitle">Konstanter</p>
+ <p class="sectionHeading">Konstanter</p>
<table>
<tr>
<th>Navn</th>
diff --git a/reference/html/physics.html b/reference/html/physics.html
index 3304ab0..9534454 100644
--- a/reference/html/physics.html
+++ b/reference/html/physics.html
@@ -5,9 +5,9 @@
<body>
<!--#include virtual="/shtml/pageHeader.shtml"-->
<div class="page">
- <p class="pageTitle">Fysik</p>
+ <p class="pageHeading">Fysik</p>
<div class="section" id="measures-and-units">
- <p class="sectionTitle">Mål og Enheder</p>
+ <p class="sectionHeading">Mål og Enheder</p>
<table>
<tr>
<th>Mål</th>
@@ -73,7 +73,7 @@
<td class="math">\(C\)</td>
</tr>
<tr>
- <td>afstand</td>
+ <td>distance</td>
<td class="math">\(s\)</td>
<td>meter</td>
<td class="math">\(m\)</td>
@@ -118,7 +118,7 @@
<td class="math">\(\frac {J}{K \cdot kg}\)</td>
</tr>
<tr>
- <td>intensitet</td>
+ <td>flux</td>
<td class="math">\(i\)</td>
<td>watt pr. kvadratmeter</td>
<td class="math">\(\frac {W}{m^2}\)</td>
@@ -199,7 +199,7 @@
<tr>
<td>bølgelængde</td>
<td class="math">\(\lambda\)</td>
- <td>afstand</td>
+ <td>distance</td>
</tr>
</table>
<p>Afledte enheder:</p>
@@ -215,7 +215,7 @@
<p class="math">\(1\ \frac {km}h=\frac 5{18}\ \frac ms\)</p>
</div>
<div class="section" id="electrodynamics">
- <p class="sectionTitle">Elektrodynamik</p>
+ <p class="sectionHeading">Elektrodynamik</p>
<p class="math">\(I=\frac qt\)</p>
<br />
<p class="math">\(i=\frac PA\)</p>
@@ -231,11 +231,11 @@
<p class="math">\(\lambda=\frac {v}{f}\)</p>
</div>
<div class="section" id="mechanics">
- <p class="sectionTitle">Mekanik</p>
+ <p class="sectionHeading">Mekanik</p>
<p class="math">\(a=\frac Fm\)</p>
<p class="math">\(a=\frac vt\)</p>
<p class="math">\(g=\frac {Gm}{r^{2}}\)</p>
- <p>... hvori <i>r</i> er afstanden til planetens kerne.</p>
+ <p>... hvori <i>r</i> er distancen til planetens kerne.</p>
<p class="math">\(g_&#9793;=\frac {981}{100}\ \frac {m}{s^2}\)</p>
<p>... er standard på Jorden.</p>
<br />
@@ -247,7 +247,7 @@
<br />
<p class="math">\(F=\frac Es\)</p>
<p class="math">\(F=\frac {Gm_{0}m_{1}}{r^{2}}\)</p>
- <p>... hvori <span class="math">\(m_0\)</span> og <span class="math">\(m_1\)</span> er masserne af objekterne og <span class="math">\(r\)</span> er afstanden mellem centrene af de to objekter.</p>
+ <p>... hvori <span class="math">\(m_0\)</span> og <span class="math">\(m_1\)</span> er masserne af objekterne og <span class="math">\(r\)</span> er distancen mellem centrene af de to objekter.</p>
<br />
<p class="math">\(P=\frac Et\)</p>
<br />
@@ -256,7 +256,7 @@
<p class="math">\(\rho=\frac mV\)</p>
</div>
<div class="section" id="thermodynamics">
- <p class="sectionTitle">Termodynamik</p>
+ <p class="sectionHeading">Termodynamik</p>
<p class="math">\(C=Cm\)</p>
<br />
<p class="math">\(c=\frac Cm\)</p>
@@ -264,8 +264,8 @@
<p class="math">\(Q=CT\)</p>
</div>
<div class="section" id="constants">
- <p class="sectionTitle">Konstanter</p>
- <p class="small">Jf. <a href="/html/mathematics.html#constants">matematikkens konstanter</a>.</p>
+ <p class="sectionHeading">Konstanter</p>
+ <p class="subHeading">Jf. <a href="/html/mathematics.html#constants">matematikkens konstanter</a>.</p>
<table>
<tr>
<th>Navn</th>
diff --git a/reference/html/social-science.html b/reference/html/social-science.html
index bbcc61e..8488f25 100644
--- a/reference/html/social-science.html
+++ b/reference/html/social-science.html
@@ -4,7 +4,7 @@
<body>
<!--#include virtual="/shtml/pageHeader.shtml"-->
<div class="page">
- <p class="pageTitle">Samfundsfag</p>
+ <p class="pageHeading">Samfundsfag</p>
<div class="section">
<p>Kommer senere.</p>
</div>
diff --git a/reference/js/setTheme.js b/reference/js/setTheme.js
index b90f629..41680b9 100644
--- a/reference/js/setTheme.js
+++ b/reference/js/setTheme.js
@@ -6,24 +6,24 @@ function setTheme(theme) {
const darkgrey = rootstyle.getPropertyValue("--darkgrey");
const lightgrey = rootstyle.getPropertyValue("--lightgrey");
const white = rootstyle.getPropertyValue("--white");
- var backgroundColour0;
- var backgroundColour1;
+ var bodyColour;
+ var backgroundColour;
var foregroundColour;
if (theme === "dark") {
- backgroundColour0 = black;
- backgroundColour1 = darkgrey;
- foregroundColour = white;
+ bodyColour = black;
+ backgroundColour = darkgrey;
+ foregroundColour = white;
}
else if (theme === "light") {
- backgroundColour0 = lightgrey;
- backgroundColour1 = white;
- foregroundColour = black;
+ bodyColour = lightgrey;
+ backgroundColour = white;
+ foregroundColour = black;
}
else {
setTheme("dark");
return;
}
- root.style.setProperty("--backgroundColour0",backgroundColour0);
- root.style.setProperty("--backgroundColour1",backgroundColour1);
+ root.style.setProperty("--bodyColour", bodyColour);
+ root.style.setProperty("--backgroundColour",backgroundColour);
root.style.setProperty("--foregroundColour",foregroundColour);
}
diff --git a/reference/shtml/pageFooter.shtml b/reference/shtml/pageFooter.shtml
index e69de29..afad70e 100644
--- a/reference/shtml/pageFooter.shtml
+++ b/reference/shtml/pageFooter.shtml
@@ -0,0 +1,4 @@
+<div class="copyrightNotice">
+ <p>Copyright 2022-2023</p>
+ <p>Gabriel Jensen</p>
+</div>