Skip to content

Commit

Permalink
Merge pull request #2034 from brave/ci-deps
Browse files Browse the repository at this point in the history
ci: update css-loader and remove support for less files
  • Loading branch information
cezaraugusto authored Mar 22, 2019
2 parents a60321e + 7116b0f commit 46b9658
Show file tree
Hide file tree
Showing 6 changed files with 168 additions and 983 deletions.
2 changes: 1 addition & 1 deletion components/brave_webtorrent/extension/components/app.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import {
import * as torrentActions from '../actions/webtorrent_actions'

// Assets
require('../../../styles/webtorrent.less')
require('../../../styles/webtorrent.css')
require('../../../fonts/poppins.css')
require('../../../fonts/muli.css')

Expand Down
73 changes: 73 additions & 0 deletions components/styles/webtorrent.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
body {
padding: 100px;
font-family: Muli, sans-serif;
}

a {
text-decoration: none;
color: #fb542b;
}

.headerContainer {
display: flex;
justify-content: space-between;
margin: 0 0 18px;
}

.headerContainer .__column {
justify-content: center;
align-items: center;
display: flex;
}

.headerContainer .__torrentTitle {
font-size: 24px;
font-weight: 500;
line-height: 36px;
}

.headerContainer .__button {
white-space: nowrap;
margin: 12px;
}

.torrentSubhead {
padding: 18px 0;
border-top: solid 1px #c8c8d5;
}

.torrentSubhead p {
font-size: 18px;
}

.torrentSubhead h3 {
font-size: 20px;
margin: 24px 0;
font-weight: 500;
color: #fb542b;
}

.privacyNotice {
padding: 18px 0;
border-top: solid 1px #c8c8d5;
color: #ababbf;
line-height: 24px;
}

#webTorrentCredit {
color: #c8c8d5;
}

.gridFix {
grid-template-columns: repeat(auto-fill, 50px);
}

.loadingContainer {
display: flex;
flex-direction: column;
}

.loadingContainer .__icon {
height: 32px;
margin: 0 0 18px;
}
72 changes: 0 additions & 72 deletions components/styles/webtorrent.less

This file was deleted.

6 changes: 1 addition & 5 deletions components/webpack/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,9 @@ module.exports = (env, argv) => ({
test: /\.tsx?$/,
loader: 'awesome-typescript-loader'
},
{
test: /\.less$/,
loader: 'style-loader!css-loader?-minimize!less-loader'
},
{
test: /\.css$/,
loader: 'style-loader!css-loader?-minimize'
loader: ['style-loader', 'css-loader'],
},
// Loads font files for Font Awesome
{
Expand Down
Loading

0 comments on commit 46b9658

Please sign in to comment.