Skip to content

Commit

Permalink
remove css purge, update builder
Browse files Browse the repository at this point in the history
  • Loading branch information
Saektide committed Nov 20, 2020
1 parent f90c979 commit ab47482
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 22 deletions.
7 changes: 3 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "e6-hub",
"version": "3.5.2",
"version": "3.6.0-dev",
"description": "An e621 client based in Chromium",
"author": "Saektide <[email protected]>",
"scripts": {
Expand All @@ -12,7 +12,6 @@
},
"main": "background.js",
"dependencies": {
"@tailwindcss/ui": "^0.7.2",
"autoprefixer": "^9.8.6",
"bytes": "^3.1.0",
"dtext-parser": "^0.5.0",
Expand All @@ -23,7 +22,7 @@
"request": "^2.88.2",
"request-progress": "^3.0.0",
"request-promise-native": "^1.0.9",
"tailwindcss": "^2.0.1-compat",
"tailwindcss": "npm:@tailwindcss/postcss7-compat@^2.0.1",
"vue": "^2.6.11",
"vue-feather": "^1.0.0",
"vue-router": "^3.1.6",
Expand All @@ -33,7 +32,7 @@
"devDependencies": {
"@vue/cli-service": "^4.5.9",
"electron": "^8.2.4",
"vue-cli-plugin-electron-builder": "^1.4.6",
"vue-cli-plugin-electron-builder": "^2.0.0-rc.5",
"vue-template-compiler": "^2.6.11"
},
"license": "MIT",
Expand Down
1 change: 1 addition & 0 deletions src/assets/app.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
@tailwind base;
@tailwind components;
@tailwind utilities;

::-webkit-scrollbar {
Expand Down
1 change: 1 addition & 0 deletions src/background.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ app.on('ready', () => {
width: 1024,
height: 600,
frame: false,
nodeIntegration: process.env.ELECTRON_NODE_INTEGRATION
});

if (isDev) {
Expand Down
1 change: 0 additions & 1 deletion src/router.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ export default new Router({
children: [
{
path: 'downloads',
alias: '',
name: 'settings.downloads',
component: () => import('@/views/Settings/Downloads.Settings.vue')
},
Expand Down
3 changes: 3 additions & 0 deletions src/views/Settings.vue
Original file line number Diff line number Diff line change
Expand Up @@ -46,5 +46,8 @@ export default {
components: {
SettingsSidebarLink,
},
mounted() {
this.$router.push('/settings/downloads');
}
};
</script>
19 changes: 2 additions & 17 deletions tailwind.config.js
Original file line number Diff line number Diff line change
@@ -1,28 +1,13 @@
const defaultTheme = require('tailwindcss/defaultTheme');
module.exports = {
// Misc
plugins: [require("@tailwindcss/ui")],
purge: {
content: [
"./components/**/*.vue",
"./views/**/*.vue",
],
options: {
whitelist: [
"body",
"html",
"img",
"a",
"active"
],
},
},
purge: false,
// Theme
theme: {
// Replace
fontFamily: {
sans: ['"Exo 2"', ...defaultTheme.fontFamily.sans],
mono: ['"Operator Mono SSm"', ...defaultTheme.fontFamily.mono]
mono: defaultTheme.fontFamily.mono
},
colors: {
// Misc & e621's colors
Expand Down
1 change: 1 addition & 0 deletions vue.config.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
module.exports = {
pluginOptions: {
electronBuilder: {
nodeIntegration: true,
nodeModulesPath: ['../../node_modules', './node_modules'],
builderOptions: {
appId: 'saektide.esix-hub.app',
Expand Down

0 comments on commit ab47482

Please sign in to comment.