diff --git a/src/package.json b/src/package.json index 29c2131c..ca22ce1e 100644 --- a/src/package.json +++ b/src/package.json @@ -1,37 +1,37 @@ { "private": true, "scripts": { "dev": "npm run development", "development": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", "watch": "npm run development -- --watch", "watch-poll": "npm run watch -- --watch-poll", "hot": "cross-env NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js", "prod": "npm run production", "production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --no-progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", "lint": "eslint --ext .js,.vue resources && stylelint \"resources/sass/*.scss\" \"resources/vue/*.vue\"" }, "devDependencies": { "axios": "^0.19", - "bootstrap": "^4.4.1", + "bootstrap": "^4.5.0", "cross-env": "^5.1", "eslint": "^6.8.0", "eslint-plugin-vue": "^6.1.1", "@fortawesome/fontawesome-svg-core": "^1.2.27", "@fortawesome/free-brands-svg-icons": "^5.12.1", "@fortawesome/free-regular-svg-icons": "^5.12.1", "@fortawesome/free-solid-svg-icons": "^5.12.1", "@fortawesome/vue-fontawesome": "^0.1.9", - "jquery": "^3.4.1", + "jquery": "^3.5.1", "laravel-mix": "^4.0.7", - "popper.js": "^1.12", + "popper.js": "^1.16.0", "resolve-url-loader": "^2.3.1", "sass": "^1.15.2", "sass-loader": "^7.1.0", "stylelint": "^12.0.1", "stylelint-config-standard": "^19.0.0", "vue": "^2.5.17", "vue-router": "^3.1.3", "vue-template-compiler": "^2.6.10", "vuex": "^3.1.1" } } diff --git a/src/resources/sass/_variables.scss b/src/resources/sass/_variables.scss index 66d55c8c..a7b6deb6 100644 --- a/src/resources/sass/_variables.scss +++ b/src/resources/sass/_variables.scss @@ -1,23 +1,23 @@ // Body $body-bg: #fff; // Typography $font-family-sans-serif: 'Nunito', sans-serif; $font-size-base: 0.9rem; -$line-height-base: 1.6; +$line-height-base: 1.5; // Colors $blue: #3490dc; $indigo: #6574cd; $purple: #9561e2; $pink: #f66d9b; $red: #e3342f; $orange: #f6993f; $yellow: #ffed4a; $green: #38c172; $teal: #4dc0b5; $cyan: #6cb2eb; // App colors $menu-bg-color: #f6f5f3; $main-color: #f1a539; diff --git a/src/resources/sass/app.scss b/src/resources/sass/app.scss index 36cff610..f227c715 100644 --- a/src/resources/sass/app.scss +++ b/src/resources/sass/app.scss @@ -1,214 +1,220 @@ // Fonts // Variables @import 'variables'; // Bootstrap @import '~bootstrap/scss/bootstrap'; @import 'menu'; @import 'toast'; @import 'forms'; html, body, body > .outer-container { height: 100%; } #app { display: flex; flex-direction: column; min-height: 100%; & > nav { flex-shrink: 0; z-index: 1; } & > div.container { flex-grow: 1; margin-top: 2rem; margin-bottom: 2rem; } & > .filler { flex-grow: 1; } & > div.container + .filler { display: none; } } #error-page { position: absolute; top: 0; height: 100%; width: 100%; align-items: center; display: flex; justify-content: center; color: #636b6f; z-index: 10; background: white; .code { text-align: right; border-right: 2px solid; font-size: 26px; padding: 0 15px; } .message { font-size: 18px; padding: 0 15px; } } .app-loader { background-color: $body-bg; height: 100%; width: 100%; position: absolute; top: 0; left: 0; display: flex; align-items: center; justify-content: center; .spinner-border { width: 120px; height: 120px; border-width: 15px; color: #b2aa99; } } pre { margin: 1rem 0; padding: 1rem; background-color: $menu-bg-color; } .card-title { font-size: 1.2rem; font-weight: bold; } tfoot.table-fake-body { background-color: #f8f8f8; color: grey; text-align: center; height: 8em; td { vertical-align: middle; } tbody:not(:empty) + & { display: none; } } table { td.buttons, td.price, td.selection { width: 1%; } td.price { text-align: right; } &.form-list { td { border: 0; &:first-child { padding-left: 0; } &:last-child { padding-right: 0; } } } } #status-box { background-color: lighten($green, 35); .progress { background-color: #fff; height: 10px; } .progress-label { font-size: 0.9em; } .progress-bar { background-color: $green; } &.process-failed { background-color: lighten($orange, 30); .progress-bar { background-color: $red; } } } #dashboard-nav { display: flex; flex-wrap: wrap; justify-content: center; & > a { padding: 1rem; text-align: center; white-space: nowrap; margin-top: 0.5rem; text-decoration: none; width: 150px; &.disabled { pointer-events: none; opacity: 0.6; } .badge { position: absolute; top: 0.5rem; right: 0.5rem; } & + a { margin-left: 0.5rem; } } svg { width: 6rem; height: 6rem; margin: auto; } } .plan-selector { .plan-ico { - font-size: 4em; + font-size: 3.8rem; color: #f1a539; border: 3px solid #f1a539; - width: 100px; + width: 6rem; + height: 6rem; margin-bottom: 1rem; border-radius: 50%; } ul:last-child { margin-bottom: 0; } } + +// Bootstrap style fix +.btn-link { + border: 0; +} diff --git a/src/resources/vue/User/Info.vue b/src/resources/vue/User/Info.vue index b0b37f7a..eadd3b4f 100644 --- a/src/resources/vue/User/Info.vue +++ b/src/resources/vue/User/Info.vue @@ -1,366 +1,366 @@ diff --git a/src/resources/vue/User/Profile.vue b/src/resources/vue/User/Profile.vue index 7c3f15cd..97a32575 100644 --- a/src/resources/vue/User/Profile.vue +++ b/src/resources/vue/User/Profile.vue @@ -1,114 +1,114 @@ diff --git a/src/resources/vue/Widgets/ListInput.vue b/src/resources/vue/Widgets/ListInput.vue index 61432efb..37fe1f9a 100644 --- a/src/resources/vue/Widgets/ListInput.vue +++ b/src/resources/vue/Widgets/ListInput.vue @@ -1,55 +1,55 @@