Fix bug with scrollbars not rendering correctly.

iaincollins · Feb 9, 2024 · b90aa26 · b90aa26
1 parent a001ba5
commit b90aa26
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 62 deletions.
diff --git a/components/dialog/about-dialog.js b/components/dialog/about-dialog.js
@@ -24,60 +24,50 @@ export default ({ toggle }) => {
   return (
     <Dialog title='About' toggle={toggle}>
       <p>
-        Trade &amp; exploration data for <a href='https://www.elitedangerous.com/' rel='noreferrer' target='_blank'>Elite Dangerous</a>.
-      </p>
-      <p>
-        Uses data submitted to <a href='https://eddn.edcd.io' rel='noreferrer' target='_blank'>EDDN</a>, which is run by <a href='https://edcd.github.io/' rel='noreferrer' target='_blank'>EDCD</a>.
+        ArdentOS v{Package.version}
+        {' '}
+        {version &&
+          <a style={{ textTransform: 'none' }} href={API_BASE_URL} rel='noreferrer' target='_blank' className='muted'>
+            [ API v{version.version} ]
+          </a>}
+        {' '}
+       for <a href='https://www.elitedangerous.com/' rel='noreferrer' target='_blank'>Elite Dangerous</a>.
       </p>
       {stats &&
         <>
+        <p>
+          Processed {stats.updatedInLast24Hours.toLocaleString()} updates in the last 24 hours.
+        </p>
           <ul className='clear'>
             <li>
-              Trade Data
-              <ul>
-                <li>
-                  Trade Orders: {stats.trade.tradeOrders.toLocaleString()}
-                </li>
-                <li>
-                  Markets: {(stats.trade.stations + stats.trade.carriers).toLocaleString()}
-                </li>
-                <li>
-                  Trade Systems: {stats.trade.systems.toLocaleString()}
-                </li>
-              </ul>
-            </li>
-            <li>Location Data
-              <ul>
-                <li>
-                  Star systems: {stats.systems.toLocaleString()}
-                </li>
-                <li>
-                  Stations &amp; Settlements: {stats.stations.stations.toLocaleString()}
-                </li>
-                <li>
-                  Fleet Carriers: {stats.stations.carriers.toLocaleString()}
-                </li>
-                <li>
-                  Points of Interest: {stats.pointsOfInterest.toLocaleString()}
-                </li>
-              </ul>
-            </li>
+                Trade Orders: {stats.trade.tradeOrders.toLocaleString()}
+              </li>
+              <li>
+                Trade Orders: {stats.trade.tradeOrders.toLocaleString()}
+              </li>
+              <li>
+                Markets: {(stats.trade.stations + stats.trade.carriers).toLocaleString()}
+              </li>
+              <li>
+                Trade Systems: {stats.trade.systems.toLocaleString()}
+              </li>
+              <li>
+                Star systems: {stats.systems.toLocaleString()}
+              </li>
+              <li>
+                Stations &amp; Settlements: {stats.stations.stations.toLocaleString()}
+              </li>
+              <li>
+                Fleet Carriers: {stats.stations.carriers.toLocaleString()}
+              </li>
+              <li>
+                Points of Interest: {stats.pointsOfInterest.toLocaleString()}
+              </li>
           </ul>
         </>}
-
-      <h3>Version</h3>
-      <ul className='clear'>
-        <li>
-          ArdentOS version {Package.version}
-        </li>
-        <li className='clear'>
-          {version &&
-            <a style={{ textTransform: 'none' }} href={API_BASE_URL} rel='noreferrer' target='_blank'>
-              Ardent API version {version.version}
-            </a>}
-        </li>
-      </ul>
-
+      <p>
+        Uses data submitted to <a href='https://eddn.edcd.io' rel='noreferrer' target='_blank'>EDDN</a>, which is run by <a href='https://edcd.github.io/' rel='noreferrer' target='_blank'>EDCD</a>.
+      </p>
       <h3>Downloads</h3>
       <p className='clear'>
         The software and data for Ardent Industry is open source.

diff --git a/css/index.css b/css/index.css
@@ -34,17 +34,6 @@ i[class*=" icarus-terminal-"] {
 
 body,
 .scrollable {
-  scrollbar-width: none;
-}
-
-body::-webkit-scrollbar,
-.scrollable::-webkit-scrollbar {
-  width: 0px;
-}
-
-body,
-.scrollable {
-  scrollbar-width: none;
   overflow-x: hidden !important;
 }
 

diff --git a/css/layout.css b/css/layout.css
@@ -55,7 +55,7 @@
     black calc(100% - 1.5rem),
     transparent
   ), linear-gradient(black, black);
-  mask-size: calc(100% - 1rem) 100%, 1rem 100%;
+  mask-size: 100% 100%, 1rem 100%;
   mask-position: 0 0, 100% 0;
   mask-repeat: no-repeat, no-repeat;
 }
diff --git a/css/variables.css b/css/variables.css
@@ -16,6 +16,6 @@
   --color-primary-dark: hsl(0, 0%, 60%);
   --color-primary-darker: hsl(0, 0%, 40%);
 
-  --color-window-scrollbar-thumb: rgb(250, 241, 228);
-  --color-window-scrollbar-track: rgb(103, 100, 94);
+  --color-window-scrollbar-thumb: rgba(250, 241, 228);
+  --color-window-scrollbar-track: rgba(103, 100, 94);
 }
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ardent-www",
-  "version": "0.38.6",
+  "version": "0.38.7",
   "description": "Ardent Industry",
   "main": "index.js",
   "scripts": {