Merge branch 'spike-BUTTON-LINK-CTA-main' into spike-link-inline

# Conflicts: # packages/components/tests/dummy/app/templates/index.hbs
hashicorp · May 19, 2022 · 650b9aa · 650b9aa
2 parents f362d7e + b658213
commit 650b9aa
Show file tree

Hide file tree

Showing 12 changed files with 284 additions and 226 deletions.
diff --git a/package.json b/package.json
@@ -7,8 +7,8 @@
     "./packages/*"
   ],
   "devDependencies": {
-    "@changesets/changelog-github": "^0.4.3",
-    "@changesets/cli": "^2.21.0"
+    "@changesets/changelog-github": "^0.4.4",
+    "@changesets/cli": "^2.22.0"
   },
   "scripts": {
     "release": "yarn changeset publish"

diff --git a/packages/components/tests/dummy/app/routes/components.js b/packages/components/tests/dummy/app/routes/components.js
@@ -0,0 +1,3 @@
+import Route from '@ember/routing/route';
+
+export default class ComponentsRoute extends Route {}
diff --git a/packages/components/tests/dummy/app/routes/content.js b/packages/components/tests/dummy/app/routes/content.js
@@ -0,0 +1,3 @@
+import Route from '@ember/routing/route';
+
+export default class ContentRoute extends Route {}
diff --git a/packages/components/tests/dummy/app/routes/foundations.js b/packages/components/tests/dummy/app/routes/foundations.js
@@ -0,0 +1,3 @@
+import Route from '@ember/routing/route';
+
+export default class FoundationsRoute extends Route {}
diff --git a/packages/components/tests/dummy/app/routes/utilities.js b/packages/components/tests/dummy/app/routes/utilities.js
@@ -0,0 +1,3 @@
+import Route from '@ember/routing/route';
+
+export default class UtilitiesRoute extends Route {}
diff --git a/packages/components/tests/dummy/app/templates/application.hbs b/packages/components/tests/dummy/app/templates/application.hbs
@@ -16,9 +16,9 @@
       </li>
     </ul>
   </nav>
-  <main id="main" class="dummy-main">
-    {{outlet}}
-  </main>
+
+  {{outlet}}
+
   <footer class="dummy-footer">
     <div class="dummy-row-wrapper">
       <div class="dummy-row">

diff --git a/packages/components/tests/dummy/app/templates/components.hbs b/packages/components/tests/dummy/app/templates/components.hbs
@@ -0,0 +1,5 @@
+{{page-title "Components"}}
+
+<main id="main" class="dummy-main">
+  {{outlet}}
+</main>
diff --git a/packages/components/tests/dummy/app/templates/content.hbs b/packages/components/tests/dummy/app/templates/content.hbs
@@ -0,0 +1,5 @@
+{{page-title "Content"}}
+
+<main id="main" class="dummy-main">
+  {{outlet}}
+</main>
diff --git a/packages/components/tests/dummy/app/templates/foundations.hbs b/packages/components/tests/dummy/app/templates/foundations.hbs
@@ -0,0 +1,5 @@
+{{page-title "Foundations"}}
+
+<main id="main" class="dummy-main">
+  {{outlet}}
+</main>
diff --git a/packages/components/tests/dummy/app/templates/index.hbs b/packages/components/tests/dummy/app/templates/index.hbs
@@ -1,110 +1,112 @@
-<h2 class="dummy-h2">
-  Foundations:
-</h2>
-<ol>
-  <li class="dummy-paragraph">
-    <LinkTo @route="foundations.tokens">
-      Design tokens
-    </LinkTo>
-  </li>
-  <li class="dummy-paragraph">
-    <LinkTo @route="foundations.colors">
-      Colors
-    </LinkTo>
-  </li>
-  <li class="dummy-paragraph">
-    <LinkTo @route="foundations.typography">
-      Typography
-    </LinkTo>
-  </li>
-  <li class="dummy-paragraph">
-    <LinkTo @route="foundations.elevation">
-      Elevation
-    </LinkTo>
-  </li>
-  <li class="dummy-paragraph">
-    <LinkTo @route="foundations.focus-ring">
-      Focus ring
-    </LinkTo>
-  </li>
-</ol>
-<h2 class="dummy-h2">
-  Components:
-</h2>
-<ol>
-  <li class="dummy-paragraph">
-    <LinkTo @route="components.alert">
-      Alert
-    </LinkTo>
-  </li>
-  <li class="dummy-paragraph">
-    <LinkTo @route="components.badge">
-      Badge
-    </LinkTo>
-  </li>
-  <li class="dummy-paragraph">
-    <LinkTo @route="components.breadcrumb">
-      Breadcrumb
-    </LinkTo>
-  </li>
-  <li class="dummy-paragraph">
-    <LinkTo @route="components.button">
-      Button
-    </LinkTo>
-  </li>
-  <li class="dummy-paragraph">
-    <LinkTo @route="components.card">
-      Card
-    </LinkTo>
-  </li>
-  <li class="dummy-paragraph">
-    <LinkTo @route="components.dropdown">
-      Dropdown
-    </LinkTo>
-  </li>
-  <li class="dummy-paragraph">
-    <LinkTo @route="components.icon-tile">
-      IconTile
-    </LinkTo>
-  </li>
-  <li class="dummy-paragraph">
-    <LinkTo @route="components.link.inline">
-      Link::Inline
-    </LinkTo>
-  </li>
-  <li class="dummy-paragraph">
-    <LinkTo @route="components.link.standalone">
-      Link::Standalone
-    </LinkTo>
-  </li>
-  <li class="dummy-paragraph">
-    <LinkTo @route="components.toast">
-      Toast
-    </LinkTo>
-  </li>
-</ol>
-<h2 class="dummy-h2">
-  Utilities:
-</h2>
-<ol>
-  <li class="dummy-paragraph">
-    <LinkTo @route="utilities.disclosure">
-      Disclosure
-    </LinkTo>
-  </li>
-  <li class="dummy-paragraph">
-    <LinkTo @route="utilities.interactive">
-      Interactive
-    </LinkTo>
-  </li>
-</ol>
-<h2 class="dummy-h2">
-  Content:
-</h2>
-<ol>
-  <li class="dummy-paragraph">
-    <LinkTo @route="content.writing-guidelines">
-      🚧 Writing guidelines
-    </LinkTo>
-  </li>
-</ol>
+<main id="main" class="dummy-main">
+  <h2 class="dummy-h2">
+    Foundations:
+  </h2>
+  <ol>
+    <li class="dummy-paragraph">
+      <LinkTo @route="foundations.tokens">
+        Design tokens
+      </LinkTo>
+    </li>
+    <li class="dummy-paragraph">
+      <LinkTo @route="foundations.colors">
+        Colors
+      </LinkTo>
+    </li>
+    <li class="dummy-paragraph">
+      <LinkTo @route="foundations.typography">
+        Typography
+      </LinkTo>
+    </li>
+    <li class="dummy-paragraph">
+      <LinkTo @route="foundations.elevation">
+        Elevation
+      </LinkTo>
+    </li>
+    <li class="dummy-paragraph">
+      <LinkTo @route="foundations.focus-ring">
+        Focus ring
+      </LinkTo>
+    </li>
+  </ol>
+  <h2 class="dummy-h2">
+    Components:
+  </h2>
+  <ol>
+    <li class="dummy-paragraph">
+      <LinkTo @route="components.alert">
+        Alert
+      </LinkTo>
+    </li>
+    <li class="dummy-paragraph">
+      <LinkTo @route="components.badge">
+        Badge
+      </LinkTo>
+    </li>
+    <li class="dummy-paragraph">
+      <LinkTo @route="components.breadcrumb">
+        Breadcrumb
+      </LinkTo>
+    </li>
+    <li class="dummy-paragraph">
+      <LinkTo @route="components.button">
+        Button
+      </LinkTo>
+    </li>
+    <li class="dummy-paragraph">
+      <LinkTo @route="components.card">
+        Card
+      </LinkTo>
+    </li>
+    <li class="dummy-paragraph">
+      <LinkTo @route="components.dropdown">
+        Dropdown
+      </LinkTo>
+    </li>
+    <li class="dummy-paragraph">
+      <LinkTo @route="components.icon-tile">
+        IconTile
+      </LinkTo>
+    </li>
+    <li class="dummy-paragraph">
+      <LinkTo @route="components.link.inline">
+        Link::Inline
+      </LinkTo>
+    </li>
+    <li class="dummy-paragraph">
+      <LinkTo @route="components.link.standalone">
+        Link::Standalone
+      </LinkTo>
+    </li>
+    <li class="dummy-paragraph">
+      <LinkTo @route="components.toast">
+        Toast
+      </LinkTo>
+    </li>
+  </ol>
+  <h2 class="dummy-h2">
+    Utilities:
+  </h2>
+  <ol>
+    <li class="dummy-paragraph">
+      <LinkTo @route="utilities.disclosure">
+        Disclosure
+      </LinkTo>
+    </li>
+    <li class="dummy-paragraph">
+      <LinkTo @route="utilities.interactive">
+        Interactive
+      </LinkTo>
+    </li>
+  </ol>
+  <h2 class="dummy-h2">
+    Content:
+  </h2>
+  <ol>
+    <li class="dummy-paragraph">
+      <LinkTo @route="content.writing-guidelines">
+        🚧 Writing guidelines
+      </LinkTo>
+    </li>
+  </ol>
+</main>
diff --git a/packages/components/tests/dummy/app/templates/utilities.hbs b/packages/components/tests/dummy/app/templates/utilities.hbs
@@ -0,0 +1,5 @@
+{{page-title "Utilities"}}
+
+<main id="main" class="dummy-main">
+  {{outlet}}
+</main>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		import Route from '@ember/routing/route';

		export default class ComponentsRoute extends Route {}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		import Route from '@ember/routing/route';

		export default class ContentRoute extends Route {}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		import Route from '@ember/routing/route';

		export default class FoundationsRoute extends Route {}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		import Route from '@ember/routing/route';

		export default class UtilitiesRoute extends Route {}