Skip to content

Commit

Permalink
Remove duplicate fonts (#4004)
Browse files Browse the repository at this point in the history
Remove duplicate fonts
  • Loading branch information
petemill authored Nov 25, 2019
2 parents 818d2f6 + d457807 commit f8a2849
Show file tree
Hide file tree
Showing 157 changed files with 210 additions and 556 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import { Store } from 'react-chrome-redux'
import BraveCoreThemeProvider from '../../../common/BraveCoreThemeProvider'
import BraveShields from './containers/app'
import { getViewPreferences } from './background/api/shieldsAPI'
require('../../../fonts/muli.css')
require('../../../fonts/poppins.css')
require('../../../../ui/webui/resources/fonts/muli.css')
require('../../../../ui/webui/resources/fonts/poppins.css')

const store: any = new Store({
portName: 'BRAVE'
Expand Down
4 changes: 2 additions & 2 deletions components/brave_new_tab_ui/brave_new_tab.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ import store from './store'
import 'emptykit.css'

// Fonts
import '../fonts/poppins.css'
import '../fonts/muli.css'
import '../../ui/webui/resources/fonts/poppins.css'
import '../../ui/webui/resources/fonts/muli.css'

function initialize () {
console.timeStamp('loaded')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ require('emptykit.css')

// Components
import App from './components/app'
require('../../../fonts/muli.css')
require('../../../fonts/poppins.css')
require('../../../../ui/webui/resources/fonts/muli.css')
require('../../../../ui/webui/resources/fonts/poppins.css')

// Utils
import store from './store'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import Theme from 'brave-ui/theme/brave-default'
import { ThemeProvider } from 'brave-ui/theme'
import { initLocale } from 'brave-ui/helpers'
require('emptykit.css')
require('../../../../fonts/muli.css')
require('../../../../fonts/poppins.css')
require('../../../../../ui/webui/resources/fonts/muli.css')
require('../../../../../ui/webui/resources/fonts/poppins.css')

// Components
import App from './components/app'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ require('emptykit.css')

// Components
import App from './components/app'
require('../../../fonts/muli.css')
require('../../../fonts/poppins.css')
require('../../../../ui/webui/resources/fonts/muli.css')
require('../../../../ui/webui/resources/fonts/poppins.css')

// Utils
import store from './store'
Expand Down
4 changes: 2 additions & 2 deletions components/brave_rewards/resources/tip/brave_rewards_tip.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ require('emptykit.css')

// Components
import App from './components/app'
require('../../../fonts/muli.css')
require('../../../fonts/poppins.css')
require('../../../../ui/webui/resources/fonts/muli.css')
require('../../../../ui/webui/resources/fonts/poppins.css')

// Utils
import store from './store'
Expand Down
4 changes: 2 additions & 2 deletions components/brave_sync/ui/components/app.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import EnabledContent from './enabledContent'
import * as syncActions from '../actions/sync_actions'

// Assets
require('../../../fonts/muli.css')
require('../../../fonts/poppins.css')
require('../../../../ui/webui/resources/fonts/muli.css')
require('../../../../ui/webui/resources/fonts/poppins.css')
require('emptykit.css')

interface Props {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import * as React from 'react'

// Assets
require('../../../fonts/muli.css')
require('../../../../ui/webui/resources/fonts/muli.css')
require('../styles/styles.css')

// Components
Expand Down
4 changes: 2 additions & 2 deletions components/brave_welcome_ui/containers/app.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ import { Background, BackgroundContainer } from '../components/images'
import * as welcomeActions from '../actions/welcome_actions'

// Assets
import '../../fonts/muli.css'
import '../../fonts/poppins.css'
import '../../../ui/webui/resources/fonts/muli.css'
import '../../../ui/webui/resources/fonts/poppins.css'
import 'emptykit.css'

interface Props {
Expand Down
144 changes: 0 additions & 144 deletions components/fonts/muli.css

This file was deleted.

Loading

0 comments on commit f8a2849

Please sign in to comment.