Merge

RaspberryPiFoundation · Nov 17, 2023 · 79ca85a · 79ca85a
1 parent 8b82f90
commit 79ca85a
Show file tree

Hide file tree

Showing 25 changed files with 46 additions and 46 deletions.
diff --git a/src/assets/stylesheets/Button.scss b/src/assets/stylesheets/Button.scss
@@ -57,7 +57,7 @@
   font-weight: $font-weight-bold;
   gap: $space-0-5;
   justify-content: center;
-  margin: 6px 6px;
+  margin: 6px;
   min-height: 44px;
   min-width: 44px;
   padding: 10px;
@@ -113,7 +113,7 @@
   &--tertiary {
     $colours: inherit, inherit, inherit, $rpf-grey-600, inherit, inherit, inherit;
     @include button-styling($colours...);
-      margin: 0 0;
+      margin: 0;
 
     &:active {
       color: $rpf-teal-900;
@@ -150,7 +150,7 @@
 
   &--svg-only {
     svg {
-      margin: 0 0;
+      margin: 0;
     }
   }
 }

diff --git a/src/assets/stylesheets/ContextMenu.scss b/src/assets/stylesheets/ContextMenu.scss
@@ -4,10 +4,10 @@
 .context-menu__drop {
   display: flex;
   padding: $space-0-5 $space-1;
-  margin: 0 0;
+  margin: 0;
 
   svg {
-    margin: 0 0;
+    margin: 0;
   }
 }
 
@@ -21,7 +21,7 @@
   flex-direction: column;
 
   .context-menu__item {
-    margin: 0 0;
+    margin: 0;
     background-color: inherit;
     color: inherit;
     padding: $space-0-5;

diff --git a/src/assets/stylesheets/ErrorMessage.scss b/src/assets/stylesheets/ErrorMessage.scss
@@ -8,7 +8,7 @@
 
   &__content {
     padding: 0;
-    margin: 0 0;
+    margin: 0;
   }
 
   &--medium {

diff --git a/src/assets/stylesheets/FilePanel.scss b/src/assets/stylesheets/FilePanel.scss
@@ -20,7 +20,7 @@
   font-weight: $font-weight-regular;
   min-height: 44px;
   padding: $space-0-5 $space-2-5 $space-0-5 $space-0-5;
-  margin: 0 0;
+  margin: 0;
   span {
     font-weight: $font-weight-bold;
     overflow-x: hidden;

diff --git a/src/assets/stylesheets/InfoPanel.scss b/src/assets/stylesheets/InfoPanel.scss
@@ -9,7 +9,7 @@
   margin-block-end: $space-0-5;
 
   p {
-		margin: 0 0;
+		margin: 0;
   }
 }
 

diff --git a/src/assets/stylesheets/LandingPage.scss b/src/assets/stylesheets/LandingPage.scss
@@ -27,7 +27,7 @@
 
 .landing-page__projects--title {
   @include font-size-2-5(regular);
-  margin: $space-1 $space-1;
+  margin: $space-1;
 
   @media screen and (min-width: 375px) {
     @include font-size-3(regular);
@@ -37,7 +37,7 @@
 .landing-page__projects--subtitle {
   @include font-size-1-5(regular);
   font-weight: $font-weight-regular;
-  margin: $space-1 $space-1;
+  margin: $space-1;
 
   @media screen and (min-width: 375px) {
     @include font-size-2(regular);
@@ -72,10 +72,10 @@
 }
 
 .landing-page__paths-copy {
-  margin: auto auto;
+  margin: auto;
 
   @media screen and (min-width: 768px) {
-    margin: unset unset;
+    margin: unset;
     max-width: 300px;
   }
 }
@@ -115,7 +115,7 @@
   img {
     aspect-ratio: 3/2;
     display: block;
-    margin: auto auto;
+    margin: auto;
     max-width: 301px;
     width: 100%;
   }
@@ -124,7 +124,7 @@
     margin-inline-start: auto;
 
     img {
-      margin: unset unset;
+      margin: unset;
       width: unset;
     }
   }

diff --git a/src/assets/stylesheets/MobileProject.scss b/src/assets/stylesheets/MobileProject.scss
@@ -2,7 +2,7 @@
 @use './rpf_design_system/colours' as *;
 
 .proj-container--mobile {
-  margin: 0 0;
+  margin: 0;
   gap: 0;
 }
 
@@ -36,7 +36,7 @@
 }
 
 .mobile-nav__menu {
-  margin: 0 0;
+  margin: 0;
   border-radius: 0;
   border: none;
   display: flex;

diff --git a/src/assets/stylesheets/Modal.scss b/src/assets/stylesheets/Modal.scss
@@ -73,12 +73,12 @@
 
 .modal-content__subheading {
   @include font-size-1(regular);
-  margin: 0 0;
+  margin: 0;
   font-weight: $font-weight-bold;
 }
 
 .modal-content__text {
-  margin: 0 0;
+  margin: 0;
   line-height: $line-height-regular;
 }
 
@@ -114,7 +114,7 @@
 
   button,
   a {
-    margin: 0 0;
+    margin: 0;
 
     span {
       width: 100%;

diff --git a/src/assets/stylesheets/NewComponentButton.scss b/src/assets/stylesheets/NewComponentButton.scss
@@ -4,5 +4,5 @@
   justify-content: center;
   width: 100%;
   box-sizing: border-box;
-  margin: 0 0;
+  margin: 0;
 }
diff --git a/src/assets/stylesheets/Notifications.scss b/src/assets/stylesheets/Notifications.scss
@@ -8,7 +8,7 @@
   .toast--top-center__message {
     min-height: fit-content;
     padding: $space-0-25 $space-0-5;
-    margin: 0 0;
+    margin: 0;
   }
 
   .toast--bottom-center {

diff --git a/src/assets/stylesheets/Project.scss b/src/assets/stylesheets/Project.scss
@@ -38,7 +38,7 @@
   overflow-y: hidden;
 
   grid-gap: $space-1;
-  margin: $space-1 $space-1;
+  margin: $space-1;
 
   height: 100%;
   height: -moz-available;

diff --git a/src/assets/stylesheets/ProjectBar.scss b/src/assets/stylesheets/ProjectBar.scss
@@ -45,7 +45,7 @@
   }
 
   .project-bar__btn {
-    margin: $space-0-5 $space-0-5;
+    margin: $space-0-5;
     gap: $space-0-5;
 
     .text {

diff --git a/src/assets/stylesheets/ProjectImages.scss b/src/assets/stylesheets/ProjectImages.scss
@@ -27,6 +27,6 @@
   }
 
   p {
-    margin: 0 0;
+    margin: 0;
   }
 }
diff --git a/src/assets/stylesheets/ProjectIndexHeader.scss b/src/assets/stylesheets/ProjectIndexHeader.scss
@@ -40,7 +40,7 @@
     }
 
     .btn {
-      margin: 0 0;
+      margin: 0;
     }
   }
 

diff --git a/src/assets/stylesheets/ProjectIndexPagination.scss b/src/assets/stylesheets/ProjectIndexPagination.scss
@@ -8,7 +8,7 @@
   align-items: center;
   margin-block-end: $space-2-5;
   svg {
-    margin: 0 0;
+    margin: 0;
   }
 }
 

diff --git a/src/assets/stylesheets/ProjectListItem.scss b/src/assets/stylesheets/ProjectListItem.scss
@@ -26,7 +26,7 @@ $small-table-grid: 600px;
     @include unique-max-width($small-table-grid) {
       grid-column: span 8;
       padding: 0;
-      margin: 0 0;
+      margin: 0;
     }
   }
 
@@ -63,7 +63,7 @@ $small-table-grid: 600px;
     }
 
     svg {
-      margin: 0 0;
+      margin: 0;
     }
 
     @include unique-width($medium-table-grid) {

diff --git a/src/assets/stylesheets/ProjectListTable.scss b/src/assets/stylesheets/ProjectListTable.scss
@@ -90,7 +90,7 @@ $small-table-grid: 600px;
     p {
       @include font-size-1-25(regular);
       font-weight: $font-weight-bold;
-      margin: 0 0;
+      margin: 0;
       padding: $space-1-5;
     }
   }

diff --git a/src/assets/stylesheets/ProjectName.scss b/src/assets/stylesheets/ProjectName.scss
@@ -40,7 +40,7 @@
   svg {
     height: $space-1-5;
     width: $space-1-5;
-    margin: 0 0;
+    margin: 0;
   }
 }
 

