Merge branch 'stevejcl:apiV2' into apiV2

acocalypso · Apr 24, 2024 · 5137004 · 5137004
2 parents 02c39e8 + f7cb534
commit 5137004
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 10 deletions.
diff --git a/src/components/shared/CalibrationDwarf.tsx b/src/components/shared/CalibrationDwarf.tsx
@@ -190,8 +190,8 @@ export default function CalibrationDwarf() {
         <button
           className={`btn ${
             connectionCtx.connectionStatus
-              ? "btn-more02 btn-2lines"
-              : "btn-more02 btn-2lines"
+              ? "btn-more02"
+              : "btn-more02"
           } me-4 mt-3`}
           onClick={RingLightsOffFn}
           disabled={!connectionCtx.connectionStatus}
@@ -206,8 +206,8 @@ export default function CalibrationDwarf() {
         <button
           className={`btn ${
             connectionCtx.connectionStatus
-              ? "btn-more03 btn-2lines"
-              : "btn-more03 btn-2lines"
+              ? "btn-more03"
+              : "btn-more03"
           } me-4 mt-3`}
           onClick={RingLightsOnFn}
           disabled={!connectionCtx.connectionStatus}
@@ -225,8 +225,8 @@ export default function CalibrationDwarf() {
         <button
           className={`btn ${
             connectionCtx.connectionStatus
-              ? "btn-more02 btn-2lines"
-              : "btn-more02 btn-2lines"
+              ? "btn-more02"
+              : "btn-more02"
           } me-4 mt-3`}
           onClick={PowerLightsOffFn}
           disabled={
@@ -244,8 +244,8 @@ export default function CalibrationDwarf() {
         <button
           className={`btn ${
             connectionCtx.connectionStatus
-              ? "btn-more03 btn-2lines"
-              : "btn-more03 btn-2lines"
+              ? "btn-more03"
+              : "btn-more03"
           } me-4 mt-3`}
           onClick={PowerLightsOnFn}
           disabled={

diff --git a/src/styles/globals.css b/src/styles/globals.css
@@ -876,6 +876,22 @@ img {
             margin-top: 0px; /* Add some spacing between button and other elements */
         }
 }
+@media (max-width: 768px) {
+    /* Adjusting column widths for small screens */
+    .col-sm-1,
+    .col-sm-3,
+    .col-sm-4 {
+        flex: 0 0 auto;
+        max-width: none;
+    }
+
+    /* Adjusting margin for buttons on small screens */
+    button {
+        margin-top: 0.5rem;
+        margin-right: 0.5rem;
+    }
+}
+
 .footer {
     position: fixed;
     bottom: 0;

diff --git a/src/styles/modal.css b/src/styles/modal.css
@@ -73,8 +73,8 @@
 }
 
 .btn {
-    height: 40px;
-    border-radius: 0;
+    height: 50px;
+    border-radius: 5px;
     // focus &:focus, &:active, &:active:focus
 
 {

diff --git a/src/styles/style.min.css b/src/styles/style.min.css