Skip to content

Commit

Permalink
Revert "Import harmony styles in web and embed (#6191)" (#6217)
Browse files Browse the repository at this point in the history
  • Loading branch information
raymondjacobson authored Oct 4, 2023
1 parent 0de7821 commit 98f6820
Show file tree
Hide file tree
Showing 8 changed files with 35 additions and 42 deletions.
1 change: 0 additions & 1 deletion packages/embed/src/index.css
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
@import '~@audius/stems/dist/stems.css';
@import '~@audius/harmony/dist/harmony.css';
10 changes: 2 additions & 8 deletions packages/harmony/.storybook/preview.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
// This file is used to configure all stories
import 'assets/styles/reset.css'
import 'assets/fonts/avenir.css'
import 'assets/styles/fonts.css'
import 'assets/styles/spacing.css'
import 'assets/styles/colors.css'
import 'assets/styles/tokens.css'
import 'assets/styles/border-radius.css'
import 'assets/styles/shadows.css'
import 'assets/styles/main.css'
import 'react-perfect-scrollbar/dist/css/styles.css'

// Default to docs view
export const parameters = {
Expand Down
11 changes: 1 addition & 10 deletions packages/harmony/rollup.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,7 @@ export default {
postcssCustomProperties({
// Preserve var names so they can be overridden
preserve: true,
importFrom: [
'src/assets/styles/reset.css',
'src/assets/fonts/avenir.css',
'src/assets/styles/fonts.css',
'src/assets/styles/spacing.css',
'src/assets/styles/colors.css',
'src/assets/styles/tokens.css',
'src/assets/styles/border-radius.css',
'src/assets/styles/shadows.css'
]
importFrom: ['src/assets/styles/main.css']
})
],
minimize: true,
Expand Down
12 changes: 6 additions & 6 deletions packages/harmony/src/assets/fonts/avenir.css

Large diffs are not rendered by default.

7 changes: 0 additions & 7 deletions packages/harmony/src/assets/styles/fonts.css
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,3 @@ root {
--font-bold: 700;
--font-heavy: 900;
}

#root *,
body * {
font-family: var(--font-family);
font-size: var(--font-s);
font-weight: var(--font-medium);
}
17 changes: 17 additions & 0 deletions packages/harmony/src/assets/styles/main.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
@import './reset.css';
@import '../fonts/avenir.css';
@import './fonts.css';
@import './spacing.css';
@import './colors.css';
@import './tokens.css';
@import './border-radius.css';
@import './shadows.css';

#root *,
body * {
position: relative;
box-sizing: border-box;
font-family: var(--font-family);
font-size: var(--font-s);
font-weight: var(--font-medium);
}
18 changes: 9 additions & 9 deletions packages/harmony/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import './assets/styles/reset.css'
import './assets/fonts/avenir.css'
import './assets/styles/fonts.css'
import './assets/styles/spacing.css'
import './assets/styles/colors.css'
import './assets/styles/tokens.css'
import './assets/styles/border-radius.css'
import './assets/styles/shadows.css'
import './assets/styles/main.css'

export * from './components'
export {
Text,
TextProps,
TextColor,
TextSize,
TextVariant,
TextStrength
} from './components'
1 change: 0 additions & 1 deletion packages/web/src/app.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import '@audius/stems/dist/stems.css'
import '@audius/harmony/dist/harmony.css'

import { useState } from 'react'

Expand Down

0 comments on commit 98f6820

Please sign in to comment.