Merge pull request #1711 from brian-smith-tcril/sync-master-to-design-tokens

Sync master to design tokens

Author: brian-smith-tcril

package-lock.json

@@ -21,9 +21,9 @@ const DiscussionsNotificationsSidebar = () => {
       showTitleBar={false}
       showBorder={false}
     >
-      <NotificationTray />
-      {!hideNotificationbar && <div className="my-1.5" />}
       <DiscussionsSidebar />
+      {!hideNotificationbar && <div className="my-1.5" />}
+      <NotificationTray />
     </SidebarBase>
   );
 };