Merge branch 'main' into refactor/primer-design-system

Signed-off-by: Adam Setch <[email protected]>

Author: setchy

src/renderer/components/buttons/PillButton.tsx

@@ -18,7 +18,7 @@ export const PillButton: FC<IPillButton> = (props: IPillButton) => {
     <button
       title={props.title}
       type="button"
-      className="flex gap-1 items-center m-0.5 rounded-full bg-gray-100 px-1 text-xxs hover:bg-gray-200 dark:bg-gray-800 dark:hover:bg-gray-700"
+      className="flex gap-1 items-center text-xxs px-1 m-0.5 rounded-full bg-gray-100 hover:bg-gray-200 dark:bg-gray-800 dark:hover:bg-gray-700"
     >
       <Stack direction="horizontal" align="center" gap="condensed">
         <Octicon icon={props.icon} size={Size.XSMALL} className={props.color} />

src/renderer/components/buttons/__snapshots__/PillButton.test.tsx.snap

@@ -94,9 +94,13 @@ export const NotificationRow: FC<INotificationRow> = ({
         (isRead || showAsRead) && Opacity.READ,
       )}
     >
-      <div className={cn('mr-3 flex items-center justify-center', iconColor)}>
+      <div className="mr-3 flex items-center justify-center">
         <Tooltip text={notificationType} direction="e">
-          <Octicon icon={NotificationIcon} size={Size.LARGE} />
+          <Octicon
+            icon={NotificationIcon}
+            size={Size.LARGE}
+            className={iconColor}
+          />
         </Tooltip>
       </div>