diff options
44 files changed, 240 insertions, 254 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt index ddf4dfe..93ea0a9 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,3 +1,19 @@ +# 51 + +* Remove 'to top' button; +* Update palette; +* Update theme toggler; +* encyclopedia: Update physics page; +* encyclopedia: Update chemistry page; +* encyclopedia: Update astronomy page; +* Update logos with new palette; +* Remove subsections again; +* Remove graphicText (in favour of small); +* Update page title styling; +* Rename content to page; +* Update page styling; +* Rename CSS-files; + # 50 * encyclopedia: Update chemistry page; diff --git a/css/base.css b/css/base.css index 094f0c8..fc0cd76 100644 --- a/css/base.css +++ b/css/base.css @@ -2,11 +2,11 @@ margin-top:1rem; } -div.graphicsPreview + *,img + *,ol + *,p.graphicText + *,p.large + *,p.small + *,ul + *,table + * { +div.graphicsPreview + *,img + *,ol + *,p.large + *,p.small + *,ul + *,table + * { margin-top:1rem; } -ol ol,ol ul,p.large + p.small,p.small + p.small,ul ol, ul ul { +ol ol,ol ul,ul ol, ul ul { margin-top:0; } @@ -33,13 +33,13 @@ p.pageTitle { } p.pageTitle { - font-size: 3rem; - text-align: center; + font-size: 3rem; + text-align: center; + font-weight:bold; } p.pageTitle sub { - font-size: 1rem; - font-style:italic; + font-size:1rem; } p.large { @@ -47,12 +47,11 @@ p.large { font-weight: bold; } -p.small,p.graphicText { - font-size:calc(11rem / 12); -} - p.small { + font-size: calc(7rem / 8); + font-style: italic; font-weight:bold; + margin-top: 0; } p.small span.data + span.data::before { @@ -77,8 +76,8 @@ div.graphicsPreview { } div.graphicsPreview img { - background-color:var(--backgroundColour); - border-color: var(--backgroundColour); + background-color:var(--backgroundColour0); + border-color: var(--backgroundColour0); border-radius: calc(1rem / 3 * 2); border-style: solid; border-width: calc(1rem / 3); @@ -87,15 +86,6 @@ div.graphicsPreview img { max-width: 12rem; } -p.graphicText { - font-style:italic; - margin-top:calc(1rem / 2); -} - -p.graphicText + p.graphicText { - margin-top:0; -} - img { background-color:var(--foregroundColour); border-color: var(--foregroundColour); @@ -114,7 +104,7 @@ p img { } img.mcBanner { - background-color:var(--backgroundColour); + background-color:var(--backgroundColour1); border-radius: 0; border-style: none; height: 6rem; @@ -146,7 +136,7 @@ table { border-color: var(--foregroundColour); border-style: solid; border-width: calc(1rem / 12); - color: var(--backgroundColour); + color: var(--backgroundColour0); } table.data { @@ -165,7 +155,7 @@ table tr td,table tr th { } table tr td { - background-color:var(--backgroundColour); + background-color:var(--backgroundColour0); color: var(--foregroundColour); } diff --git a/css/content.css b/css/content.css deleted file mode 100644 index 08b5b8b..0000000 --- a/css/content.css +++ /dev/null @@ -1,34 +0,0 @@ -div.content { - background-color:var(--backgroundColour); - border-top-color:var(--foregroundColour); - border-top-style:solid; - border-top-width:calc(1rem / 3); - box-sizing: border-box; - height: 100%; - margin: auto; - max-width: var(--maximumPageWidth); - min-width: var(--minimumPageWidth); - padding: 1rem 2rem; - padding-bottom: calc(3rem / 2 + 2rem); - width: 100%; -} - -div.section + div.section::before { - content: ""; - background-color:var(--colour); - display: block; - height: calc(1rem / 3); - margin: 1rem 0; - width: calc(100% / 2); -} - -div.subsection { - border-left-color:var(--colour); - border-left-style:solid; - border-left-width:calc(1rem / 3); - padding: 0 1rem; -} - -div.subsection + div.subsection { - margin-top:1rem; -} diff --git a/css/main.css b/css/main.css index d1980d8..c05e8f8 100644 --- a/css/main.css +++ b/css/main.css @@ -2,6 +2,6 @@ @import "/css/base.css"; -@import "/css/pghdr.css"; -@import "/css/content.css"; -@import "/css/pgftr.css"; +@import "/css/pageHeader.css"; +@import "/css/page.css"; +@import "/css/pageFooter.css"; diff --git a/css/nojs.css b/css/nojs.css index c49504d..a793d2f 100644 --- a/css/nojs.css +++ b/css/nojs.css @@ -2,7 +2,7 @@ img.themeToggler { display:none; } -div.content { +div.page { padding-bottom:1rem; } diff --git a/css/page.css b/css/page.css new file mode 100644 index 0000000..1a94139 --- /dev/null +++ b/css/page.css @@ -0,0 +1,25 @@ +div.page { + background-color: var(--backgroundColour1); + border-bottom-left-radius: 1rem; + border-bottom-right-radius:1rem; + border-top-color: var(--foregroundColour); + border-top-style: solid; + border-top-width: calc(1rem / 3); + box-sizing: border-box; + height: 100%; + margin: auto; + margin-bottom: 1rem; + max-width: var(--maximumPageWidth); + min-width: var(--minimumPageWidth); + padding: 1rem 2rem; + width: 100%; +} + +div.section + div.section::before { + content: ""; + background-color:var(--colour); + display: block; + height: calc(1rem / 3); + margin: 1rem 0; + width: calc(100% / 2); +} diff --git a/css/pageFooter.css b/css/pageFooter.css new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/css/pageFooter.css diff --git a/css/pghdr.css b/css/pageHeader.css index 4944ff7..baeecfd 100644 --- a/css/pghdr.css +++ b/css/pageHeader.css @@ -16,7 +16,7 @@ div.navbar p span.section + span.section::before { } div.navbar p,div.navbar p span.section a,div.navbar p span.section a:visited { - color: var(--backgroundColour); + color: var(--backgroundColour0); text-decoration:none; } @@ -33,12 +33,12 @@ div.navbar p span.section a.mandelbrot-link:hover { } div.navbar img.themeToggler { - background-color:var(--backgroundColour); - border-color: var(--backgroundColour); + background-color:var(--backgroundColour0); + border-color: var(--backgroundColour0); border-radius: calc(1rem / 3 * 2); border-width: calc(1rem / 3); border-style: solid; - color: var(--backgroundColour); + color: var(--backgroundColour0); cursor: pointer; display: block; margin: 0 auto; diff --git a/css/pgftr.css b/css/pgftr.css deleted file mode 100644 index 7a229a7..0000000 --- a/css/pgftr.css +++ /dev/null @@ -1,18 +0,0 @@ -div.toTop { - background-color: var(--foregroundColour); - border-radius: calc(1rem / 3); - bottom: 1rem; - cursor: pointer; - display: block; - height: 1rem; - left: calc(100vw / 2 - 6rem / 2); - opacity: calc(1 / 2); - position: fixed; - width: 6rem; - z-index: 1; -} - -div.toTop:hover { - height: calc(3rem / 2); - opacity:1; -} diff --git a/css/root.css b/css/root.css index 4ff2826..258c4ea 100644 --- a/css/root.css +++ b/css/root.css @@ -1,14 +1,17 @@ :root { - --black: #2E2E2E; - --white: #FCF9F9; - --red: #A6192E; /* 187 C */ - --yellow:#FFA400; /* 137 C */ - --green: #00965E; /* 340 C */ - --blue: #006BA6; /* 307 C */ + --black: #202020; + --darkgrey: #2B2B2B; + --lightgrey:#EAEAEA; + --white: #F4F4F4; + --red: #A50034; /* 207 C */ + --yellow: #FFA400; /* 137 C */ + --green: #00965E; /* 340 C */ + --blue: #006BA6; /* 307 C */ - --backgroundColour:var(--black); - --foregroundColour:var(--white); - --colour: var(--red); + --backgroundColour0:var(--black); + --backgroundColour1:var(--darkgrey); + --foregroundColour: var(--white); + --colour: var(--red); --minimumPageWidth:12rem; --maximumPageWidth:52rem; @@ -23,6 +26,6 @@ } body { - background-color:var(--backgroundColour); + background-color:var(--backgroundColour0); color: var(--foregroundColour); } diff --git a/html/about.html b/html/about.html index 311a51b..0ead94c 100644 --- a/html/about.html +++ b/html/about.html @@ -2,8 +2,8 @@ <html lang="da"> <!--#include virtual="/include/head.shtml"--> <body> - <!--#include virtual="/include/pghdr.shtml"--> - <div class="content"> + <!--#include virtual="/include/pageHeader.shtml"--> + <div class="page"> <p class="pageTitle">Om</p> <div class="section"> <p class="large">Velkommen til den officielle fadæse</p> @@ -61,6 +61,6 @@ <p>Trods de stadig ikke-eksisterende interne forhold, så var der alligevel udsigt til en ny Fadaesen – og forhåbentlig en ny guldalder.</p> </div> </div> - <!--#include virtual="/include/pgftr.shtml"--> + <!--#include virtual="/include/pageFooter.shtml"--> </body> </html> diff --git a/html/encyclopedia.html b/html/encyclopedia.html index 63ac92a..1f1832d 100644 --- a/html/encyclopedia.html +++ b/html/encyclopedia.html @@ -2,8 +2,8 @@ <html lang="da"> <!--#include virtual="/include/head.shtml"--> <body> - <!--#include virtual="/include/pghdr.shtml"--> - <div class="content"> + <!--#include virtual="/include/pageHeader.shtml"--> + <div class="page"> <p class="pageTitle">Leksikon</p> <div class="section"> <p>Følgende er en liste over de forskellige indslag i leksikonet. Finder du fejl, så bedes du venligst indmelde dem.</p> @@ -54,6 +54,6 @@ <p><sup>†</sup><sub> Kræver JavaScript for at udtrykke formler korrekt.</sub></p> </div> </div> - <!--#include virtual="/include/pgftr.shtml"--> + <!--#include virtual="/include/pageFooter.shtml"--> </body> </html> diff --git a/html/encyclopedia/astronomy.html b/html/encyclopedia/astronomy.html index 3a10721..2a340b8 100644 --- a/html/encyclopedia/astronomy.html +++ b/html/encyclopedia/astronomy.html @@ -6,12 +6,12 @@ <script id="MathJax-script" async src="https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-mml-chtml.js"></script> </head> <body> - <!--#include virtual="/include/pghdr.shtml"--> - <div class="content"> + <!--#include virtual="/include/pageHeader.shtml"--> + <div class="page"> <p class="pageTitle">Leksikon<sub> Astronomi</sub></p> <div class="section" id="measures-and-units"> <p class="large">Mål og Enheder</p> - <p>Jf. <a href="/html/encyclopedia/physics.html">fysikkens mål og enheder</a>.</p> + <p class="small">Jf. <a href="/html/encyclopedia/physics.html">fysikkens mål og enheder</a>.</p> <p>Mål med variante enheder:</p> <table> <tr> @@ -77,6 +77,6 @@ <p class="math">\(1\ d=864 \cdot 10^2\ s\)</p> </div> </div> - <!--#include virtual="/include/pgftr.shtml"--> + <!--#include virtual="/include/pageFooter.shtml"--> </body> </html> diff --git a/html/encyclopedia/chemistry.html b/html/encyclopedia/chemistry.html index c106c43..c6f6e7b 100644 --- a/html/encyclopedia/chemistry.html +++ b/html/encyclopedia/chemistry.html @@ -6,12 +6,12 @@ <script id="MathJax-script" async src="https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-mml-chtml.js"></script> </head> <body> - <!--#include virtual="/include/pghdr.shtml"--> - <div class="content"> + <!--#include virtual="/include/pageHeader.shtml"--> + <div class="page"> <p class="pageTitle">Leksikon<sub> Kemi</sub></p> <div class="section" id="measures-and-units"> <p class="large">Mål og Enheder</p> - <p class="small">Jf. <a href="/html/encyclopedia/physics.html#measures-and-units">fysikkens mål og enhedder</a>.</p> + <p class="small">Jf. <a href="/html/encyclopedia/physics.html#measures-and-units">fysikkens mål og enheder</a>.</p> <table> <tr> <th>Mål</th> @@ -20,7 +20,7 @@ <th>Symbol<sub> af enhed</sub></th> </tr> <tr class="small"> - <th colspan="4">Grundlæggende Mål</th> + <th colspan="4">Mål<sub> med navngivede enheder</sub></th> </tr> <tr> <td>stofmængde</td> @@ -29,7 +29,7 @@ <td class="math">\(mol\)</td> </tr> <tr class="small"> - <th colspan="4">Afledte Mål</th> + <th colspan="4">Mål<sub> med unavngivede enheder</sub></th> </tr> <tr> <td>stofmængdekoncentration</td> @@ -49,20 +49,20 @@ <td>kilogram pr. kubikmeter</td> <td class="math">\(\frac{kg}{m^3}\)</td> </tr> - </table> - <p>Mål uden enheder:</p> - <table> - <tr> - <th>Mål</th> - <th>Symbol</th> + <tr class="small"> + <th colspan="4">Mål<sub> uden navngivede enheder</sub></th> </tr> <tr> <td>massebrøk</td> <td class="math">\(w_i\)</td> + <th></th> + <th></th> </tr> <tr> <td>volumenbrøk</td> <td class="math">\(\phi_i\)</td> + <th></th> + <th></th> </tr> </table> <p>Mål med variante enheder:</p> @@ -155,6 +155,6 @@ <p></p> </div> </div> - <!--#include virtual="/include/pgftr.shtml"--> + <!--#include virtual="/include/pageFooter.shtml"--> </body> </html> diff --git a/html/encyclopedia/french.html b/html/encyclopedia/french.html index 93017d4..f9b872a 100644 --- a/html/encyclopedia/french.html +++ b/html/encyclopedia/french.html @@ -2,8 +2,8 @@ <html lang="da"> <!--#include virtual="/include/head.shtml"--> <body> - <!--#include virtual="/include/pghdr.shtml"--> - <div class="content"> + <!--#include virtual="/include/pageHeader.shtml"--> + <div class="page"> <p class="pageTitle">Leksikon<sub> Fransk</sub></p> <div class="section" id="conjugation"> <p class="large">Konjugation</p> @@ -47,6 +47,6 @@ </table> </div> </div> - <!--#include virtual="/include/pgftr.shtml"--> + <!--#include virtual="/include/pageFooter.shtml"--> </body> </html> diff --git a/html/encyclopedia/german.html b/html/encyclopedia/german.html index 71903b0..a8c7c57 100644 --- a/html/encyclopedia/german.html +++ b/html/encyclopedia/german.html @@ -2,13 +2,13 @@ <html lang="da"> <!--#include virtual="/include/head.shtml"--> <body> - <!--#include virtual="/include/pghdr.shtml"--> - <div class="content"> + <!--#include virtual="/include/pageHeader.shtml"--> + <div class="page"> <p class="pageTitle">Leksikon<sub> Tysk</sub></p> <div class="section"> <p>Kommer senere.</p> </div> </div> - <!--#include virtual="/include/pgftr.shtml"--> + <!--#include virtual="/include/pageFooter.shtml"--> </body> </html> diff --git a/html/encyclopedia/history.html b/html/encyclopedia/history.html index 7860573..9d59c43 100644 --- a/html/encyclopedia/history.html +++ b/html/encyclopedia/history.html @@ -2,13 +2,13 @@ <html lang="da"> <!--#include virtual="/include/head.shtml"--> <body> - <!--#include virtual="/include/pghdr.shtml"--> - <div class="content"> + <!--#include virtual="/include/pageHeader.shtml"--> + <div class="page"> <p class="pageTitle">Leksikon<sub> Historie</sub></p> <div class="section"> <p>Kommer senere.</p> </div> </div> - <!--#include virtual="/include/pgftr.shtml"--> + <!--#include virtual="/include/pageFooter.shtml"--> </body> </html> diff --git a/html/encyclopedia/latin.html b/html/encyclopedia/latin.html index 50b20d6..b21db6c 100644 --- a/html/encyclopedia/latin.html +++ b/html/encyclopedia/latin.html @@ -2,8 +2,8 @@ <html lang="da"> <!--#include virtual="/include/head.shtml"--> <body> - <!--#include virtual="/include/pghdr.shtml"--> - <div class="content"> + <!--#include virtual="/include/pageHeader.shtml"--> + <div class="page"> <p class="pageTitle">Leksikon<sub> Latin</sub></p> <div class="section" id="roman-numerals"> <p class="large">Romertal</p> @@ -349,6 +349,6 @@ </table> </div> </div> - <!--#include virtual="/include/pgftr.shtml"--> + <!--#include virtual="/include/pageFooter.shtml"--> </body> </html> diff --git a/html/encyclopedia/mathematics.html b/html/encyclopedia/mathematics.html index ee493b1..adea0e4 100644 --- a/html/encyclopedia/mathematics.html +++ b/html/encyclopedia/mathematics.html @@ -6,8 +6,8 @@ <script id="MathJax-script" async src="https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-mml-chtml.js"></script> </head> <body> - <!--#include virtual="/include/pghdr.shtml"--> - <div class="content"> + <!--#include virtual="/include/pageHeader.shtml"--> + <div class="page"> <p class="pageTitle">Leksikon<sub> Matematik</sub></p> <div class="section" id="rules"> <p class="large">Regneregler</p> @@ -204,6 +204,6 @@ <p class="math">\(\phi=\frac{1+\sqrt[2]{5}}{2} \approx \frac{1\ 618\ 033\ 989}{10^9}\)</p> </div> </div> - <!--#include virtual="/include/pgftr.shtml"--> + <!--#include virtual="/include/pageFooter.shtml"--> </body> </html> diff --git a/html/encyclopedia/physics.html b/html/encyclopedia/physics.html index 7c00842..e15f48a 100644 --- a/html/encyclopedia/physics.html +++ b/html/encyclopedia/physics.html @@ -6,8 +6,8 @@ <script id="MathJax-script" async src="https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-mml-chtml.js"></script> </head> <body> - <!--#include virtual="/include/pghdr.shtml"--> - <div class="content"> + <!--#include virtual="/include/pageHeader.shtml"--> + <div class="page"> <p class="pageTitle">Leksikon<sub> Fysik</sub></p> <div class="section" id="measures-and-units"> <p class="large">Mål og Enheder</p> @@ -19,40 +19,7 @@ <th>Symbol<sub> af enhed</sub></th> </tr> <tr class="small"> - <th colspan="4">Grundlæggende Mål</th> - </tr> - <tr> - <td>strømstyrke</td> - <td class="math">\(I\)</td> - <td>ampere</td> - <td class="math">\(A\)</td> - </tr> - <tr> - <td>masse</td> - <td class="math">\(m\)</td> - <td>kilogram</td> - <td class="math">\(kg\)</td> - </tr> - <tr> - <td>afstand</td> - <td class="math">\(s\)</td> - <td>meter</td> - <td class="math">\(m\)</td> - </tr> - <tr> - <td>temperatur</td> - <td class="math">\(T\)</td> - <td>kelvin</td> - <td class="math">\(K\)</td> - </tr> - <tr> - <td>tid</td> - <td class="math">\(t\)</td> - <td>sekund</td> - <td class="math">\(s\)</td> - </tr> - <tr class="small"> - <th colspan="4">Afledte Mål<sub> med navngivede enheder</sub></th> + <th colspan="4">Mål<sub> med navngivede enheder</sub></th> </tr> <tr> <td>energi</td> @@ -73,6 +40,18 @@ <td class="math">\(Hz\)</td> </tr> <tr> + <td>strømstyrke</td> + <td class="math">\(I\)</td> + <td>ampere</td> + <td class="math">\(A\)</td> + </tr> + <tr> + <td>masse</td> + <td class="math">\(m\)</td> + <td>kilogram</td> + <td class="math">\(kg\)</td> + </tr> + <tr> <td>effekt</td> <td class="math">\(P\)</td> <td>watt</td> @@ -90,8 +69,26 @@ <td>coulomb</td> <td class="math">\(C\)</td> </tr> + <tr> + <td>afstand</td> + <td class="math">\(s\)</td> + <td>meter</td> + <td class="math">\(m\)</td> + </tr> + <tr> + <td>temperatur</td> + <td class="math">\(T\)</td> + <td>kelvin</td> + <td class="math">\(K\)</td> + </tr> + <tr> + <td>tid</td> + <td class="math">\(t\)</td> + <td>sekund</td> + <td class="math">\(s\)</td> + </tr> <tr class="small"> - <th colspan="4">Afledte Mål<sub> med unavngivede enheder</sub></th> + <th colspan="4">Mål<sub> med unavngivede enheder</sub></th> </tr> <tr> <td>areal</td> @@ -141,16 +138,14 @@ <td>kilogram pr. kubikmeter</td> <td class="math">\(\frac{kg}{m^3}\)</td> </tr> - </table> - <p>Mål uden enheder:</p> - <table> - <tr> - <th>Mål</th> - <th>Symbol</th> + <tr class="small"> + <th colspan="4">Mål<sub> uden enheder</sub></th> </tr> <tr> <td>strålingsfaktor</td> <td class="math">\(\varepsilon\)</td> + <th></th> + <th></th> </tr> </table> <p>Mål med variante enheder:</p> @@ -186,22 +181,24 @@ <tr> <td>kinetisk energi</td> <td class="math">\(K\)</td> - <td>energi</td> + <td rowspan="4">energi</td> </tr> <tr> <td>potentiel energi</td> <td class="math">\(U\)</td> - <td>energi</td> </tr> <tr> <td>varmeenergi</td> <td class="math">\(Q\)</td> - <td>energi</td> + </tr> + <tr> + <td>arbejde</td> + <td class="math">\(W\)</td> </tr> <tr> <td>bølgelængde</td> <td class="math">\(\lambda\)</td> - <td>distance</td> + <td>afstand</td> </tr> </table> <p class="math">\(1\ {}^{\circ}C=\frac{5463}{20}\ K\)</p> @@ -217,12 +214,14 @@ <p class="math">\(g=\frac{981}{100}\ \frac{m}{s^2}\)</p> <p>... er standard på Jorden.</p> <br /> - <p class="math">\(E=Fs\)</p> + <p class="math">\(C=cm\)</p> + <br /> <p class="math">\(E=Pt\)</p> <p class="math">\(K=\frac{mv^{2}}{2}\)</p> - <p class="math">\(Q=CT=cmT\)</p> + <p class="math">\(Q=CT\)</p> + <p class="math">\(W=Fs\)</p> <p>Gravitation:</p> - <p class="math">\(U=Fs=mgs\)</p> + <p class="math">\(U=Fs\)</p> <p>... hvori <i>F</i> er tyngdekraften og <i>g</i> er den lokale tyngeacceleration.</p> <br /> <p class="math">\(F=ma\)</p> @@ -231,7 +230,7 @@ <p class="math">\(F=\frac{Gm_{0}m_{1}}{r^{2}}\)</p> <p>... <i>m_0</i> og <i>m_1</i> er masserne af objekterne og <i>r</i> er distancen mellem centrene af de to objekter.</p> <br /> - <p class="math">\(i={\sigma}T^4{\varepsilon}\)</p> + <p class="math">\(i=T^4{\sigma}{\varepsilon}\)</p> <br /> <p class="math">\(P=\frac{E}{t}\)</p> <p class="math">\(P=iA\)</p> @@ -283,6 +282,6 @@ <p class="math">\(\sigma=\frac{2\pi^5k_B^4}{15h^3c^2} \approx \frac{5\ 670\ 374\ 419}{10^{17}}\ \frac{W}{m^2K^4}\)</p> </div> </div> - <!--#include virtual="/include/pgftr.shtml"--> + <!--#include virtual="/include/pageFooter.shtml"--> </body> </html> diff --git a/html/encyclopedia/social-science.html b/html/encyclopedia/social-science.html index f00dd72..b9bf381 100644 --- a/html/encyclopedia/social-science.html +++ b/html/encyclopedia/social-science.html @@ -2,13 +2,13 @@ <html lang="da"> <!--#include virtual="/include/head.shtml"--> <body> - <!--#include virtual="/include/pghdr.shtml"--> - <div class="content"> + <!--#include virtual="/include/pageHeader.shtml"--> + <div class="page"> <p class="pageTitle">Leksikon<sub> Samfundsfag</sub></p> <div class="section"> <p>Kommer senere.</p> </div> </div> - <!--#include virtual="/include/pgftr.shtml"--> + <!--#include virtual="/include/pageFooter.shtml"--> </body> </html> diff --git a/html/graphics.html b/html/graphics.html index 3a5d82f..14376b1 100644 --- a/html/graphics.html +++ b/html/graphics.html @@ -2,8 +2,8 @@ <html lang="da"> <!--#include virtual="/include/head.shtml"--> <body> - <!--#include virtual="/include/pghdr.shtml"--> - <div class="content"> + <!--#include virtual="/include/pageHeader.shtml"--> + <div class="page"> <p class="pageTitle">Grafik</p> <div class="section"> <p>Indsend din grafik til mig – Delta – for at få det op på denne væg. Vedhæft også navnet på den licens, du udgiver det under (kig eventuelt <a href="https://chooser-beta.creativecommons.org/">her</a>).</p> @@ -245,6 +245,6 @@ </div> </div> </div> - <!--#include virtual="/include/pgftr.shtml"--> + <!--#include virtual="/include/pageFooter.shtml"--> </body> </html> diff --git a/html/members.html b/html/members.html index 3ca9036..84dfe9e 100644 --- a/html/members.html +++ b/html/members.html @@ -2,8 +2,8 @@ <html lang="da"> <!--#include virtual="/include/head.shtml"--> <body> - <!--#include virtual="/include/pghdr.shtml"--> - <div class="content"> + <!--#include virtual="/include/pageHeader.shtml"--> + <div class="page"> <p class="pageTitle">Medlemmer</p> <div class="section"> <p>Følgende er en liste over alle medlemmer af Fadaesen – nuværende og tidligere. De ikke-aktuelle har deres navne streget over.</p> @@ -115,6 +115,6 @@ <p>1. Periode: 2018-12-12T11:15+01:00</p> </div> </div> - <!--#include virtual="/include/pgftr.shtml"--> + <!--#include virtual="/include/pageFooter.shtml"--> </body> </html> diff --git a/html/posts.html b/html/posts.html index 40db97a..f5aa21c 100644 --- a/html/posts.html +++ b/html/posts.html @@ -2,8 +2,8 @@ <html lang="da"> <!--#include virtual="/include/head.shtml"--> <body> - <!--#include virtual="/include/pghdr.shtml"--> - <div class="content"> + <!--#include virtual="/include/pageHeader.shtml"--> + <div class="page"> <p class="pageTitle">Opslag</p> <div class="section"> <p>Opslag fra Steam bliver automatisk sat op herinde, og udvalgte (ikke-personfølsomme) opslag fra Discord serveren bliver også overført. Du kan yderligere sende dit opslag direkte til mig, og jeg vil indsætte det i en senere version af hjemmesiden.</p> @@ -452,6 +452,6 @@ <p>Så er fadaesen kommet!</p> </div> </div> - <!--#include virtual="/include/pgftr.shtml"--> + <!--#include virtual="/include/pageFooter.shtml"--> </body> </html> diff --git a/html/projects.html b/html/projects.html index 93e4e1e..ef4797a 100644 --- a/html/projects.html +++ b/html/projects.html @@ -2,8 +2,8 @@ <html lang="da"> <!--#include virtual="/include/head.shtml"--> <body> - <!--#include virtual="/include/pghdr.shtml"--> - <div class="content"> + <!--#include virtual="/include/pageHeader.shtml"--> + <div class="page"> <p class="pageTitle">Projekter</p> <div class="section"> <p class="large" id="agbsum"><a href="https://mandelbrot.dk/agbsum">agbsum</a></p> @@ -36,6 +36,6 @@ <p>Bibliotek til at udføre algoritmer på data.</p> </div> </div> - <!--#include virtual="/include/pgftr.shtml"--> + <!--#include virtual="/include/pageFooter.shtml"--> </body> </html> diff --git a/html/subgroups.html b/html/subgroups.html index ffe3296..2f46f95 100644 --- a/html/subgroups.html +++ b/html/subgroups.html @@ -2,8 +2,8 @@ <html lang="da"> <!--#include virtual="/include/head.shtml"--> <body> - <!--#include virtual="/include/pghdr.shtml"--> - <div class="content"> + <!--#include virtual="/include/pageHeader.shtml"--> + <div class="page"> <p class="pageTitle">Undergrupper</p> <div class="section"> <p>Fadaesen er opdelt i undergrupper til forskellige formål, som selve gruppen ikke tager sig af. Alle emner uden en undergruppe hører blot under Fadaesen.</p> @@ -133,6 +133,6 @@ </ul> </div> </div> - <!--#include virtual="/include/pgftr.shtml"--> + <!--#include virtual="/include/pageFooter.shtml"--> </body> </html> diff --git a/html/texts.html b/html/texts.html index ea5ceae..78af2b4 100644 --- a/html/texts.html +++ b/html/texts.html @@ -2,8 +2,8 @@ <html lang="da"> <!--#include virtual="/include/head.shtml"--> <body> - <!--#include virtual="/include/pghdr.shtml"--> - <div class="content"> + <!--#include virtual="/include/pageHeader.shtml"--> + <div class="page"> <p class="pageTitle">Skrifter</p> <div class="section"> <p>Dette er en liste over de tekstværker, der er udgivet på denne hjemmeside. Værkerne er sorteret kronologisk og ud fra forfatter.</p> @@ -35,6 +35,6 @@ </ul> </div> </div> - <!--#include virtual="/include/pgftr.shtml"--> + <!--#include virtual="/include/pageFooter.shtml"--> </body> </html> diff --git a/html/texts/gabriel-jensen/bag-om-islands-fadæse-vulkan.html b/html/texts/gabriel-jensen/bag-om-islands-fadæse-vulkan.html index 937e56b..2bfa8dc 100644 --- a/html/texts/gabriel-jensen/bag-om-islands-fadæse-vulkan.html +++ b/html/texts/gabriel-jensen/bag-om-islands-fadæse-vulkan.html @@ -2,8 +2,8 @@ <html lang="da"> <!--#include virtual="/include/head.shtml"--> <body> - <!--#include virtual="/include/pghdr.shtml"--> - <div class="content"> + <!--#include virtual="/include/pageHeader.shtml"--> + <div class="page"> <p class="pageTitle">Skrifter</p> <div class="section"> <p class="large">Bag om Islands Fadæse Vulkan</p> @@ -34,6 +34,6 @@ <p>Resten af året var der relativt roligt. I juni blev det sidste lava skudt op, og i oktober erklærede Islands Institut for Jordvidenskab, at udbruddene atter var holdt op (for denne gang), men, at, selve vulkanen fortsat er aktiv, og kunne udbryde i fremtiden (<a href="https://web.archive.org/web/20101126024956/http://icelandreview.com/icelandreview/daily_news/?cat_id=16539&ew_0_a_id=369471">kilde</a>).</p> </div> </div> - <!--#include virtual="/include/pgftr.shtml"--> + <!--#include virtual="/include/pageFooter.shtml"--> </body> </html> diff --git a/html/texts/gabriel-jensen/digt.html b/html/texts/gabriel-jensen/digt.html index 576f205..e9e2c62 100644 --- a/html/texts/gabriel-jensen/digt.html +++ b/html/texts/gabriel-jensen/digt.html @@ -2,8 +2,8 @@ <html lang="da"> <!--#include virtual="/include/head.shtml"--> <body> - <!--#include virtual="/include/pghdr.shtml"--> - <div class="content"> + <!--#include virtual="/include/pageHeader.shtml"--> + <div class="page"> <p class="pageTitle">Skrifter</p> <div class="section"> <p class="large">Digt</p> @@ -79,6 +79,6 @@ <p>.....</p> </div> </div> - <!--#include virtual="/include/pgftr.shtml"--> + <!--#include virtual="/include/pageFooter.shtml"--> </body> </html> diff --git a/html/texts/gabriel-jensen/end-ikke-denne-gang.html b/html/texts/gabriel-jensen/end-ikke-denne-gang.html index 13697ba..79a1808 100644 --- a/html/texts/gabriel-jensen/end-ikke-denne-gang.html +++ b/html/texts/gabriel-jensen/end-ikke-denne-gang.html @@ -2,8 +2,8 @@ <html lang="da"> <!--#include virtual="/include/head.shtml"--> <body> - <!--#include virtual="/include/pghdr.shtml"--> - <div class="content"> + <!--#include virtual="/include/pageHeader.shtml"--> + <div class="page"> <p class="pageTitle">Skrifter</p> <div class="section"> <p class="large">End ikke denne gang</p> @@ -78,6 +78,6 @@ <p>Og idet vidste jeg, at mørket ville ikke lyses op – end ikke denne gang.</p> </div> </div> - <!--#include virtual="/include/pgftr.shtml"--> + <!--#include virtual="/include/pageFooter.shtml"--> </body> </html> diff --git a/html/texts/gabriel-jensen/gør-øjeblikket-væsentligt.html b/html/texts/gabriel-jensen/gør-øjeblikket-væsentligt.html index a4e2afa..eab42c8 100644 --- a/html/texts/gabriel-jensen/gør-øjeblikket-væsentligt.html +++ b/html/texts/gabriel-jensen/gør-øjeblikket-væsentligt.html @@ -2,8 +2,8 @@ <html lang="da"> <!--#include virtual="/include/head.shtml"--> <body> - <!--#include virtual="/include/pghdr.shtml"--> - <div class="content"> + <!--#include virtual="/include/pageHeader.shtml"--> + <div class="page"> <p class="pageTitle">Skrifter</p> <div class="section"> <p class="large">Gør øjeblikket væsentligt</p> @@ -38,6 +38,6 @@ <p><i>Vor tid, progressiv og regressiv, er vor. Thi definerer den ejermanden. Præget af vor selv, omendskønt vor næste, vorherre bevares, dens tilstand er stedse ajour.</i></p> </div> </div> - <!--#include virtual="/include/pgftr.shtml"--> + <!--#include virtual="/include/pageFooter.shtml"--> </body> </html> diff --git a/html/texts/gabriel-jensen/hvorfor-tatoveres.html b/html/texts/gabriel-jensen/hvorfor-tatoveres.html index d085d1c..d08aacc 100644 --- a/html/texts/gabriel-jensen/hvorfor-tatoveres.html +++ b/html/texts/gabriel-jensen/hvorfor-tatoveres.html @@ -2,8 +2,8 @@ <html lang="da"> <!--#include virtual="/include/head.shtml"--> <body> - <!--#include virtual="/include/pghdr.shtml"--> - <div class="content"> + <!--#include virtual="/include/pageHeader.shtml"--> + <div class="page"> <p class="pageTitle">Skrifter</p> <div class="section"> <p class="large">Hvorfor tatoveres?</p> @@ -19,6 +19,6 @@ <p>Så hvis, at du, overvejer, at blive tatoveret, så husk, at tænke på konsekvenserne. Tænk over dem, og grundigt endda. Dit fremtidige selv vil være meget taknemmelig.</p> </div> </div> - <!--#include virtual="/include/pgftr.shtml"--> + <!--#include virtual="/include/pageFooter.shtml"--> </body> </html> diff --git a/html/texts/gabriel-jensen/lys-i-mørkeport-station.html b/html/texts/gabriel-jensen/lys-i-mørkeport-station.html index eb02657..b117009 100644 --- a/html/texts/gabriel-jensen/lys-i-mørkeport-station.html +++ b/html/texts/gabriel-jensen/lys-i-mørkeport-station.html @@ -2,8 +2,8 @@ <html lang="da"> <!--#include virtual="/include/head.shtml"--> <body> - <!--#include virtual="/include/pghdr.shtml"--> - <div class="content"> + <!--#include virtual="/include/pageHeader.shtml"--> + <div class="page"> <p class="pageTitle">Skrifter</p> <div class="section"> <p class="large">Lys i Mørkeport Station</p> @@ -29,6 +29,6 @@ <p>Mørkeport Station havde denne gang hele 4.000 personer. Det er muligt, at ikke alle kender til den, men mange kommer år på år. Jeg talte med en del af de deltagende, og stort set alle var enige i, at Mørkeport Station er en fed oplevelse. Men ikke alle har kun haft gode oplevelser. I 2003 måtte festen blive tidligt aflyst, da et mislykkede terrorangreb på København blev udført. Alligevel, så skaber festivalen gode minder hos de fleste. Ifølge deltagende Mathias Vestergaard fra Smørum: »Jeg kommer nok til at deltage i Mørkeport Station så længe, at det eksisterer. Det er ubeskriveligt fedt, at være sammen med gutterne, møde piger, og bare feste natten lang. Ting, som jeg ellers ikke rigtig har mulighed for derhjemme i Smørum. Festivalen her gør mit liv meget mere betydningsfuldt. Hvad kan jeg sige? Jeg ser lys i Mørkeport Station.«</p> </div> </div> - <!--#include virtual="/include/pgftr.shtml"--> + <!--#include virtual="/include/pageFooter.shtml"--> </body> </html> diff --git a/html/texts/gabriel-jensen/some.html b/html/texts/gabriel-jensen/some.html index b77f1c8..36e0ceb 100644 --- a/html/texts/gabriel-jensen/some.html +++ b/html/texts/gabriel-jensen/some.html @@ -2,8 +2,8 @@ <html lang="da"> <!--#include virtual="/include/head.shtml"--> <body> - <!--#include virtual="/include/pghdr.shtml"--> - <div class="content"> + <!--#include virtual="/include/pageHeader.shtml"--> + <div class="page"> <p class="pageTitle">Skrifter</p> <div class="section"> <p class="large">SoMe</p> @@ -33,6 +33,6 @@ <p>For there's always another day tomorrow.</p> </div> </div> - <!--#include virtual="/include/pgftr.shtml"--> + <!--#include virtual="/include/pageFooter.shtml"--> </body> </html> diff --git a/include/pageFooter.shtml b/include/pageFooter.shtml new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/include/pageFooter.shtml diff --git a/include/pghdr.shtml b/include/pageHeader.shtml index deb53a2..deb53a2 100644 --- a/include/pghdr.shtml +++ b/include/pageHeader.shtml diff --git a/include/pgftr.shtml b/include/pgftr.shtml deleted file mode 100644 index 9646941..0000000 --- a/include/pgftr.shtml +++ /dev/null @@ -1 +0,0 @@ -<div class="toTop" onclick="toTop()"></div> diff --git a/js/setTheme.js b/js/setTheme.js index 31cf807..b90f629 100644 --- a/js/setTheme.js +++ b/js/setTheme.js @@ -3,21 +3,27 @@ function setTheme(theme) { var root = document.querySelector(":root"); var rootstyle = getComputedStyle(root); const black = rootstyle.getPropertyValue("--black"); + const darkgrey = rootstyle.getPropertyValue("--darkgrey"); + const lightgrey = rootstyle.getPropertyValue("--lightgrey"); const white = rootstyle.getPropertyValue("--white"); - var bgcol; - var fgcol; + var backgroundColour0; + var backgroundColour1; + var foregroundColour; if (theme === "dark") { - bgcol = black; - fgcol = white; + backgroundColour0 = black; + backgroundColour1 = darkgrey; + foregroundColour = white; } else if (theme === "light") { - bgcol = white; - fgcol = black; + backgroundColour0 = lightgrey; + backgroundColour1 = white; + foregroundColour = black; } else { setTheme("dark"); return; } - root.style.setProperty("--backgroundColour",bgcol); - root.style.setProperty("--foregroundColour",fgcol); + root.style.setProperty("--backgroundColour0",backgroundColour0); + root.style.setProperty("--backgroundColour1",backgroundColour1); + root.style.setProperty("--foregroundColour",foregroundColour); } diff --git a/svg/StdElite.svg b/svg/StdElite.svg index 7bac5a9..c5c66d6 100644 --- a/svg/StdElite.svg +++ b/svg/StdElite.svg @@ -6,11 +6,11 @@ <!-- background --> <polygon fill="#006BA6" points="0,0 384,0 384,384 0,384" /> <!-- middle Circle --> - <circle cx="192" cy="192" fill="#FCF9F9" r="144" /> + <circle cx="192" cy="192" fill="#F4F4F4" r="144" /> <!-- star --> <!-- 192+(168÷2)×sin(π(16−2)÷16×x) --> <polygon clip-path="url(#clip8A)" fill="none" points="192,66 224.145,114.394 310.794,73.206 269.606,159.855 318,192 269.606,224.145 310.794,310.794 224.145,269.606 192,318 159.855,269.606 73.206,310.794 114.394,224.145 66,192 114.394,159.855 73.206,73.206 159.855,114.394" stroke="#006BA6" stroke-width="48" /> - <polygon clip-path="url(#clip8A)" fill="none" points="192,66 224.145,114.394 310.794,73.206 269.606,159.855 318,192 269.606,224.145 310.794,310.794 224.145,269.606 192,318 159.855,269.606 73.206,310.794 114.394,224.145 66,192 114.394,159.855 73.206,73.206 159.855,114.394" stroke="#FCF9F9" stroke-width="16" /> + <polygon clip-path="url(#clip8A)" fill="none" points="192,66 224.145,114.394 310.794,73.206 269.606,159.855 318,192 269.606,224.145 310.794,310.794 224.145,269.606 192,318 159.855,269.606 73.206,310.794 114.394,224.145 66,192 114.394,159.855 73.206,73.206 159.855,114.394" stroke="#F4F4F4" stroke-width="16" /> <!-- greater Circle --> - <circle cx="192" cy="192" fill="none" r="168" stroke="#FCF9F9" stroke-width="16" /> + <circle cx="192" cy="192" fill="none" r="168" stroke="#F4F4F4" stroke-width="16" /> </svg> diff --git a/svg/fadaesen.svg b/svg/fadaesen.svg index aae1098..9430661 100644 --- a/svg/fadaesen.svg +++ b/svg/fadaesen.svg @@ -1,9 +1,9 @@ <!-- Copyright 2022-2023 Gabriel Jensen. This work is licensed under a Creative Commons Attribution 4.0 International License. --> <svg height="84" width="84" xmlns="http://www.w3.org/2000/svg"> <!-- background --> - <polygon fill="#A6192E" points="0,0 84,0 84,84 0,84" /> + <polygon fill="#A50034" points="0,0 84,0 84,84 0,84" /> <!-- a --> - <polygon fill="#2E2E2E" points="48,18 72,18 48,42 60,42 60,30 72,30 72,54 60,66 60,54 24,54 24,66 12,66 48,30" /> + <polygon fill="#202020" points="48,18 72,18 48,42 60,42 60,30 72,30 72,54 60,66 60,54 24,54 24,66 12,66 48,30" /> <!-- f --> - <polygon fill="#FCF9F9" points="24,18 60,18 48,30 36,30 36,42 48,42 24,66 24,30 36,30" /> + <polygon fill="#F4F4F4" points="24,18 60,18 48,30 36,30 36,42 48,42 24,66 24,30 36,30" /> </svg> diff --git a/svg/fadaesenMC.svg b/svg/fadaesenMC.svg index 99dab25..9a6d6dc 100644 --- a/svg/fadaesenMC.svg +++ b/svg/fadaesenMC.svg @@ -5,17 +5,17 @@ </clipPath> <!-- background --> <polygon fill="#FFA400" points="0,0 384,0 384,384 0,384" /> - <circle cx="192" cy="192" fill="#FCF9F9" r="144" /> + <circle cx="192" cy="192" fill="#F4F4F4" r="144" /> <!-- line border --> <polyline clip-path="url(#clipPath77)" fill="none" points="384,0 0,384" stroke="#FFA400" stroke-width="48" /> <!-- outer star --> <polygon fill="#FFA400" points="192,90.177 293.823,192 192,293.823 90.177,192" /> - <polygon fill="#FCF9F9" points="192,112.804 271.196,192 192,271.196 112.804,192" /> + <polygon fill="#F4F4F4" points="192,112.804 271.196,192 192,271.196 112.804,192" /> <!-- line centre --> - <polyline clip-path="url(#clipPath77)" fill="none" points="384,0 0,384" stroke="#FCF9F9" stroke-width="16" /> + <polyline clip-path="url(#clipPath77)" fill="none" points="384,0 0,384" stroke="#F4F4F4" stroke-width="16" /> <!-- inner star --> <polygon fill="#FFA400" points="192,135.431 248.569,192 192,248.569 135.431,192" /> - <polygon fill="#FCF9F9" points="192,158.059 225.941,192 192,225.941 158.059,192" /> + <polygon fill="#F4F4F4" points="192,158.059 225.941,192 192,225.941 158.059,192" /> <!-- greater Circle --> - <circle cx="192" cy="192" fill="none" r="168" stroke="#FCF9F9" stroke-width="16" /> + <circle cx="192" cy="192" fill="none" r="168" stroke="#F4F4F4" stroke-width="16" /> </svg> diff --git a/svg/logotype.svg b/svg/logotype.svg index eee07b5..3035a15 100644 --- a/svg/logotype.svg +++ b/svg/logotype.svg @@ -1,7 +1,7 @@ <!-- Copyright 2022-2023 Gabriel Jensen. This work is licensed under a Creative Commons Attribution 4.0 International License. --> <svg height="48" width="60" xmlns="http://www.w3.org/2000/svg"> <!-- a --> - <polygon fill="#2E2E2E" points="36,0 60,0 36,24 48,24 48,12 60,12 60,36 48,48 48,36 12,36 12,48 0,48 36,12" /> + <polygon fill="#202020" points="36,0 60,0 36,24 48,24 48,12 60,12 60,36 48,48 48,36 12,36 12,48 0,48 36,12" /> <!-- f --> - <polygon fill="#F9F6F6" points="12,0 48,0 36,12 24,12 24,24 36,24 12,48 12,12 24,12" /> + <polygon fill="#F4F4F4" points="12,0 48,0 36,12 24,12 24,24 36,24 12,48 12,12 24,12" /> </svg> diff --git a/svg/mandelbrot.svg b/svg/mandelbrot.svg index 3ceedb4..f33a3a2 100644 --- a/svg/mandelbrot.svg +++ b/svg/mandelbrot.svg @@ -9,15 +9,15 @@ <!-- background --> <polygon fill="#00965E" points="0,0 384,0 384,384 0,384" /> <!-- middle Circle --> - <circle cx="192" cy="192" fill="#FCF9F9" r="144" /> + <circle cx="192" cy="192" fill="#F4F4F4" r="144" /> <!-- digit Eight --> <circle cx="192" cy="268" fill="none" r="92" stroke="#00965E" stroke-width="48" /> <!-- Bottom Border --> - <circle cx="192" cy="268" fill="none" r="92" stroke="#FCF9F9" stroke-width="16" /> <!-- Bottom Centre --> + <circle cx="192" cy="268" fill="none" r="92" stroke="#F4F4F4" stroke-width="16" /> <!-- Bottom Centre --> <circle cx="192" cy="116" fill="none" r="92" stroke="#00965E" stroke-width="48" /> <!-- Top Border --> - <circle cx="192" cy="116" fill="none" r="92" stroke="#FCF9F9" stroke-width="16" /> <!-- Top Centre --> + <circle cx="192" cy="116" fill="none" r="92" stroke="#F4F4F4" stroke-width="16" /> <!-- Top Centre --> <!-- overlay --> <circle clip-path="url(#clipF7)" cx="192" cy="268" fill="none" r="92" stroke="#00965E" stroke-width="48" /> - <circle clip-path="url(#clip16)" cx="192" cy="268" fill="none" r="92" stroke="#FCF9F9" stroke-width="16" /> + <circle clip-path="url(#clip16)" cx="192" cy="268" fill="none" r="92" stroke="#F4F4F4" stroke-width="16" /> <!-- greater Circle --> - <circle cx="192" cy="192" fill="none" r="168" stroke="#FCF9F9" stroke-width="16" /> + <circle cx="192" cy="192" fill="none" r="168" stroke="#F4F4F4" stroke-width="16" /> </svg> diff --git a/svg/themeToggler.svg b/svg/themeToggler.svg index c3f6609..f48f236 100644 --- a/svg/themeToggler.svg +++ b/svg/themeToggler.svg @@ -1,4 +1,4 @@ <svg height="24" width="24" xmlns="http://www.w3.org/2000/svg"> - <polygon fill="#FCF9F9" points="11,0 24,0 24,24 11,24" /> - <polygon fill="#2E2E2E" points="0,0 12,0 12,24 0,24" /> + <polygon fill="#F4F4F4" points="11,0 24,0 24,24 11,24" /> + <polygon fill="#202020" points="0,0 12,0 12,24 0,24" /> </svg>
\ No newline at end of file |
