Compare commits

..

No commits in common. "d4a69f9eea1c3c9c316724523e8900b45f55d405" and "1d4885fc3895ce6b4c60df32e92ad2b862fc8a93" have entirely different histories.

13 changed files with 18 additions and 61 deletions

15
.gitignore vendored
View File

@ -1,4 +1,3 @@
<<<<<<< HEAD
.DS_Store .DS_Store
node_modules/ node_modules/
package-lock.json package-lock.json
@ -6,17 +5,3 @@ yarn.lock
npm-debug.log npm-debug.log
.idea/ .idea/
dist/ dist/
=======
# ---> Vue
# gitignore template for Vue.js projects
#
# Recommended template: Node.gitignore
# TODO: where does this rule come from?
docs/_book
# TODO: where does this rule come from?
test/
node_modules
>>>>>>> cfdf6a3 (.gitignore)

3
.npmrc
View File

@ -1,3 +0,0 @@
legacy-peer-deps=true
auto-install-peers=true
strict-peer-dependencies=false

View File

@ -1,6 +1,6 @@
# Change Log # Change Log
## [1.1.3] 2024-02-25 ## [1.1.3] 2023-05-31
- Update dependencies & devDependencies - Update dependencies & devDependencies

View File

@ -17,7 +17,6 @@ We are very excited to share this dashboard with you and we look forward to hear
- [Demo](#demo) - [Demo](#demo)
- [Quick Start](#quick-start) - [Quick Start](#quick-start)
- [Deploy](#deploy)
- [Documentation](#documentation) - [Documentation](#documentation)
- [File Structure](#file-structure) - [File Structure](#file-structure)
- [Browser Support](#browser-support) - [Browser Support](#browser-support)
@ -43,12 +42,6 @@ We are very excited to share this dashboard with you and we look forward to hear
- [Download from Github](https://github.com/creativetimofficial/vue-black-dashboard/archive/master.zip). - [Download from Github](https://github.com/creativetimofficial/vue-black-dashboard/archive/master.zip).
- [Download from Creative Tim](https://www.creative-tim.com/product/vue-black-dashboard). - [Download from Creative Tim](https://www.creative-tim.com/product/vue-black-dashboard).
## Deploy
:rocket: You can deploy your own version of the template to Genezio with one click:
[![Deploy to Genezio](https://raw.githubusercontent.com/Genez-io/graphics/main/svg/deploy-button.svg)](https://app.genez.io/start/deploy?repository=https://github.com/creativetimofficial/vue-black-dashboard&utm_source=github&utm_medium=referral&utm_campaign=github-creativetim&utm_term=deploy-project&utm_content=button-head)
## Documentation ## Documentation
The documentation for the Vue Black Dashboard is hosted at our [website](https://demos.creative-tim.com/vue-black-dashboard/documentation). The documentation for the Vue Black Dashboard is hosted at our [website](https://demos.creative-tim.com/vue-black-dashboard/documentation).
@ -181,7 +174,7 @@ If you have questions or need help integrating the product please [contact us](h
## Licensing ## Licensing
- Copyright 2024 Creative Tim (https://www.creative-tim.com/) - Copyright 2023 Creative Tim (https://www.creative-tim.com/)
- Licensed under MIT (https://github.com/creativetimofficial/vue-black-dashboard/issues/blob/master/LICENSE.md) - Licensed under MIT (https://github.com/creativetimofficial/vue-black-dashboard/issues/blob/master/LICENSE.md)

View File

@ -1,16 +0,0 @@
name: vue-black-dashboard
region: us-east-1
frontend:
# Specifies the path of your code.
path: .
# Specifies the folder where the build is located.
# This is the folder that will be deployed.
publish: dist
# Scripts will run in the specified `path` folder.
scripts:
# The command to build your frontend project. This is custom to your project.
# It must to populate the specified `publish` folder with a `index.html` file.
deploy:
- npm install --legacy-peer-deps
- npm run build
yamlVersion: 2

View File

@ -6,7 +6,7 @@
"author": "cristian.jora <joracristi@gmail.com>", "author": "cristian.jora <joracristi@gmail.com>",
"scripts": { "scripts": {
"serve": "vue-cli-service serve --open", "serve": "vue-cli-service serve --open",
"build": "cross-env CI=false vue-cli-service build", "build": "vue-cli-service build",
"e2e": "node test/e2e/runner.js", "e2e": "node test/e2e/runner.js",
"lint": "vue-cli-service lint", "lint": "vue-cli-service lint",
"dev": "vue-cli-service serve --open", "dev": "vue-cli-service serve --open",
@ -14,7 +14,6 @@
"prettify": "prettier --write ." "prettify": "prettier --write ."
}, },
"dependencies": { "dependencies": {
"@achrinza/node-ipc": "^10.1.11",
"chart.js": "2.9.4", "chart.js": "2.9.4",
"eslint-plugin-vue": "9.11.0", "eslint-plugin-vue": "9.11.0",
"register-service-worker": "^1.7.2", "register-service-worker": "^1.7.2",
@ -26,13 +25,12 @@
"vue2-transitions": "0.3.0" "vue2-transitions": "0.3.0"
}, },
"devDependencies": { "devDependencies": {
"@babel/eslint-parser": "7.21.8",
"@vue/cli-plugin-babel": "5.0.8", "@vue/cli-plugin-babel": "5.0.8",
"@vue/cli-plugin-eslint": "5.0.8", "@vue/cli-plugin-eslint": "5.0.8",
"@vue/cli-plugin-pwa": "5.0.8", "@vue/cli-plugin-pwa": "5.0.8",
"@vue/cli-service": "5.0.8", "@vue/cli-service": "5.0.8",
"@vue/eslint-config-prettier": "7.1.0", "@vue/eslint-config-prettier": "7.1.0",
"cross-env": "^7.0.3", "@babel/eslint-parser": "7.21.8",
"eslint": "8.41.0", "eslint": "8.41.0",
"eslint-plugin-prettier": "4.2.1", "eslint-plugin-prettier": "4.2.1",
"eslint-plugin-vue": "9.14.1", "eslint-plugin-vue": "9.14.1",

View File

@ -4,7 +4,7 @@
========================================================= =========================================================
* Product Page: https://www.creative-tim.com/product/black-dashboard * Product Page: https://www.creative-tim.com/product/black-dashboard
* Copyright 2024 Creative Tim (http://www.creative-tim.com) * Copyright 2023 Creative Tim (http://www.creative-tim.com)
========================================================= =========================================================

View File

@ -4,7 +4,7 @@
========================================================= =========================================================
* Product Page: https://www.creative-tim.com/product/black-dashboard * Product Page: https://www.creative-tim.com/product/black-dashboard
* Copyright 2024 Creative Tim (http://www.creative-tim.com) * Copyright 2023 Creative Tim (http://www.creative-tim.com)
========================================================= =========================================================

View File

@ -763,7 +763,7 @@ $card-bg: $white !default;
$card-img-overlay-padding: 1.25rem !default; $card-img-overlay-padding: 1.25rem !default;
$card-group-margin: calc($grid-gutter-width / 2) !default; $card-group-margin: ($grid-gutter-width / 2) !default;
$card-deck-margin: $card-group-margin !default; $card-deck-margin: $card-group-margin !default;
$card-columns-count: 3 !default; $card-columns-count: 3 !default;

View File

@ -4,8 +4,8 @@
@mixin make-container() { @mixin make-container() {
width: 100%; width: 100%;
padding-right: calc($grid-gutter-width / 2); padding-right: ($grid-gutter-width / 2);
padding-left: calc($grid-gutter-width / 2); padding-left: ($grid-gutter-width / 2);
margin-right: auto; margin-right: auto;
margin-left: auto; margin-left: auto;
} }
@ -25,8 +25,8 @@
@mixin make-row() { @mixin make-row() {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
margin-right: calc($grid-gutter-width / -2); margin-right: ($grid-gutter-width / -2);
margin-left: calc($grid-gutter-width / -2); margin-left: ($grid-gutter-width / -2);
} }
@mixin make-col-ready() { @mixin make-col-ready() {
@ -36,8 +36,8 @@
// later on to override this initial width. // later on to override this initial width.
width: 100%; width: 100%;
min-height: 1px; // Prevent collapsing min-height: 1px; // Prevent collapsing
padding-right: calc($grid-gutter-width / 2); padding-right: ($grid-gutter-width / 2);
padding-left: calc($grid-gutter-width / 2); padding-left: ($grid-gutter-width / 2);
} }
@mixin make-col($size, $columns: $grid-columns) { @mixin make-col($size, $columns: $grid-columns) {

View File

@ -26,10 +26,10 @@
// but doesn't convert dppx=>dpi. // but doesn't convert dppx=>dpi.
// There's no such thing as unprefixed min-device-pixel-ratio since it's nonstandard. // There's no such thing as unprefixed min-device-pixel-ratio since it's nonstandard.
// Compatibility info: https://caniuse.com/#feat=css-media-resolution // Compatibility info: https://caniuse.com/#feat=css-media-resolution
@media only screen and (min-resolution: 192dpi){ @media only screen and (min-resolution: 192dpi),
// IE9-11 don't support dppx only screen and (min-resolution: 2dppx) { // IE9-11 don't support dppx only screen and (min-resolution: 2dppx) {
// Standardized // Standardized
background-image: url($file-2x); background-image: url($file-2x);
background-size: $width-1x $height-1x; background-size: $width-1x $height-1x;
} }
} }

View File

@ -1,10 +1,10 @@
/* /*
========================================================= =========================================================
* Vue Black Dashboard - v1.1.3 * Vue Black Dashboard - v1.1.2
========================================================= =========================================================
* Product Page: https://www.creative-tim.com/product/black-dashboard * Product Page: https://www.creative-tim.com/product/black-dashboard
* Copyright 2024 Creative Tim (http://www.creative-tim.com) * Copyright 2023 Creative Tim (http://www.creative-tim.com)
========================================================= =========================================================

View File

@ -259,7 +259,7 @@ export default {
mapOptions mapOptions
); );
let marker = new window.google.maps.marker.AdvancedMarkerElement({ let marker = new window.google.maps.Marker({
position: myLatlng, position: myLatlng,
title: "Hello World!", title: "Hello World!",
}); });