Skip to content

Commit 2eaae67

Browse files
committed
install all depends
1 parent cd6c9c7 commit 2eaae67

5 files changed

Lines changed: 1548 additions & 24 deletions

File tree

package.json

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,13 @@
2121
"write-file-webpack-plugin": "4.5.0"
2222
},
2323
"dependencies": {
24+
"bootstrap": "^4.3.1",
2425
"jquery": "^3.4.1",
25-
"moment": "^2.24.0"
26+
"moment": "^2.24.0",
27+
"node-sass": "^4.12.0",
28+
"popper.js": "^1.15.0",
29+
"postcss-loader": "^3.0.0",
30+
"precss": "^4.0.0",
31+
"sass-loader": "^7.1.0"
2632
}
2733
}
Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
@import "~bootstrap/scss/bootstrap";
2+
13
.container {
24
width: 30em;
35
padding-bottom: 1em;
@@ -10,7 +12,7 @@
1012
}
1113

1214
#time-entries button {
13-
float: right
15+
float: right;
1416
}
1517

1618
.ongoing-badge {
@@ -53,4 +55,4 @@ button {
5355

5456
.project-button-block .title {
5557
color: grey;
56-
}
58+
}

src/js/popup.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
'use strict';
2-
import "../css/popup.css";
2+
import "../css/popup.scss";
3+
import 'bootstrap';
34
import { showError, loading, finishLoading } from "./popup/popup_helpers.js";
45
import { loadAllTimeEntries, loadAllProjectsAndActivities, startProjectTimer, stopActivityTimer } from "./popup/api_call.js";
56
import moment from 'moment';

webpack.config.js

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,26 @@ var options = {
4545
test: /\.html$/,
4646
loader: "html-loader",
4747
exclude: /node_modules/
48+
},
49+
{
50+
test: /\.(scss)$/,
51+
use: [{
52+
loader: 'style-loader', // inject CSS to page
53+
}, {
54+
loader: 'css-loader', // translates CSS into CommonJS modules
55+
}, {
56+
loader: 'postcss-loader', // Run post css actions
57+
options: {
58+
plugins: function () { // post css plugins, can be exported to postcss.config.js
59+
return [
60+
require('precss'),
61+
require('autoprefixer')
62+
];
63+
}
64+
}
65+
}, {
66+
loader: 'sass-loader' // compiles Sass to CSS
67+
}]
4868
}
4969
]
5070
},

0 commit comments

Comments
 (0)