diff --git a/src/assets/stylesheets/ProjectsPanel.scss b/src/assets/stylesheets/ProjectsPanel.scss
@@ -13,7 +13,7 @@
     justify-content: center;
     width: 100%;
     box-sizing: border-box;
-    margin: 0 0;
+    margin: 0;
 
     a {
       color: $rpf-black;
@@ -23,7 +23,7 @@
 
   .projects-panel__download-button {
     width: 100%;
-    margin: 0 0;
+    margin: 0;
     justify-content: center;
   }
 
@@ -61,7 +61,7 @@
     }
 
     .content {
-      margin: auto auto;
+       auto auto;
     }
 
     span {
@@ -70,7 +70,7 @@
   }
 
   .projects-panel__save-status {
-    margin: auto auto;
+     auto auto;
     width: fit-content;
   }
 }

diff --git a/src/assets/stylesheets/PythonRunner.scss b/src/assets/stylesheets/PythonRunner.scss
@@ -12,7 +12,7 @@
 
 .pythonrunner-console {
   padding: $space-0-5 $space-1-5;
-  margin: 0 0;
+  margin: 0;
   white-space: pre-wrap;
   white-space: -moz-pre-wrap;
   white-space: -pre-wrap;

diff --git a/src/assets/stylesheets/SaveStatus.scss b/src/assets/stylesheets/SaveStatus.scss
@@ -11,7 +11,7 @@
 }
 
 .save-status--mobile {
-  margin: unset unset;
+  margin: unset;
 
   .save-status__text {
     @include font-size-1(regular);

diff --git a/src/assets/stylesheets/SelectButtons.scss b/src/assets/stylesheets/SelectButtons.scss
@@ -4,7 +4,7 @@
 
 .select-buttons {
   border: none;
-  margin: 0 0;
+  margin: 0;
   padding: 0;
 }
 

diff --git a/src/assets/stylesheets/Sidebar.scss b/src/assets/stylesheets/Sidebar.scss
@@ -43,7 +43,7 @@
 }
 
 .sidebar__panel-heading {
-  margin: 0 0;
+  margin: 0;
   @include font-size-1-5(regular);
 }
 
@@ -76,10 +76,10 @@
   justify-content: center;
   box-sizing: border-box;
   border-radius: 100%;
-  margin: 0 0;
+  margin: 0;
 
   svg {
-    margin: 0 0;
+    margin: 0;
   }
 }
 
@@ -97,7 +97,7 @@
   }
 
   svg {
-    margin: 0 0;
+    margin: 0;
   }
 }
 

diff --git a/src/assets/stylesheets/Tabs.scss b/src/assets/stylesheets/Tabs.scss
@@ -16,7 +16,7 @@
       border: none;
       background-color: transparent;
       padding: 0;
-      margin: 0 0;
+      margin: 0;
       inset-block-start: 0;
       inset-block-end: 0;
       height: $space-3;
@@ -64,7 +64,7 @@
     &__tab-text {
       height: fit-content;
       width: fit-content;
-      margin: 0 0;
+      margin: 0;
       padding: 0 $space-0-75;
       white-space: nowrap;
 
@@ -101,7 +101,7 @@
       box-sizing: border-box;
       display: flex;
       overflow-y: hidden;
-      margin: 0 0;
+      margin: 0;
       padding: 0 $space-0-25 0 0;
     }
 

diff --git a/src/assets/stylesheets/index.scss b/src/assets/stylesheets/index.scss
@@ -1,6 +1,6 @@
 html,
 body {
-  margin: 0 0;
+  margin: 0;
 }
 
 :host {