Post-merge follow up on fixes suggested in #5319 (#5349)

sourcegraph · Aug 23, 2019 · 0c66d8c · 0c66d8c
1 parent 70a5fe2
commit 0c66d8c
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 16 deletions.
diff --git a/web/src/nav/StatusMessagesNavItem.scss b/web/src/nav/StatusMessagesNavItem.scss
@@ -21,15 +21,15 @@
         &-link {
             margin-bottom: 0;
         }
-        &-border-success {
+        &--border-success {
             border-left: 6px solid $success;
         }
 
-        &-border-warning {
+        &--border-warning {
             border-left: 6px solid $warning;
         }
 
-        &-border-progress {
+        &--border-progress {
             border-left: 6px solid $info;
         }
     }

diff --git a/web/src/nav/StatusMessagesNavItem.tsx b/web/src/nav/StatusMessagesNavItem.tsx
@@ -48,12 +48,12 @@ interface StatusMessageEntryProps {
     showLink?: boolean
     linkTo: string
     linkText: string
-    style: EntryType
+    entryType: EntryType
     linkOnClick: (event: React.MouseEvent<HTMLAnchorElement, MouseEvent>) => void
 }
 
-function entryIcon(style: EntryType): JSX.Element {
-    switch (style) {
+function entryIcon(entryType: EntryType): JSX.Element {
+    switch (entryType) {
         case 'warning':
             return <CloudAlertIcon className="icon-inline mr-1" />
         case 'success':
@@ -68,11 +68,11 @@ const StatusMessagesNavItemEntry: React.FunctionComponent<StatusMessageEntryProp
         key={props.text}
         className={classNames(
             'status-messages-nav-item__entry mb-3',
-            props.style && `status-messages-nav-item__entry-border-${props.style}`
+            props.entryType && `status-messages-nav-item__entry--border-${props.entryType}`
         )}
     >
         <h4>
-            {entryIcon(props.style)}
+            {entryIcon(props.entryType)}
             {props.title}
         </h4>
         <p>{props.text}</p>
@@ -138,7 +138,7 @@ export class StatusMessagesNavItem extends React.PureComponent<Props, State> {
                         linkTo="/site-admin/external-services"
                         linkText="Configure external services"
                         linkOnClick={this.toggleIsOpen}
-                        style="progress"
+                        entryType="progress"
                     />
                 )
             case 'SyncErrorStatusMessage':
@@ -151,7 +151,7 @@ export class StatusMessagesNavItem extends React.PureComponent<Props, State> {
                         linkTo={`/site-admin/external-services/${message.externalService.id}`}
                         linkText={`Edit "${message.externalService.displayName}"`}
                         linkOnClick={this.toggleIsOpen}
-                        style="warning"
+                        entryType="warning"
                     />
                 )
         }
@@ -213,7 +213,7 @@ export class StatusMessagesNavItem extends React.PureComponent<Props, State> {
                             linkTo="/site-admin/external-services"
                             linkText="Configure external services"
                             linkOnClick={this.toggleIsOpen}
-                            style="success"
+                            entryType="success"
                         />
                     )}
                 </DropdownMenu>

diff --git a/web/src/nav/__snapshots__/StatusMessagesNavItem.test.tsx.snap b/web/src/nav/__snapshots__/StatusMessagesNavItem.test.tsx.snap
@@ -35,7 +35,7 @@ exports[`StatusMessagesNavItem no messages 1`] = `
       External Service Status
     </h3>
     <div
-      className="status-messages-nav-item__entry mb-3 status-messages-nav-item__entry-border-success"
+      className="status-messages-nav-item__entry mb-3 status-messages-nav-item__entry--border-success"
     >
       <h4>
         <svg
@@ -94,7 +94,7 @@ exports[`StatusMessagesNavItem one CLONING message as non-site admin 1`] = `
       External Service Status
     </h3>
     <div
-      className="status-messages-nav-item__entry mb-3 status-messages-nav-item__entry-border-progress"
+      className="status-messages-nav-item__entry mb-3 status-messages-nav-item__entry--border-progress"
     >
       <h4>
         <svg
@@ -153,7 +153,7 @@ exports[`StatusMessagesNavItem one CLONING message as site admin 1`] = `
       External Service Status
     </h3>
     <div
-      className="status-messages-nav-item__entry mb-3 status-messages-nav-item__entry-border-progress"
+      className="status-messages-nav-item__entry mb-3 status-messages-nav-item__entry--border-progress"
     >
       <h4>
         <svg
@@ -222,7 +222,7 @@ exports[`StatusMessagesNavItem one SYNCERROR message as non-site admin 1`] = `
       External Service Status
     </h3>
     <div
-      className="status-messages-nav-item__entry mb-3 status-messages-nav-item__entry-border-warning"
+      className="status-messages-nav-item__entry mb-3 status-messages-nav-item__entry--border-warning"
     >
       <h4>
         <svg
@@ -281,7 +281,7 @@ exports[`StatusMessagesNavItem one SYNCERROR message as site admin 1`] = `
       External Service Status
     </h3>
     <div
-      className="status-messages-nav-item__entry mb-3 status-messages-nav-item__entry-border-warning"
+      className="status-messages-nav-item__entry mb-3 status-messages-nav-item__entry--border-warning"
     >
       <h4>
         <svg