Merge remote-tracking branch 'upstream/master' into fix-tabs

assets/scss/_styles_project.scss

@@ -129,13 +129,3 @@ a.nav-link.sp-coming-soon {
     border-radius: .1rem;
   }
 }
-
-a.nav-link.sp-coming-soon::after {
-  content: "Coming soon!";
-  display: inline-block;
-  background-color: #616161;
-  color: $dark;
-  margin-left: .5rem;
-  padding: .1rem .5rem;
-  border-radius: .1rem;
-}

assets/scss/docsy_overrides.scss

@@ -144,6 +144,7 @@ li:has(input[type="checkbox"]) {
     font-weight: 600;
 }
 
+<<<<<<< HEAD
 .tab-content {
     .tab-pane {
        border: none !important;
@@ -182,6 +183,8 @@ li:has(input[type="checkbox"]) {
     }
 }
 
+=======
+>>>>>>> upstream/master
 @media (min-width: 768px)  {
     .td-sidebar {
         padding-top: 5rem;