From fe4e49da11c5eaac7844801a936abec6cd8e50df Mon Sep 17 00:00:00 2001 From: dpilafian Date: Sat, 24 Aug 2024 03:35:11 -0700 Subject: [PATCH] Rename Rules to The Rules --- src/templates/generated/articles.html | 2 +- src/templates/table-of-products.html | 2 +- .../index.html | 39 +++++++++++++----- .../{rules => the-rules}/asian-elephant.jpg | Bin .../article/{rules => the-rules}/cvn-75.jpg | Bin .../article/{rules => the-rules}/index.html | 2 +- .../liberia-and-myanmar.png | Bin .../{rules => the-rules}/whipshots-50ml.jpg | Bin src/website/css/components.less | 14 +++++-- src/website/css/layout.less | 24 +++++++---- 10 files changed, 58 insertions(+), 25 deletions(-) rename src/website/article/{rules => the-rules}/asian-elephant.jpg (100%) rename src/website/article/{rules => the-rules}/cvn-75.jpg (100%) rename src/website/article/{rules => the-rules}/index.html (99%) rename src/website/article/{rules => the-rules}/liberia-and-myanmar.png (100%) rename src/website/article/{rules => the-rules}/whipshots-50ml.jpg (100%) diff --git a/src/templates/generated/articles.html b/src/templates/generated/articles.html index 0d2ec31..d8c7e1b 100644 --- a/src/templates/generated/articles.html +++ b/src/templates/generated/articles.html @@ -10,4 +10,4 @@
  • The Millimeter Standard War
  • A Pint Is Not a Unit of Measurement
  • Review a Quality Metric-Only Product
    • -
  • Rules
    • +
  • The Rules
    • diff --git a/src/templates/table-of-products.html b/src/templates/table-of-products.html index 676ae7c..5e1505f 100644 --- a/src/templates/table-of-products.html +++ b/src/templates/table-of-products.html @@ -190,7 +190,7 @@ preview - 90 Degree L Shaped Dual Angle Side Square Layout Tool, 150×300 mm + 90 Degree L Shaped Dual-Angle Side Square Layout Tool, 150×300 mm Stainless steel preview diff --git a/src/website/article/fractions-are-a-royal-pain-in-imperial/index.html b/src/website/article/fractions-are-a-royal-pain-in-imperial/index.html index ce2ce49..7b03870 100644 --- a/src/website/article/fractions-are-a-royal-pain-in-imperial/index.html +++ b/src/website/article/fractions-are-a-royal-pain-in-imperial/index.html @@ -84,9 +84,21 @@

    0.3333333333

    Some imperial zealots obsess about 1/3 because they incorrectly believe that dividing by 3 is incompatible with metric.  - When they pull the 1/3 stunt, simply ask them what's 1/3 of a U.S. dollar?  - There's never been a world financial meltdown because someone couldn't do division on a - dollar.  + When they pull the 1/3 stunt, simply ask them what's 1/3 of a cup?  +

    + + + + + + + +
    What's 1/3 of...Answer
    a cup in ounces? 2.666 ounces Awkward
    a cup in tablespoons? 5.333 tablespoons Awkward
    a U.S. dollar? 33¢
    +

    + While the imperial zealot is stewing over the awkwardness of 1/3 of cup, ask if they + would have trouble figuring out 1/3 of a U.S. dollar?  + The U.S. dollar is metric and there's never been a world financial meltdown because + someone couldn't do division on a dollar. 

    Answering the 1/3 question in metric is not a problem.  @@ -96,19 +108,26 @@

    0.3333333333

    Even if you need to pull out a calculator, metric is still far less effort.  - Let's say your measurement is 1,267 mm.  - You punch 1,267 into your calculator and divide by 3, and you're done in one + Let's say your measurement is 1,107 mm.  + You punch 1,107 into your calculator and divide by 3, and you're done in one operation. 

    + + + + + + +
    What's 1/3 of...Calculation
    1,107 mm? 1107 ÷ 3 = 369
    43 5/8 inches? ((5 ÷ 8) + 43) / 3 14.54 14 ?/8 Awkward
    fractions -
    Where are the tick marks for 63/100 of an inch?  😡 😤 🤬
    +
    Where are the tick marks for 54/100 of an inch?  😡 😤 🤬

    - The imperial equivalent is 49 7/8 inches, so you punch 7 into your calculator and divide - by 8 then add 49 then hit equals and finally divide by 3.  - You get 16.63 inches, but sadly your tape measure does not have tick marks - for 0.63 of an inch.  + The imperial equivalent is 43 5/8 inches, so you punch 5 into your calculator and divide + by 8 then add 43 then hit equals and finally divide by 3.  + You get 14.54 inches, but sadly your tape measure does not have tick marks for 54/100 of + an inch.  Doh!  What a royal pain for something so trivial. 

    diff --git a/src/website/article/rules/asian-elephant.jpg b/src/website/article/the-rules/asian-elephant.jpg similarity index 100% rename from src/website/article/rules/asian-elephant.jpg rename to src/website/article/the-rules/asian-elephant.jpg diff --git a/src/website/article/rules/cvn-75.jpg b/src/website/article/the-rules/cvn-75.jpg similarity index 100% rename from src/website/article/rules/cvn-75.jpg rename to src/website/article/the-rules/cvn-75.jpg diff --git a/src/website/article/rules/index.html b/src/website/article/the-rules/index.html similarity index 99% rename from src/website/article/rules/index.html rename to src/website/article/the-rules/index.html index e0ccf52..8fc9822 100644 --- a/src/website/article/rules/index.html +++ b/src/website/article/the-rules/index.html @@ -1,4 +1,4 @@ -{% assign articleTitle = 'Rules' %} +{% assign articleTitle = 'The Rules' %} {% assign heroImage = 'cvn-75.jpg' %} {% assign heroCaption = 'USS Harry S. Truman (CVN 75)' %} {% render 'src/templates/doc-begin.html', articleTitle: articleTitle, heroImage: heroImage, heroCaption: heroCaption %} diff --git a/src/website/article/rules/liberia-and-myanmar.png b/src/website/article/the-rules/liberia-and-myanmar.png similarity index 100% rename from src/website/article/rules/liberia-and-myanmar.png rename to src/website/article/the-rules/liberia-and-myanmar.png diff --git a/src/website/article/rules/whipshots-50ml.jpg b/src/website/article/the-rules/whipshots-50ml.jpg similarity index 100% rename from src/website/article/rules/whipshots-50ml.jpg rename to src/website/article/the-rules/whipshots-50ml.jpg diff --git a/src/website/css/components.less b/src/website/css/components.less index 41171f3..06d433e 100644 --- a/src/website/css/components.less +++ b/src/website/css/components.less @@ -14,7 +14,7 @@ section { padding: 0px 0.4em; } - .ballot-x-mark { + .BallotMark(@symbol, @color) { position: relative; text-align: center; &::before { @@ -22,12 +22,20 @@ section { top: -0.18em; left: 0px; right: 0px; - content: @symbolBallotXMark; + content: @symbol; font-size: 2rem; - color: firebrick; + color: @color; } } + .ballot-checkmark { + .BallotMark(@symbolCheckmark, green); + } + + .ballot-x-mark { + .BallotMark(@symbolBallotXMark, firebrick); + } + code.block { display: block; font-size: 0.9rem; diff --git a/src/website/css/layout.less b/src/website/css/layout.less index 171c47e..f43521a 100644 --- a/src/website/css/layout.less +++ b/src/website/css/layout.less @@ -58,15 +58,21 @@ font-size: 1rem; text-align: left; } - tbody tr td { - font-size: 1rem; - .MobileMode({ font-size: 0.9rem; }); - text-align: left; - } - tbody tr th { - i.font-icon { - font-size: 1.1em; - padding-right: 0.4em; + tbody tr { + th[colspan] { + padding: 6px 0px; + i.font-icon { + font-size: 1.1em; + padding-right: 0.4em; + } + } + td { + font-size: 1rem; + .MobileMode({ font-size: 0.9rem; }); + text-align: left; + i.font-icon { + color: steelblue; + } } } }