Remove vue-material-design-icons and uses iconfont instead.

This commit is contained in:
mateuswetah 2018-01-25 09:39:43 -02:00
parent 2aa0a679c3
commit 548f63d9ff
17 changed files with 2437 additions and 35 deletions

10
package-lock.json generated
View File

@ -3784,6 +3784,11 @@
"integrity": "sha1-WQTcU3w57G2+/q6QIycTX6hRHxI=", "integrity": "sha1-WQTcU3w57G2+/q6QIycTX6hRHxI=",
"dev": true "dev": true
}, },
"material-design-icons": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/material-design-icons/-/material-design-icons-3.0.1.tgz",
"integrity": "sha1-mnHEh0chjrylHlGmbaaCA4zct78="
},
"math-expression-evaluator": { "math-expression-evaluator": {
"version": "1.2.17", "version": "1.2.17",
"resolved": "https://registry.npmjs.org/math-expression-evaluator/-/math-expression-evaluator-1.2.17.tgz", "resolved": "https://registry.npmjs.org/math-expression-evaluator/-/math-expression-evaluator-1.2.17.tgz",
@ -6060,11 +6065,6 @@
"vue-template-es2015-compiler": "1.6.0" "vue-template-es2015-compiler": "1.6.0"
} }
}, },
"vue-material-design-icons": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/vue-material-design-icons/-/vue-material-design-icons-1.0.0.tgz",
"integrity": "sha512-Do4M+l6l9+Wf1MQCWcAeNvSSYpynxddtqMRnhCRLFys58OU3z34AI7aYrhEo1SpvHc1KHcgQq1x4K7LCZfYSYw=="
},
"vue-router": { "vue-router": {
"version": "3.0.1", "version": "3.0.1",
"resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.0.1.tgz", "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.0.1.tgz",

View File

@ -11,8 +11,8 @@
"axios": "^0.17.1", "axios": "^0.17.1",
"bootstrap": "^3.3.7", "bootstrap": "^3.3.7",
"element-ui": "^2.0.11", "element-ui": "^2.0.11",
"material-design-icons": "^3.0.1",
"vue": "^2.0.1", "vue": "^2.0.1",
"vue-material-design-icons": "^1.0.0",
"vuex": "^3.0.1" "vuex": "^3.0.1"
}, },
"devDependencies": { "devDependencies": {

View File

@ -14,8 +14,8 @@
</el-table-column> </el-table-column>
<el-table-column label="Ações" width="120"> <el-table-column label="Ações" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="small" type="text" @click.native="shareCollection(scope.row.id)"><share-variant-icon></share-variant-icon></el-button> <el-button size="small" type="text" @click.native="shareCollection(scope.row.id)"><i class="material-icons">share</i></el-button>
<el-button size="small" type="text" @click.native="showMoreCollection(scope.row.id)"><dots-horizontal-icon></dots-horizontal-icon></el-button> <el-button size="small" type="text" @click.native="showMoreCollection(scope.row.id)"><i class="material-icons">more_vert</i></el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -24,8 +24,6 @@
<script> <script>
import { mapActions, mapGetters } from 'vuex' import { mapActions, mapGetters } from 'vuex'
import ShareVariantIcon from "vue-material-design-icons/share-variant.vue"
import DotsHorizontalIcon from "vue-material-design-icons/dots-horizontal.vue"
export default { export default {
name: 'CollectionsList', name: 'CollectionsList',
@ -34,10 +32,6 @@ export default {
multipleSelection: [] multipleSelection: []
} }
}, },
components: {
ShareVariantIcon,
DotsHorizontalIcon
},
methods: { methods: {
...mapActions('collection', [ ...mapActions('collection', [
'fetchCollections' 'fetchCollections'

View File

@ -14,8 +14,8 @@
</el-table-column> </el-table-column>
<el-table-column label="Ações" width="120"> <el-table-column label="Ações" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="small" type="text" @click.native="shareItem(scope.row.id)"><share-variant-icon></share-variant-icon></el-button> <el-button size="small" type="text" @click.native="shareItem(scope.row.id)"><i class="material-icons">share</i></el-button>
<el-button size="small" type="text" @click.native="showMoreItem(scope.row.id)"><dots-horizontal-icon></dots-horizontal-icon></el-button> <el-button size="small" type="text" @click.native="showMoreItem(scope.row.id)"><i class="material-icons">more_vert</i></el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -24,8 +24,6 @@
<script> <script>
import { mapActions, mapGetters } from 'vuex' import { mapActions, mapGetters } from 'vuex'
import ShareVariantIcon from "vue-material-design-icons/share-variant.vue"
import DotsHorizontalIcon from "vue-material-design-icons/dots-horizontal.vue"
export default { export default {
name: 'ItensList', name: 'ItensList',
@ -34,10 +32,6 @@ export default {
multipleSelection: [] multipleSelection: []
} }
}, },
components: {
ShareVariantIcon,
DotsHorizontalIcon
},
methods: { methods: {
...mapActions('item', [ ...mapActions('item', [
'fetchItens' 'fetchItens'

View File

@ -9,13 +9,14 @@
<el-input type="textarea" v-model="form.desc"></el-input> <el-input type="textarea" v-model="form.desc"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="Status"> <el-form-item label="Status">
<el-select v-model="form.region" placeholder="Selecione um status"> <el-select v-model="form.status" placeholder="Selecione um status">
<el-option label="Públicado" value="publish"></el-option> <el-option label="Públicado" value="publish"></el-option>
<el-option label="Rascunho" value="draft"></el-option> <el-option label="Rascunho" value="draft"></el-option>
<el-option label="Privado" value="private"></el-option> <el-option label="Privado" value="private"></el-option>
<el-option label="Lixo" value="trash"></el-option> <el-option label="Lixo" value="trash"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item>
<el-upload <el-upload
class="upload-demo" class="upload-demo"
drag drag
@ -26,12 +27,12 @@
<div class="el-upload__text">Arraste uma imagem aqui <em>ou clique para enviar</em></div> <div class="el-upload__text">Arraste uma imagem aqui <em>ou clique para enviar</em></div>
<div class="el-upload__tip" slot="tip">imagens em formato jpg/png</div> <div class="el-upload__tip" slot="tip">imagens em formato jpg/png</div>
</el-upload> </el-upload>
</el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" @click="onSubmit">Criar</el-button> <el-button type="primary" @click="onSubmit">Criar</el-button>
<el-button>Cancelar</el-button> <el-button>Cancelar</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<i class="el-icon-edit"></i>
</div> </div>
</template> </template>
@ -59,6 +60,7 @@ export default {
'getItens' 'getItens'
]), ]),
onSubmit() { onSubmit() {
console.log(this.form.name);
} }
}, },
computed: { computed: {

View File

@ -2,8 +2,9 @@
$--color-primary: teal; $--color-primary: teal;
/* icon font path, required */ /* icon font path, required */
//$--font-path: '../../../node_modules/element-theme-chalk/lib/fonts'; //$--font-path: '../../assets/css/fonts/material-icons.css';
@import "../../assets/css/fonts/material-icons.css";
@import "../../../node_modules/element-ui/packages/theme-chalk/src/index"; @import "../../../node_modules/element-ui/packages/theme-chalk/src/index";
body.tainacan-admin-page #adminmenumain { body.tainacan-admin-page #adminmenumain {
@ -19,4 +20,5 @@ body.tainacan-admin-page #adminmenumain {
right: 0; right: 0;
width: 100%; width: 100%;
z-index: 99999999999; z-index: 99999999999;
overflow-y: auto;
} }

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

File diff suppressed because one or more lines are too long

File diff suppressed because it is too large Load Diff

After

Width:  |  Height:  |  Size: 275 KiB

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -0,0 +1,36 @@
@font-face {
font-family: 'Material Icons';
font-style: normal;
font-weight: 400;
src: url(MaterialIcons-Regular.eot); /* For IE6-8 */
src: local('Material Icons'),
local('MaterialIcons-Regular'),
url(MaterialIcons-Regular.woff2) format('woff2'),
url(MaterialIcons-Regular.woff) format('woff'),
url(MaterialIcons-Regular.ttf) format('truetype');
}
.material-icons {
font-family: 'Material Icons';
font-weight: normal;
font-style: normal;
font-size: 24px; /* Preferred icon size */
display: inline-block;
line-height: 1;
text-transform: none;
letter-spacing: normal;
word-wrap: normal;
white-space: nowrap;
direction: ltr;
/* Support for all WebKit browsers. */
-webkit-font-smoothing: antialiased;
/* Support for Safari and Chrome. */
text-rendering: optimizeLegibility;
/* Support for Firefox. */
-moz-osx-font-smoothing: grayscale;
/* Support for IE. */
font-feature-settings: 'liga';
}

Binary file not shown.