Merge branch 'feature/v1.2.2'

This commit is contained in:
Dragos 2019-12-13 16:30:35 +02:00
commit f2a5638e5a
11 changed files with 35 additions and 29 deletions

View File

@ -6,7 +6,8 @@ module.exports = {
extends: ["plugin:vue/essential", "@vue/prettier"], extends: ["plugin:vue/essential", "@vue/prettier"],
rules: { rules: {
"no-console": process.env.NODE_ENV === "production" ? "error" : "off", "no-console": process.env.NODE_ENV === "production" ? "error" : "off",
"no-debugger": process.env.NODE_ENV === "production" ? "error" : "off" "no-debugger": process.env.NODE_ENV === "production" ? "error" : "off",
"vue/no-use-v-if-with-v-for": "off"
}, },
parserOptions: { parserOptions: {
parser: "babel-eslint" parser: "babel-eslint"

View File

@ -1,7 +1,7 @@
# [Vue Material Kit](https://demos.creative-tim.com/vue-material-kit) [![Tweet](https://img.shields.io/twitter/url/http/shields.io.svg?style=social&logo=twitter)](https://twitter.com/home?status=Vue%20Material%20Kit%20-%20Material%20Design%20UI%20Kit%20for%20Vue.js%20https%3A//www.creative-tim.com/product/vue-material-kit%20%23vuejs%20%23ui%20%23kit%20%23vuematerial%20%40creativetim) # [Vue Material Kit](https://demos.creative-tim.com/vue-material-kit) [![Tweet](https://img.shields.io/twitter/url/http/shields.io.svg?style=social&logo=twitter)](https://twitter.com/home?status=Vue%20Material%20Kit%20-%20Material%20Design%20UI%20Kit%20for%20Vue.js%20https%3A//www.creative-tim.com/product/vue-material-kit%20%23vuejs%20%23ui%20%23kit%20%23vuematerial%20%40creativetim)
![version](https://img.shields.io/badge/version-1.2.0-blue.svg) [![GitHub issues open](https://img.shields.io/github/issues/creativetimofficial/vue-material-kit.svg)](https://github.com/creativetimofficial/vue-material-kit/issues?q=is%3Aopen+is%3Aissue) [![GitHub closed issues](https://img.shields.io/github/issues-closed-raw/creativetimofficial/vue-material-kit.svg?maxAge=259200)](https://github.com/creativetimofficial/vue-material-kit/issues?q=is%3Aissue+is%3Aclosed) [![Chat](https://img.shields.io/badge/chat-on%20discord-7289da.svg)](https://discord.gg/E4aHAQy) ![version](https://img.shields.io/badge/version-1.2.2-blue.svg) [![GitHub issues open](https://img.shields.io/github/issues/creativetimofficial/vue-material-kit.svg)](https://github.com/creativetimofficial/vue-material-kit/issues?q=is%3Aopen+is%3Aissue) [![GitHub closed issues](https://img.shields.io/github/issues-closed-raw/creativetimofficial/vue-material-kit.svg?maxAge=259200)](https://github.com/creativetimofficial/vue-material-kit/issues?q=is%3Aissue+is%3Aclosed) [![Chat](https://img.shields.io/badge/chat-on%20discord-7289da.svg)](https://discord.gg/E4aHAQy)
![Product Gif](https://s3.amazonaws.com/creativetim_bucket/products/97/original/opt_mk_vue_thumbnail.jpg) ![Product Gif](https://s3.amazonaws.com/creativetim_bucket/products/97/original/opt_mk_vue_thumbnail.jpg)

View File

@ -2,7 +2,7 @@
"name": "vue-material-kit", "name": "vue-material-kit",
"author": "Creative Tim https://www.creative-tim.com/", "author": "Creative Tim https://www.creative-tim.com/",
"description": "Vue Material Kit", "description": "Vue Material Kit",
"version": "1.2.0", "version": "1.2.2",
"private": true, "private": true,
"scripts": { "scripts": {
"serve": "vue-cli-service serve --open", "serve": "vue-cli-service serve --open",
@ -12,24 +12,31 @@
"install:clean": "rm -rf node_modules/ && rm -rf package-lock.json && npm install && npm run dev" "install:clean": "rm -rf node_modules/ && rm -rf package-lock.json && npm install && npm run dev"
}, },
"dependencies": { "dependencies": {
"nouislider": "14.0.2", "core-js": "3.5.0",
"nouislider": "14.1.0",
"v-tooltip": "2.0.2", "v-tooltip": "2.0.2",
"vue": "2.6.10", "vue": "2.6.10",
"vue-carousel": "0.18.0", "vue-carousel": "0.18.0",
"vue-clickaway": "2.2.2", "vue-clickaway": "2.2.2",
"vue-lazyload": "1.3.1", "vue-lazyload": "1.3.3",
"vue-material": "1.0.0-beta-11", "vue-material": "1.0.0-beta-11",
"vue-router": "3.0.7" "vue-router": "3.1.3"
}, },
"devDependencies": { "devDependencies": {
"@vue/cli-plugin-babel": "3.9.2", "@vue/cli-plugin-babel": "4.1.1",
"@vue/cli-plugin-eslint": "3.9.2", "@vue/cli-plugin-eslint": "4.1.1",
"@vue/cli-service": "3.9.3", "@vue/cli-plugin-router": "4.1.1",
"@vue/eslint-config-prettier": "4.0.1", "@vue/cli-service": "4.1.1",
"@vue/eslint-config-prettier": "6.0.0",
"babel-eslint": "10.0.3",
"eslint": "6.7.2",
"eslint-plugin-prettier": "3.1.1",
"eslint-plugin-vue": "6.0.1",
"prettier": "1.19.1",
"sass": "1.23.7",
"sass-loader": "8.0.0",
"vue-template-compiler": "2.6.10",
"gulp": "4.0.2", "gulp": "4.0.2",
"gulp-append-prepend": "1.0.8", "gulp-append-prepend": "1.0.8"
"node-sass": "4.12.0",
"sass-loader": "7.1.0",
"vue-template-compiler": "2.6.10"
} }
} }

View File

@ -1,7 +1,7 @@
<!-- <!--
========================================================= =========================================================
* Vue Material Kit - v1.2.0 * Vue Material Kit - v1.2.2
========================================================= =========================================================
* Product Page: https://www.creative-tim.com/product/vue-material-kit * Product Page: https://www.creative-tim.com/product/vue-material-kit

View File

@ -1,7 +1,7 @@
/*! /*!
========================================================= =========================================================
* Vue Material Kit - v1.2.0 * Vue Material Kit - v1.2.2
========================================================= =========================================================
* Product Page: http://www.creative-tim.com/product/vue-material-kit * Product Page: http://www.creative-tim.com/product/vue-material-kit

View File

@ -59,7 +59,8 @@
padding-top: 0; padding-top: 0;
} }
&.md-valid{ &.md-valid,
&.md-valid.md-focused {
label{ label{
color: $brand-success !important; color: $brand-success !important;
} }
@ -73,7 +74,8 @@
} }
} }
&.md-error{ &.md-error,
&.md-error.md-focused {
label{ label{
color: $brand-danger !important; color: $brand-danger !important;
} }

View File

@ -12,7 +12,7 @@
@mixin toolbar-colors($variation-color, $text-color){ @mixin toolbar-colors($variation-color, $text-color){
background-color: $variation-color !important; background-color: $variation-color !important;
@include shadow-navbar-color($variation-color) @include shadow-navbar-color($variation-color);
.md-title, .md-title,
.md-list .md-list-item-content, .md-list .md-list-item-content,

View File

@ -5,9 +5,7 @@
:class="{ disabled: value === 1, 'no-arrows': noArrows }" :class="{ disabled: value === 1, 'no-arrows': noArrows }"
> >
<a class="page-link" aria-label="Previous" @click="prevPage"> <a class="page-link" aria-label="Previous" @click="prevPage">
<template v-if="withText" <template v-if="withText">Prev</template>
>Prev</template
>
<i class="fas fa-angle-double-left" v-else></i> <i class="fas fa-angle-double-left" v-else></i>
</a> </a>
</li> </li>
@ -24,9 +22,7 @@
:class="{ disabled: value === totalPages, 'no-arrows': noArrows }" :class="{ disabled: value === totalPages, 'no-arrows': noArrows }"
> >
<a class="page-link" aria-label="Next" @click="nextPage"> <a class="page-link" aria-label="Next" @click="nextPage">
<template v-if="withText" <template v-if="withText">Next</template>
>Next</template
>
<i class="fas fa-angle-double-right" v-else></i> <i class="fas fa-angle-double-right" v-else></i>
</a> </a>
</li> </li>

View File

@ -1,5 +1,5 @@
// ========================================================= // =========================================================
// * Vue Material Kit - v1.2.0 // * Vue Material Kit - v1.2.2
// ========================================================= // =========================================================
// //
// * Product Page: https://www.creative-tim.com/product/vue-material-kit // * Product Page: https://www.creative-tim.com/product/vue-material-kit

View File

@ -158,7 +158,7 @@ export default {
padding: 0; padding: 0;
} }
.profile-tabs /deep/ { .profile-tabs::v-deep {
.md-card-tabs .md-list { .md-card-tabs .md-list {
justify-content: center; justify-content: center;
} }

View File

@ -7,7 +7,7 @@
<h3><small>Tabs with Icons on Card</small></h3> <h3><small>Tabs with Icons on Card</small></h3>
<nav-tabs-card no-label> <nav-tabs-card no-label>
<template slot="content"> <template slot="content">
<md-tabs md-sync-route class="md-primary" md-alignment="left"> <md-tabs class="md-primary" md-alignment="left">
<md-tab id="tab-home" md-label="Profile" md-icon="face"> <md-tab id="tab-home" md-label="Profile" md-icon="face">
<p> <p>
I will be the leader of a company that ends up being worth I will be the leader of a company that ends up being worth
@ -51,7 +51,7 @@
<h3><small>Tabs on Plain Card</small></h3> <h3><small>Tabs on Plain Card</small></h3>
<nav-tabs-card no-label tabs-plain> <nav-tabs-card no-label tabs-plain>
<template slot="content"> <template slot="content">
<md-tabs md-sync-route class="md-danger" md-alignment="left"> <md-tabs class="md-danger" md-alignment="left">
<md-tab id="tab-home" md-label="Home"> <md-tab id="tab-home" md-label="Home">
<p> <p>
I think thats a responsibility that I have, to push I think thats a responsibility that I have, to push