diff options
| -rw-r--r-- | CHANGELOG.txt | 8 | ||||
| -rw-r--r-- | css/base.css | 10 | ||||
| -rw-r--r-- | html/encyclopedia/chemistry.html | 16 | ||||
| -rw-r--r-- | html/encyclopedia/mathematics.html | 15 | ||||
| -rw-r--r-- | html/encyclopedia/physics.html | 15 |
5 files changed, 41 insertions, 23 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt index fe44e89..babbd38 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,3 +1,11 @@ +# 41 + +* Rename imageText to graphicText and use it with tables; +* encyclopedia: Update chemistry; +* encyclopedia: Use normal spaces as thousands seperators; +* encyclopedia: Update physics; +* encyclopedia: Fix error on mathematics; + # 40 * Update encyclopedia topic 'physics'; diff --git a/css/base.css b/css/base.css index 4ef3945..e8278a5 100644 --- a/css/base.css +++ b/css/base.css @@ -2,7 +2,7 @@ margin-top:1rem; } -img + *,ol + *,p.imageText + *,p.large + *,p.small + *,ul + *,table + * { +img + *,ol + *,p.graphicText + *,p.large + *,p.small + *,ul + *,table + * { margin-top:1rem; } @@ -47,7 +47,7 @@ p.large { font-weight: bold; } -p.small,p.imageText { +p.small,p.graphicText { font-size:calc(11rem / 12); } @@ -65,9 +65,9 @@ p.math,table tr td.math { margin: calc(3rem / 2 / 2) 0; } -p.imageText { - font-style: italic; - margin-top: calc(1rem / 2); +p.graphicText { + font-style:italic; + margin-top:calc(1rem / 2); } img { diff --git a/html/encyclopedia/chemistry.html b/html/encyclopedia/chemistry.html index c789333..dd4287a 100644 --- a/html/encyclopedia/chemistry.html +++ b/html/encyclopedia/chemistry.html @@ -31,7 +31,7 @@ <td class="math">\(mol\)</td> </tr> </table> - <p>Evt. se <a href="/html/encyclopedia/physics.html#measures-and-units">fysikkens enheder</a>.</p> + <p class="graphicText">Evt. se <a href="/html/encyclopedia/physics.html#measures-and-units">fysikkens enheder</a>.</p> </div> <div class="section" id="formulas"> <p class="large">Formler</p> @@ -39,6 +39,20 @@ <p class="math">\(M = \frac{m}{n}\)</p> <p class="math">\(n = \frac{M}{m}\)</p> </div> + <div class="section" id="constants"> + <p class="large">Konstanter</p> + <table> + <tr> + <th>Navn</th> + <th>Symbol</th> + </tr> + <tr> + <td>Avagadros konstant</td> + <td class="math">\(N_a\)</td> + </tr> + </table> + <p class="math">\(N_a = 602\ 214\ 076 \cdot 10 ^ {15}\ mol ^ {-1}\)</p> + </div> </div> <!--#include virtual="/include/pgftr.shtml"--> </body> diff --git a/html/encyclopedia/mathematics.html b/html/encyclopedia/mathematics.html index 1a48d55..2e079a5 100644 --- a/html/encyclopedia/mathematics.html +++ b/html/encyclopedia/mathematics.html @@ -109,8 +109,8 @@ <p class="math">\(arcsec = sec ^ {-1}\)</p> <p class="math">\(arccsc = csc ^ {-1}\)</p> <br /> - <p class="math">\(deg(rad) = \frac{\pi x}{180}\)</p> - <p class="math">\(rad(deg) = \frac{180x}{\pi}\)</p> + <p class="math">\(deg(rad) = \frac{rad \cdot \pi}{180}\)</p> + <p class="math">\(rad(deg) = \frac{deg \cdot 180}{\pi}\)</p> <br /> <p class="math">\(vinkelsum(x) = \pi(x - 2)\)</p> <p class="math">\(vinkelsum(3) = \pi(3 - 2) = \pi\)</p> @@ -180,13 +180,12 @@ <td class="math">\(\phi\)</td> </tr> </table> - <br /> - <p class="math">\(\sqrt[2]{2} \approx \frac{1 414 213 562}{10 ^ 9}\)</p> - <p class="math">\(\sqrt[2]{3} \approx \frac{1 732 050 808}{10 ^ 9}\)</p> - <p class="math">\(e = \sum_{n = 0} ^ \infty \frac{1}{n!} \approx \frac{2 718 281 828}{10 ^ 9}\)</p> + <p class="math">\(\sqrt[2]{2} \approx \frac{1\ 414\ 213\ 562}{10 ^ 9}\)</p> + <p class="math">\(\sqrt[2]{3} \approx \frac{1\ 732\ 050\ 808}{10 ^ 9}\)</p> + <p class="math">\(e = \sum_{n = 0} ^ \infty \frac{1}{n!} \approx \frac{2\ 718\ 281\ 828}{10 ^ 9}\)</p> <p class="math">\(i = \sqrt[2]{-1}\)</p> - <p class="math">\(\pi \approx \frac{3 141 592 654}{10 ^ 9}\)</p> - <p class="math">\(\phi = \frac{1 + \sqrt[2]{5}}{2} \approx \frac{1 618 033 989}{10 ^ 9}\)</p> + <p class="math">\(\pi \approx \frac{3\ 141\ 592\ 654}{10 ^ 9}\)</p> + <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"--> diff --git a/html/encyclopedia/physics.html b/html/encyclopedia/physics.html index 920745d..08013e2 100644 --- a/html/encyclopedia/physics.html +++ b/html/encyclopedia/physics.html @@ -75,7 +75,7 @@ <tr> <td>specifik varmekapacitet</td> <td class="math">\(c\)</td> - <td>joule pr. kelvin gange kilogram</td> + <td>joule pr. kelvin-kilogram</td> <td class="math">\(\frac{J}{K \cdot kg}\)</td> </tr> <tr> @@ -167,8 +167,6 @@ <td>energi</td> </tr> </table> - <p>Evt. se <a href="/html/encyclopedia/chemistry.html#measures-and-units">kemiens enheder</a>.</p> - <br /> <p class="math">\(A = \frac{C}{s}\)</p> <br /> <p class="math">\(Hz = s ^ {-1}\)</p> @@ -239,12 +237,11 @@ <td class="math">\(k_b\)</td> </tr> </table> - <br /> - <p class="math">\(c = 299 792 458  \frac{m}{s}\)</p> - <p class="math">\(e = \frac{1 602 176 634}{10 ^ {28}} C \)</p> - <p class="math">\(G \approx \frac{66 743}{10 ^ {15}} \frac{m ^ 3}{kg \cdot s ^ 2}\)</p> - <p class="math">\(h = \frac{662 607 015}{10 ^ {42}} \frac{J}{Hz}\)</p> - <p class="math">\(k_b = \frac{1 380 649}{10 ^ {29}} \frac{J}{K}\)</p> + <p class="math">\(c = 299\ 792\ 458\ \frac{m}{s}\)</p> + <p class="math">\(e = \frac{1\ 602\ 176\ 634}{10 ^ {28}}\ C\)</p> + <p class="math">\(G \approx \frac{66\ 743}{10 ^ {15}}\ \frac{m ^ 3}{kg \cdot s ^ 2}\)</p> + <p class="math">\(h = \frac{662\ 607\ 015}{10 ^ {42}}\ \frac{J}{Hz}\)</p> + <p class="math">\(k_b = \frac{1\ 380\ 649}{10 ^ {29}}\ \frac{J}{K}\)</p> </div> </div> <!--#include virtual="/include/pgftr.shtml"--> |