Merge branch 'main' of git.unl.edu:jackmnolley/react-redux-starter-code

f7aa306e · Gabriel Clark · 545f3785 · db47424f · f7aa306e · 545f3785
Commit f7aa306e authored 3 years ago by Gabriel Clark
--- a/unit-conversion/public/index.html
+++ b/unit-conversion/public/index.html
@@ -9,8 +9,8 @@
      content="An app that takes units and converts them to other units"
    />
    <meta name="theme-color" content="rgba(208 0 0 / 100%)" />
-    <link rel="icon" href="%PUBLIC_URL%/logo.svg" />
-    <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo.svg" />
+    <link rel="icon" href="u.svg" />
+    <link rel="apple-touch-icon" href="u.svg" />
    <title>Unit Conversion</title>
  </head>
  <body>

--- a/unit-conversion/public/logo.svg
+++ b/unit-conversion/public/logo.svg
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 152 152">
-  <rect x="0" y="0" width="152" height="152" fill="rgba(0 0 0 / 100%)" />
-  <path d="M147,1H90V42h10V75.673L53.532,2.393,52.648,1H2V42H12v66H2v41H62V108H52V74.336l46.467,73.271L99.351,149H150V108H140V42h10V1Z" stroke-width="3" stroke="rgba(255 255 255 / 100%)" fill="rgba(208 0 0 / 100%)">
-  </path>
-</svg>
--- a/unit-conversion/public/manifest.json
+++ b/unit-conversion/public/manifest.json
@@ -4,7 +4,7 @@
  "description": "An app that takes units and converts them to other units",
  "icons": [
    {
-      "src": "logo.svg",
+      "src": "u.svg",
      "type": "image/svg+xml",
      "sizes": "192x192 512x512",
      "purpose": "any maskable"

--- a/unit-conversion/public/u.svg
+++ b/unit-conversion/public/u.svg
+<svg id="Capa_1" enable-background="new 0 0 512 512" height="512" viewBox="0 0 512 512" width="512" xmlns="http://www.w3.org/2000/svg"><g id="U"><path d="m337.255 281.038c.015 67.588-1.025 87.876-24.229 105.894-22.163 17.227-82.017 19.79-110.537-1.201-27.246-20.039-28.315-48.384-27.847-96.782l.103-288.949h-128.745v268.557c0 93.472 0 181.758 103.638 226.406 47.595 20.546 154.453 24.243 211.816 1.465 104.546-41.528 104.546-129.477 104.546-231.738v-264.69h-128.745z"/></g></svg>
\ No newline at end of file
--- a/unit-conversion/src/features/card/card.css
+++ b/unit-conversion/src/features/card/card.css
@@ -13,6 +13,7 @@
    0 22.3px 17.9px rgba(0 0 0 / 7.2%),
    0 41.8px 33.4px rgba(0 0 0 / 8.6%),
    0 100px 80px rgba(0 0 0 / 12%);
+  padding-left: 40px;
 }

 .inputField {

--- a/unit-conversion/src/features/card/card.js
+++ b/unit-conversion/src/features/card/card.js
--- a/unit-conversion/src/features/ending-number-output/endingNumberOutput.js
+++ b/unit-conversion/src/features/ending-number-output/endingNumberOutput.js
--- a/unit-conversion/src/features/number-input-field/numberInputField.js
+++ b/unit-conversion/src/features/number-input-field/numberInputField.js
--- a/unit-conversion/src/features/number-input-field/numberInputFieldSlice.js
+++ b/unit-conversion/src/features/number-input-field/numberInputFieldSlice.js
--- a/unit-conversion/src/features/unit-selector/unitSelector.js
+++ b/unit-conversion/src/features/unit-selector/unitSelector.js
--- a/unit-conversion/src/features/unit-selector/unitSelectorSlice.js
+++ b/unit-conversion/src/features/unit-selector/unitSelectorSlice.js