Move Bgcolor declaration into its own file

hashicorp-forge · Aug 28, 2023 · 9cedf97 · 9cedf97
1 parent 3182efa
commit 9cedf97
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 5 deletions.
diff --git a/web/app/styles/app.scss b/web/app/styles/app.scss
@@ -4,6 +4,7 @@
 
 @use "./variables";
 
+@use "./body";
 @use "./animations";
 @use "./typography";
 
@@ -77,9 +78,6 @@ body {
   line-height: var(--token-typography-body-200-line-height);
   color: var(--token-color-foreground-primary);
 }
-.ember-application {
-  background-color: var(--token-color-surface-primary);
-}
 
 a {
   text-decoration: none;

diff --git a/web/app/styles/body.scss b/web/app/styles/body.scss
@@ -0,0 +1,11 @@
+.ember-application {
+  @apply bg-color-page-primary;
+}
+
+.secondary-screen {
+  @apply bg-color-page-faint;
+
+  .ember-application {
+    @apply bg-color-page-faint;
+  }
+}
diff --git a/web/app/templates/authenticate.hbs b/web/app/templates/authenticate.hbs
@@ -1,6 +1,6 @@
 {{! @glint-nocheck: not typesafe yet }}
 {{page-title "Authenticate"}}
-{{set-body-class "bg-color-page-faint"}}
+{{set-body-class "secondary-screen"}}
 
 <div
   class="relative flex min-h-full flex-1 flex-col items-center justify-center py-12"

diff --git a/web/app/templates/authenticated/document.hbs b/web/app/templates/authenticated/document.hbs
@@ -1,5 +1,5 @@
 {{page-title (or @model.doc.title "Document")}}
-{{set-body-class "bg-color-page-faint"}}
+{{set-body-class "secondary-screen"}}
 
 <Document
   @document={{@model.doc}}

diff --git a/web/tests/integration/components/floating-u-i/content-test.ts b/web/tests/integration/components/floating-u-i/content-test.ts
@@ -48,6 +48,7 @@ module("Integration | Component | floating-u-i/content", function (hooks) {
     assert
       .dom(`.ember-application ${CONTENT_SELECTOR}`)
       .exists("content is rendered in the root element");
+    await this.pauseTest();
   });
 
   test("it is positioned by floating-ui", async function (this: FloatingUIComponentTestContext, assert) {