Merge branch 'explore-page' into WD-18954-add-explore-page-skeleton

canonical · Feb 7, 2025 · 78dc4d8 · 78dc4d8
2 parents 97cbcd8 + 5672a67
commit 78dc4d8
Show file tree

Hide file tree

Showing 18 changed files with 42 additions and 507 deletions.
diff --git a/package.json b/package.json
@@ -35,7 +35,7 @@
     "@canonical/global-nav": "3.6.4",
     "@canonical/latest-news": "1.5.0",
     "@canonical/react-components": "1.9.0",
-    "@canonical/store-components": "0.52.0",
+    "@canonical/store-components": "0.53.0",
     "@dnd-kit/core": "6.3.1",
     "@dnd-kit/sortable": "8.0.0",
     "@dnd-kit/utilities": "3.2.2",

diff --git a/static/js/store/components/NewSnaps/NewSnaps.tsx b/static/js/store/components/NewSnaps/NewSnaps.tsx
@@ -34,7 +34,11 @@ function NewSnaps(): ReactNode {
                   key={packageData.package.name}
                   style={{ marginBottom: "1.5rem" }}
                 >
-                  <DefaultCard data={packageData} />
+                  <DefaultCard
+                    data={packageData}
+                    highlighted={true}
+                    highlightColor="#0f95a1"
+                  />
                 </Col>
               ))}
           </Row>

diff --git a/static/js/store/pages/Explore/Explore.tsx b/static/js/store/pages/Explore/Explore.tsx
@@ -16,7 +16,7 @@ function Explore(): ReactNode {
   const searchRef = useRef<HTMLInputElement | null>(null);
   const searchSummaryRef = useRef<HTMLDivElement>(null);
 
-  // Dummy data for now
+  // Placeholder data for now
   const mustHaveSnaps = [
     {
       name: "eclipse",

diff --git a/static/sass/_button-overrides.scss b/static/sass/_button-overrides.scss
diff --git a/static/sass/_pattern_p-button-group.scss b/static/sass/_pattern_p-button-group.scss
diff --git a/static/sass/_patterns_button_spinner.scss b/static/sass/_patterns_button_spinner.scss
diff --git a/static/sass/_patterns_carousel.scss b/static/sass/_patterns_carousel.scss
@@ -72,19 +72,13 @@
     box-sizing: content-box;
     cursor: pointer;
     height: 3rem;
+    margin: 0;
     overflow: hidden;
     padding: 0;
     text-indent: -999px;
     transition: opacity 0.165s;
     width: 3rem;
     z-index: 10;
-    margin: {
-      bottom: 0;
-      left: 0;
-
-      // Overrides a rule in vanilla that adds margin to the right of buttons
-      right: 0 !important;
-    }
 
     &.swiper-button-disabled {
       cursor: default;

diff --git a/static/sass/_patterns_logo-links.scss b/static/sass/_patterns_logo-links.scss
diff --git a/static/sass/_patterns_maas_modal.scss b/static/sass/_patterns_maas_modal.scss
@@ -120,6 +120,7 @@ $color-modal-controls: rgba($color-x-dark, 0.2);
     box-sizing: content-box;
     cursor: pointer;
     height: 3rem;
+    margin: 0;
     margin-top: -1.5rem;
     overflow: hidden;
     padding: 0;
@@ -136,9 +137,6 @@ $color-modal-controls: rgba($color-x-dark, 0.2);
 
   .vbox-next {
     background-image: url("#{$assets-path}9716bbab-chevron.svg");
-
-    // Overrides a rule in vanilla that adds margin to the right of buttons
-    margin-right: 0 !important;
     right: 1rem;
   }
 

diff --git a/static/sass/_snapcraft_release.scss b/static/sass/_snapcraft_release.scss
@@ -414,10 +414,8 @@
     white-space: nowrap;
   }
 
-  // TODO[epic=vanilla]: LINK contextual menu
   .p-contextual-menu__dropdown {
     overflow: visible; // allow tooltips inside menu
-    z-index: 2; // workaround for https://github.com/canonical-web-and-design/vanilla-framework/issues/2577
 
     .p-tooltip {
       display: block;

diff --git a/static/sass/_utilities_flex.scss b/static/sass/_utilities_flex.scss