Skip to content
This repository has been archived by the owner on Oct 7, 2022. It is now read-only.

Commit

Permalink
resolved conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
Carla-Moz committed Sep 2, 2021
1 parent 209a156 commit 08062f3
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 3 additions & 1 deletion src/stories/Introduction.stories.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ import { Meta } from '@storybook/addon-docs';
`}</style>

# Storybook for the Rally Web Platform
Storybook helps you build UI components in isolation from your app's business logic, data, and context.
That makes it easy to develop hard-to-reach states. Save these UI states as **stories** to revisit during development, testing, or QA.


Storybook helps you build UI components in isolation from your app's business logic, data, and context.
That makes it easy to develop hard-to-reach states. Save these UI states as **stories** to revisit during development, testing, or QA.
Expand All @@ -39,7 +42,6 @@ Browse example stories now by navigating to them in the sidebar.
View their code in the `src/stories` directory.
We recommend building UIs with a [**component-driven**](https://componentdriven.org) process starting with atomic components and ending with pages.


<div className="tip-wrapper">
<span className="tip">Tip</span>Edit the Markdown in{' '}
<code>src/stories/Introduction.stories.mdx</code>
Expand Down
6 changes: 2 additions & 4 deletions static/rally.css
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,8 @@
font-family: Inter;
font-style: normal;
font-weight: 600;
/* src: url("./fonts/Inter-SemiBold.woff2") format("woff2"),
url("./fonts/Inter-SemiBold.woff") format("woff"); */
src: url("./fonts/Inter-Regular.woff2") format("woff2"),
url("./fonts/Inter-Regular.woff") format("woff");
src: url("./fonts/Inter-SemiBold.woff2") format("woff2"),
url("./fonts/Inter-SemiBold.woff") format("woff");
}

:root {
Expand Down

0 comments on commit 08062f3

Please sign in to comment.