Merge branch 'current' into dbeatty/global-configs-precedence-order

website/docs/docs/cloud/configure-cloud-cli.md

@@ -16,8 +16,6 @@ import CloudCLIFlag from '/snippets/_cloud-cli-flag.md';
 - You must set up a project in dbt Cloud.
   - **Note** — If you're using the dbt Cloud CLI, you can connect to your data platform directly in the dbt Cloud interface and don't need a [`profiles.yml`](/docs/core/connect-data-platform/profiles.yml) file. 
 - You must have your [personal development credentials](/docs/dbt-cloud-environments#set-developer-credentials) set for that project. The dbt Cloud CLI will use these credentials, stored securely in dbt Cloud, to communicate with your data platform.
-- You must [enroll](/docs/dbt-versions/experimental-features) in the dbt Cloud beta features.
-  - To enroll, navigate to your **Profile Settings** and enable the **Beta** flag under **Experimental Features**.
 - You must be on dbt version 1.5 or higher. Refer to [dbt Cloud versions](/docs/dbt-versions/upgrade-core-in-cloud) to upgrade.
 
 ## Configure the dbt Cloud CLI

website/docs/guides/migration/versions/02-upgrading-to-v1.5.md

@@ -148,4 +148,4 @@ Run `dbt --help` to see new & improved help documentation :)
 - The [`version: 2` top-level key](/reference/project-configs/version) is now **optional** in all YAML files. Also, the [`config-version: 2`](/reference/project-configs/config-version) and `version:` top-level keys are now optional in `dbt_project.yml` files.
 - [Events and logging](/reference/events-logging): Added `node_relation` (`database`, `schema`, `identifier`) to the `node_info` dictionary, available on node-specific events
 - Support setting `--project-dir` via environment variable: [`DBT_PROJECT_DIR`](/reference/dbt_project.yml)
-- More granular [configurations](/reference/global-configs/about-global-configs) for logging (to set log format, log levels, and colorization) and cache population
+- More granular configurations for logging (to set [log format](/reference/global-configs/logs#log-formatting), [log levels](/reference/global-configs/logs#log-level), and [colorization](/reference/global-configs/logs#color)) and [cache population](/reference/global-configs/cache#cache-population)

website/src/components/stoplight/index.js

@@ -1,17 +1,16 @@
 import { API } from "@stoplight/elements";
 import React from "react";
 import useBaseUrl from "@docusaurus/useBaseUrl";
+
 export default function Stoplight({ version }) {
   if (!["v1", "v2", "v3", "private"].includes(version)) {
     return null;
   }
+
   return (
     <>
-      <link
-        href="https://unpkg.com/@stoplight/elements/styles.min.css"
-        type="text/css"
-        rel="stylesheet"
-      />
+      <link href="/css/stoplight-base.css" type="text/css" rel="stylesheet" />
+      <link href="/css/stoplight-custom.css" type="text/css" rel="stylesheet" />
       <API
         apiDescriptionUrl={
           "https://raw.githubusercontent.com/dbt-labs/dbt-cloud-openapi-spec/master/openapi-" +

website/static/css/stoplight-custom.css

@@ -0,0 +1,38 @@
+[data-theme="dark"] {
+    --stoplight-pre-background: #ebedf0;
+    --stoplight-pre-color: #333333;
+}
+
+[data-theme="light"] {
+    --stoplight-pre-background: var(--ifm-pre-background);
+    --stoplight-pre-color: var(--ifm-pre-color);
+}
+
+.sl-font-ui, .sl-font-prose, .sl-prose, .sl-button {
+    /* Ensure we use the same font in stoplight docs as in the rest of the docs site */
+    font-family: var(--ifm-font-family-base) !important;
+}
+
+.sl-text-base {
+    /* Bump font size to make up for slightly smaller font family (above) */
+    font-size: 13px !important;
+}
+
+.sl-font-ui {
+    /* Bump font size to make up for slightly smaller font family (above) */
+    font-size: 14px !important;
+
+    & a {
+        /* Ensure link colors aren't overriden by docusaurus css */
+        color: var(--color-text) !important;
+    }
+}
+
+/* Ensure codeblocks are legible when using darkmode */
+.sl-panel__content pre {
+    background-color: var(--stoplight-pre-background) !important;
+
+    & .plain, .sl-code-highlight__ln {
+        color: var(--stoplight-pre-color) !important;
+    }
+}