Changes to support joining Apple with Swift Package Index.

Author: daveverwer

FrontEnd/main.scss

@@ -40,7 +40,6 @@
 @use 'styles/search_results';
 @use 'styles/search';
 @use 'styles/spinner';
-@use 'styles/supporters';
 @use 'styles/tab_bar';
 @use 'styles/validate_manifest';
 @use 'styles/vega_charts';

FrontEnd/scripts/plausible_analytics.js FrontEnd/scripts/analytics.jsFrontEnd/scripts/plausible_analytics.js renamed to FrontEnd/scripts/analytics.js

@@ -12,9 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-export function measurePlausibleEvent(event, options = {}) {
-    if (typeof plausible === 'function') {
-        // eslint-disable-next-line no-undef
-        plausible(event, options)
-    }
+export function measureAnalyticsEvent(event, options = {}) {
+    console.log(`Analytics event: ${event}`, options)
 }

FrontEnd/scripts/controllers/panel_button_controller.js

@@ -13,13 +13,13 @@
 // limitations under the License.
 
 import { Controller } from '@hotwired/stimulus'
-import { measurePlausibleEvent } from '../plausible_analytics'
+import { measureAnalyticsEvent } from '../analytics'
 
 export class PanelButtonController extends Controller {
     static values = { analyticsEvent: String }
 
     click(event) {
-        measurePlausibleEvent('Panel Button Clickthrough', {
+        measureAnalyticsEvent('Panel Button Clickthrough', {
             props: {
                 panel: this.analyticsEventValue,
             },

FrontEnd/scripts/copy_buttons.js

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { measurePlausibleEvent } from './plausible_analytics.js'
+import { measureAnalyticsEvent } from './analytics.js'
 
 class SPICopyButton {
     installCopyEvent(button, contentElement, analyticsEvent) {
@@ -43,7 +43,7 @@ class SPICopyButton {
                 }, 1000)
 
                 // Log the analytics event.
-                measurePlausibleEvent(analyticsEvent)
+                measureAnalyticsEvent(analyticsEvent)
             })
         })
     }

FrontEnd/styles/_blog.scss

@@ -33,6 +33,7 @@ body.blog {
         font-size: 30px;
     }
 
+
     // We use a different style on the blog and import highlight.js directly, so
     // the background for a code snipplet here needs to match the background colour
     // of the theme specified in `FrontEnd/styles/main.css`.
@@ -63,16 +64,6 @@ body.blog {
         }
     }
 
-    .sidebar {
-        float: right;
-        display: flex;
-        flex-direction: column;
-        gap: 20px;
-        width: 320px;
-        padding: 0 0 10px 40px;
-        background-color: var(--page-background);
-    }
-
     ul.blog-posts {
         padding: 0;
         list-style: none;

FrontEnd/styles/_colors.scss

@@ -175,18 +175,6 @@
 
     --package-funding-background: var(--very-light-grey);
 
-    --scta-avatar-gradient: linear-gradient(
-        rgb(241 241 241 / 0%) 0,
-        rgb(241 241 241 / 0%) 50%,
-        rgb(241 241 241 / 100%) 100%
-    );
-    --scta-panel-accent: var(--pink);
-    --ccta-panel-accent: var(--mid-blue);
-    --ghcta-panel-accent: var(--pink);
-    --podcast-panel-background: var(--very-light-blue);
-    --podcast-panel-accent: var(--light-blue);
-
-    --avatar-shadow: 0 2px 2px 3px rgb(0 0 0 / 5%);
 
     --rss-subscribe-color: var(--orange);
 
@@ -235,9 +223,6 @@
         --panel-border: var(--dark-grey);
         --panel-underlay-opacity: 0.8;
 
-        --podcast-panel-background: var(--very-dark-blue);
-        --podcast-panel-accent: var(--dark-blue);
-
         --green-text: var(--mid-green);
 
         --note-text: var(--mid-green);
@@ -313,12 +298,6 @@
 
         --package-funding-background: var(--very-dark-grey);
 
-        --scta-avatar-gradient: linear-gradient(
-            rgb(25 25 35 / 0%) 0,
-            rgb(25 25 35 / 0%) 50%,
-            rgb(25 25 35 / 100%) 100%
-        );
-
         --debug-console-background: var(--dark-blue);
         --debug-console-border: var(--light-grey);
         --debug-console-button-hover: var(--dark-grey);

FrontEnd/styles/_header_footer.scss

@@ -81,14 +81,6 @@ header {
         align-items: center;
 
         a {
-            &.supporters {
-                padding-left: 28px;
-                background-position: left 5px center;
-                background-repeat: no-repeat;
-                background-size: 19px;
-                background-image: var(--image-heart);
-            }
-
             &:hover {
                 border-color: var(--header-link-highlight);
             }
@@ -112,13 +104,18 @@ footer {
     position: sticky;
     top: 100vh;
 
+    a[href^='mailto:'] {
+        font-weight: 400;
+    }
+
     .inner {
         padding: 20px 10px;
     }
 
     nav {
         display: flex;
         flex-direction: column;
+        gap: 15px;
         align-items: center;
 
         p {
@@ -136,10 +133,6 @@ footer {
         a {
             font-size: 12px;
         }
-
-        @media screen and (max-width: $mobile-breakpoint) {
-            margin-top: 10px;
-        }
     }
 
     ul {

FrontEnd/styles/_home.scss

@@ -19,8 +19,8 @@
 // -------------------------------------------------------------------------
 
 body.home {
-    .two-column {
-        grid-template-columns: 4fr 2fr;
+    main > .inner {
+        max-width: 680px;
     }
 }
 
@@ -55,40 +55,3 @@ body.home {
         grid-template-columns: 1fr;
     }
 }
-
-.supporter-ctas {
-    display: flex;
-    flex-direction: column;
-    gap: 15px;
-
-    .ccta picture {
-        width: 100%;
-        height: 60px;
-        text-align: center;
-
-        img {
-            width: 100%;
-            height: 100%;
-            object-fit: contain;
-        }
-    }
-}
-
-.ccta-availability {
-    padding: 15px;
-    font-size: 13px;
-    background-color: var(--panel-button-background);
-
-    p {
-        margin: 5px 0;
-    }
-
-    .support {
-        margin: 0 0 5px;
-        font-weight: bold;
-    }
-
-    .cta {
-        text-align: right;
-    }
-}