diff options
| -rw-r--r-- | public/css/master.css | 24 | ||||
| -rw-r--r-- | public/images/icons/nav/calculators.png | bin | 0 -> 1057 bytes | |||
| -rw-r--r-- | public/images/icons/nav/user-desktop.png (renamed from public/images/icons/home2/user-desktop.png) | bin | 780 -> 780 bytes | |||
| -rw-r--r-- | public/sitemap.xml | 1 | ||||
| -rw-r--r-- | resources/views/calculators.blade.php | 64 | ||||
| -rw-r--r-- | resources/views/components/layout.blade.php | 6 | ||||
| -rw-r--r-- | resources/views/components/navbar.blade.php | 17 |
7 files changed, 69 insertions, 43 deletions
diff --git a/public/css/master.css b/public/css/master.css index 0d892d3..d344fba 100644 --- a/public/css/master.css +++ b/public/css/master.css @@ -34,7 +34,7 @@ h1.inline { h1, h2, h3 { - margin-top: 1em; + margin-top: 0; clear: left; } @@ -551,6 +551,10 @@ label[for="scheme-selector"] { margin: 0; } +.info-section { + margin-top: 20px; +} + .info-section ul { list-style-position: inside; list-style-type: none; @@ -567,7 +571,7 @@ label[for="scheme-selector"] { } .info-section p { - margin-top: 10px; + margin: 0; } .contact-section { @@ -654,3 +658,19 @@ form.import h2 { margin: 10px 0 5px 0; } +.calculator-spec-table td { + padding: 5px 10px 5px 5px; +} + +.calculator-spec-table tr td:first-child { + background-color: var(--background-secondary); +} + +a:hover img.navbar-icon { + opacity: 80%; +} + +.footer p { + margin: 0; + line-height: 1.2; +} diff --git a/public/images/icons/nav/calculators.png b/public/images/icons/nav/calculators.png Binary files differnew file mode 100644 index 0000000..a87a591 --- /dev/null +++ b/public/images/icons/nav/calculators.png diff --git a/public/images/icons/home2/user-desktop.png b/public/images/icons/nav/user-desktop.png Binary files differindex af9715f..af9715f 100644 --- a/public/images/icons/home2/user-desktop.png +++ b/public/images/icons/nav/user-desktop.png diff --git a/public/sitemap.xml b/public/sitemap.xml index a1cd3f5..783c056 100644 --- a/public/sitemap.xml +++ b/public/sitemap.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> +<!--suppress ALL --> <urlset xmlns="https://www.sitemaps.org/schemas/sitemap/0.9"> <url> <loc>https://www.diskfloppy.me</loc> diff --git a/resources/views/calculators.blade.php b/resources/views/calculators.blade.php index 5a2ccf4..7f3603b 100644 --- a/resources/views/calculators.blade.php +++ b/resources/views/calculators.blade.php @@ -1,20 +1,19 @@ -@extends('layouts.default') -@section('title', 'Calculators') -@section('description', 'C a l c u l a t o r s.') -@section('content') +<x-layout> + <x-slot:title>Calculators</x-slot:title> <h1>CASIO fx-CG50</h1> <p>TBD</p> <h2>Pictures</h2> - <p>Click images to view full size</p> - <a href="/images/calculators/casio-fx-cg50/1s.jpeg"><img src="/images/calculators/casio-fx-cg50/1s.jpeg" width="15%"></a> - <a href="/images/calculators/casio-fx-cg50/2s.jpeg"><img src="/images/calculators/casio-fx-cg50/2s.jpeg" width="15%"></a> - <a href="/images/calculators/casio-fx-cg50/3s.jpeg"><img src="/images/calculators/casio-fx-cg50/3s.jpeg" width="15%"></a> - <a href="/images/calculators/casio-fx-cg50/4s.jpeg"><img src="/images/calculators/casio-fx-cg50/4s.jpeg" width="15%"></a> + <img src="{{ asset('images/calculators/casio-fx-cg50/1s.jpeg') }}" width="15%" alt="Casio fx-CG50 Front view"> + <img src="{{ asset('images/calculators/casio-fx-cg50/2s.jpeg') }}" width="15%" alt="Casio fx-CG50 Rear view (battery cover removed)"> + <img src="{{ asset('images/calculators/casio-fx-cg50/3s.jpeg') }}" width="15%" alt="Casio fx-CG50 Front view (top half)"> + <img src="{{ asset('images/calculators/casio-fx-cg50/4s.jpeg') }}" width="15%" alt="Casio fx-CG50 Front view (bottom half)"> + + <hr> <h1>CASIO fx-120 (1977-78)</h1> <p>TBD</p> <h2>Specifications</h2> - <table class="skami"> + <table class="calculator-spec-table"> <tr> <td><b>Size</b></td> <td>8.4cm x 16.2cm x 2.4cm</td> @@ -46,36 +45,41 @@ </table> <h2>Pictures</h2> <p>Click images to view full size</p> - <a href="/images/calculators/casio-fx-120/1s.jpeg"><img src="/images/calculators/casio-fx-120/1s.jpeg" width="15%"></a> - <a href="/images/calculators/casio-fx-120/2s.jpeg"><img src="/images/calculators/casio-fx-120/2s.jpeg" width="15%"></a> - <a href="/images/calculators/casio-fx-120/3s.jpeg"><img src="/images/calculators/casio-fx-120/3s.jpeg" width="15%"></a> - <a href="/images/calculators/casio-fx-120/4s.jpeg"><img src="/images/calculators/casio-fx-120/4s.jpeg" width="15%"></a> + <img src="{{ asset('images/calculators/casio-fx-120/1s.jpeg') }}" width="15%" alt="Casio fx-120 Front view"> + <img src="{{ asset('images/calculators/casio-fx-120/2s.jpeg') }}" width="15%" alt="Casio fx-120 Front view (top half)"> + <img src="{{ asset('images/calculators/casio-fx-120/3s.jpeg') }}" width="15%" alt="Casio fx-120 Front view (bottom half)"> + <img src="{{ asset('images/calculators/casio-fx-120/4s.jpeg') }}" width="15%" alt="Casio fx-120 Rear view (battery and expansion covers removed"> + + <hr> <h1>CASIO fx-82 (1982-85)</h1> <p>TBD</p> <h2>Pictures</h2> <p>Click images to view full size</p> - <a href="/images/calculators/casio-fx-82/1s.jpeg"><img src="/images/calculators/casio-fx-82/1s.jpeg" width="15%"></a> - <a href="/images/calculators/casio-fx-82/2s.jpeg"><img src="/images/calculators/casio-fx-82/2s.jpeg" width="15%"></a> - <a href="/images/calculators/casio-fx-82/3s.jpeg"><img src="/images/calculators/casio-fx-82/3s.jpeg" width="15%"></a> - <a href="/images/calculators/casio-fx-82/4s.jpeg"><img src="/images/calculators/casio-fx-82/4s.jpeg" width="15%"></a> + <img src="{{ asset('images/calculators/casio-fx-82/1s.jpeg') }}" width="15%" alt="Casio fx-82 Front view"> + <img src="{{ asset('images/calculators/casio-fx-82/2s.jpeg') }}" width="15%" alt="Casio fx-82 Rear view (battery cover removed)"> + <img src="{{ asset('images/calculators/casio-fx-82/3s.jpeg') }}" width="15%" alt="Casio fx-82 Front view (top half)"> + <img src="{{ asset('images/calculators/casio-fx-82/4s.jpeg') }}" width="15%" alt="Casio fx-82 Front view (bottom half)"> + + <hr> <h1>Texas Instruments TI-30 (1976-90)</h1> <p>TBD</p> <h2>Pictures</h2> <p>Click images to view full size</p> - <a href="/images/calculators/ti-30/1s.jpeg"><img src="/images/calculators/ti-30/1s.jpeg" width="15%"></a> - <a href="/images/calculators/ti-30/2s.jpeg"><img src="/images/calculators/ti-30/2s.jpeg" width="15%"></a> - <a href="/images/calculators/ti-30/3s.jpeg"><img src="/images/calculators/ti-30/3s.jpeg" width="15%"></a> - <a href="/images/calculators/ti-30/4s.jpeg"><img src="/images/calculators/ti-30/4s.jpeg" width="15%"></a> + <img src="{{ asset('images/calculators/ti-30/1s.jpeg') }}" width="15%" alt="Texas Instruments TI-30 Front view (with manual)"> + <img src="{{ asset('images/calculators/ti-30/2s.jpeg') }}" width="15%" alt="Texas Instruments TI-30 Rear view (battery cover removed)"> + <img src="{{ asset('images/calculators/ti-30/3s.jpeg') }}" width="15%" alt="Texas Instruments TI-30 Front view (top half)"> + <img src="{{ asset('images/calculators/ti-30/4s.jpeg') }}" width="15%" alt="Texas Instruments TI-30 Front view (bottom half)"> - <h1>Texet 880 Executive (1977-78)</h1> + <hr> + <h1>Texet 880 Executive (1977-78)</h1> <p>The calculator measures 74.2mm x 135mm x 22.2mm. It weighs 86g without the battery installed, which is a 9v PP3-type battery. Rather than the usual press-stud type holder, the housing has two metal slide clips. There is also what I assume to be a sponge at one end which is supposed to aid in holding the battery in, however it appears to have gone completely hard and I will most likely replace it in the future. There's small adaptor hole at the top, of which the input isn't specified (though it's generally agreed that it's 4.5v centre-positive).</p> <p>The case is black & silvery colored with a thin brushed metallic front panel. The eight-digit bubble display has an absolutely <i>terrible</i> viewing angle, which means you either have to be holding it under your coat or against your face to read it!</p> - The keypad is particularly strange in the way that it has 3 cancel buttons, <pre>[CE]</pre>, <pre>[C]</pre> and <pre>[CA]</pre>, while the <pre>[CS]</pre> button is a Clear Sign button, <i>not</i> another cancel! The keys themselves are particularly stiff and you really have to push them to get them to register. Many 880s suffered something referred to as the "pseudo fixed decimal bug" where, if you typed in <pre>1 + 1.00 = </pre>, it would display <pre>2.00</pre> instead of the expected <pre>2</pre> + The keypad is particularly strange in the way that it has 3 cancel buttons, <pre>[CE]</pre>, <pre>[C]</pre> and <pre>[CA]</pre>, while the <pre>[CS]</pre> button is a Clear Sign button, <i>not</i> another cancel! The keys themselves are particularly stiff, and you really have to push them to get them to register. Many 880s suffered something referred to as the "pseudo fixed decimal bug" where, if you typed in <pre>1 + 1.00 = </pre>, it would display <pre>2.00</pre> instead of the expected <pre>2</pre> <h2>Specifications</h2> - <table class="skami"> + <table class="calculator-spec-table"> <tr> <td><b>Size</b></td> <td>7.4cm x 13.5cm x 2.2cm</td> @@ -103,8 +107,8 @@ </table> <h2>Pictures</h2> <p>Click images to view full size</p> - <a href="/images/calculators/texet-880/1s.jpeg"><img src="/images/calculators/texet-880/1s.jpeg" width="15%"></a> - <a href="/images/calculators/texet-880/2s.jpeg"><img src="/images/calculators/texet-880/2s.jpeg" width="15%"></a> - <a href="/images/calculators/texet-880/3s.jpeg"><img src="/images/calculators/texet-880/3s.jpeg" width="15%"></a> - <a href="/images/calculators/texet-880/4s.jpeg"><img src="/images/calculators/texet-880/4s.jpeg" width="15%"></a> -@stop + <img src="{{ asset('images/calculators/texet-880/1s.jpeg') }}" width="15%" alt="Texet 880 Executive Front view"> + <img src="{{ asset('images/calculators/texet-880/2s.jpeg') }}" width="15%" alt="Texet 880 Executive Rear view (battery cover removed)"> + <img src="{{ asset('images/calculators/texet-880/3s.jpeg') }}" width="15%" alt="Texet 880 Executive Front view (top half)"> + <img src="{{ asset('images/calculators/texet-880/4s.jpeg') }}" width="15%" alt="Texet 880 Executive Front view (bottom half)"> +</x-layout> diff --git a/resources/views/components/layout.blade.php b/resources/views/components/layout.blade.php index 54fcf7a..32e3c67 100644 --- a/resources/views/components/layout.blade.php +++ b/resources/views/components/layout.blade.php @@ -57,8 +57,8 @@ <img src="{{ URL::asset('images/buttons/wiby.gif') }}" width="88" height="31" class="pixel" alt="Wiby - Search Engine for the Classic Web"> </a><br> - This site is best viewed at 1024x768 with 16-bit color or better<br> - © floppydisk 2021-{{ date('Y') }}, v{{ config('app.version') }} <a + <p>This site is best viewed at 1024x768 with 16-bit color or better<br> + © floppydisk 2021-{{ date('Y') }}, v{{ config('app.version') }}, <a href="https://github.com/floppydisk05/diskfloppy.me">Source</a>, Served by {{ gethostname() }}<br> <label for="scheme-selector">Color Scheme:</label> @@ -95,7 +95,7 @@ <option value="slate">Slate</option> <option value="solarized-dark">Solarized Dark</option> </optgroup> - </select><br> + </select></p> </div> </div> <!-- footer --> </div> <!-- page --> diff --git a/resources/views/components/navbar.blade.php b/resources/views/components/navbar.blade.php index aeed5ab..1853a51 100644 --- a/resources/views/components/navbar.blade.php +++ b/resources/views/components/navbar.blade.php @@ -2,14 +2,15 @@ <h1>{{ str_replace("www.", "", Request::getHost()) }} | <strong>{{ $title }}</strong></h1> <div class="nav-wrapper"> <div> - <a href="/" title="Home"><img class="pixel" src="{{ asset('images/icons/nav/home2.png') }}" alt="Home" width="32" height="32"></a> - <a href="//git.diskfloppy.me/" title="cgit"><img class="pixel" src="{{ asset('images/icons/nav/repo.png') }}" alt="cgit" width="32" height="32"></a> - <a href="/pub/" title="Public Files"><img class="pixel" src="{{ asset('images/icons/nav/pubfiles.png') }}" alt="Public Files" width="32" height="32"></a> - <a href="/computers/" title="Computers"><img class="pixel" src="{{ asset('images/icons/nav/computers.png') }}" alt="Computers" width="32" height="32"></a> - <a href="/bookmarks/" title="Bookmarks"><img class="pixel" src="{{ asset('images/icons/nav/bookmarks.png') }}" alt="Bookmarks" width="32" height="32"></a> - <a href="/guestbook/" title="Guestbook"><img class="pixel" src="{{ asset('images/icons/nav/guestbook.png') }}" alt="Guestbook" width="32" height="32"></a> - <a href="//weather.diskfloppy.me/" title="Weather"><img class="pixel" src="{{ asset('images/icons/nav/weather.png') }}" alt="Weather" width="32" height="32"></a> - <a href="/music/" title="Music"><img class="pixel" src="{{ asset('images/icons/nav/music.png') }}" alt="Music" width="32" height="32"></a> + <a href="/" title="Home"><img class="pixel navbar-icon" src="{{ asset('images/icons/nav/home2.png') }}" alt="Home" width="32" height="32"></a> + <a href="//git.diskfloppy.me/" title="cgit"><img class="pixel navbar-icon" src="{{ asset('images/icons/nav/repo.png') }}" alt="cgit" width="32" height="32"></a> + <a href="/pub/" title="Public Files"><img class="pixel navbar-icon" src="{{ asset('images/icons/nav/pubfiles.png') }}" alt="Public Files" width="32" height="32"></a> + <a href="/computers/" title="Computers"><img class="pixel navbar-icon" src="{{ asset('images/icons/nav/computers.png') }}" alt="Computers" width="32" height="32"></a> + <a href="/calculators/" title="Calculators"><img class="pixel navbar-icon" src="{{ asset('images/icons/nav/calculators.png') }}" alt="Calculators" width="32" height="32"></a> + <a href="/bookmarks/" title="Bookmarks"><img class="pixel navbar-icon" src="{{ asset('images/icons/nav/bookmarks.png') }}" alt="Bookmarks" width="32" height="32"></a> + <a href="/guestbook/" title="Guestbook"><img class="pixel navbar-icon" src="{{ asset('images/icons/nav/guestbook.png') }}" alt="Guestbook" width="32" height="32"></a> + <a href="//weather.diskfloppy.me/" title="Weather"><img class="pixel navbar-icon" src="{{ asset('images/icons/nav/weather.png') }}" alt="Weather" width="32" height="32"></a> + <a href="/music/" title="Music"><img class="pixel navbar-icon" src="{{ asset('images/icons/nav/music.png') }}" alt="Music" width="32" height="32"></a> </div> </div> </nav> |
