Merge branch 'dev' into 191-connectivity-warning

grafana-plugin/src/containers/AlertRules/AlertRules.module.css

@@ -112,3 +112,7 @@
 .slack-channel-switch {
   margin-left: -8px;
 }
+
+.description-style a {
+  color: var(--primary-text-link);
+}

grafana-plugin/src/containers/AlertRules/AlertRules.tsx

@@ -280,12 +280,14 @@ class AlertRules extends React.Component<AlertRulesProps, AlertRulesState> {
             </div>
           </Block>
           {alertReceiveChannel.description && (
-            <Alert
-              style={{ marginBottom: '0' }}
-              // @ts-ignore
-              title={<div dangerouslySetInnerHTML={{ __html: sanitize(alertReceiveChannel.description) }}></div>}
-              severity="info"
-            />
+            <div className={cx('description-style')}>
+              <Alert
+                style={{ marginBottom: '0' }}
+                // @ts-ignore
+                title={<div dangerouslySetInnerHTML={{ __html: sanitize(alertReceiveChannel.description) }}></div>}
+                severity="info"
+              />
+            </div>
           )}
           <div className={cx('alertRulesContent')}>
             <div className={cx('alertRulesActions')}>

grafana-plugin/src/containers/DefaultPageLayout/DefaultPageLayout.module.css

@@ -18,3 +18,7 @@
   line-height: 20px;
   height: auto;
 }
+
+.instructions-link {
+  color: var(--primary-text-link);
+}

grafana-plugin/src/containers/DefaultPageLayout/DefaultPageLayout.tsx

@@ -117,6 +117,7 @@ const DefaultPageLayout: FC<DefaultPageLayoutProps> = observer((props) => {
                 href={'https://grafana.com/docs/oncall/latest/open-source/#update-grafana-oncall-oss'}
                 target="_blank"
                 rel="noreferrer"
+                className={cx('instructions-link')}
               >
                 the update instructions
               </a>

grafana-plugin/src/pages/incidents/Incidents.tsx

@@ -321,7 +321,7 @@ class Incidents extends React.Component<IncidentsPageProps, IncidentsPageState>
       },
       {
         width: '15%',
-        title: 'Source',
+        title: 'Integrations',
         key: 'source',
         render: withSkeleton(this.renderSource),
       },