change - product - icon

pull/1/head
alireza hassani 5 years ago
parent d22f506674
commit e53bdd17b0

@ -18,7 +18,8 @@
"wm/common": "dev-master",
"wm/core": "dev-master",
"wm/crm": "dev-master",
"wm/reservation": "dev-master"
"wm/reservation": "dev-master",
"wm/store": "dev-master"
},
"require-dev": {
"beyondcode/laravel-dump-server": "^1.0",
@ -83,6 +84,10 @@
{
"type": "path",
"url": "./modules/wm-reservation"
},
{
"type": "path",
"url": "./modules/wm-store"
}
]
}

1005
composer.lock generated

File diff suppressed because it is too large Load Diff

@ -1,6 +1,7 @@
{
"/js/vue/Authentication/app.js": "/js/vue/Authentication/app.js?id=7c4825c4679a1e4ed1e1",
"/js/vue/Home/app.js": "/js/vue/Home/app.js?id=aca7fc409acbfefc01c8",
"/js/vue/Modules/CRM/app.js": "/js/vue/Modules/CRM/app.js?id=66c0e1949570a888ac45",
"/js/vue/User/app.js": "/js/vue/User/app.js?id=f1630a1732ec04e32100"
"/js/vue/Authentication/app.js": "/js/vue/Authentication/app.js?id=f42769f802937bf95150",
"/js/vue/Home/app.js": "/js/vue/Home/app.js?id=20cbc303a38d3ff32b72",
"/js/vue/Modules/CRM/app.js": "/js/vue/Modules/CRM/app.js?id=e9a742ddfd5ff64b9511",
"/js/vue/Modules/Store/app.js": "/js/vue/Modules/Store/app.js?id=0076ff8cc3ac14215ddb",
"/js/vue/User/app.js": "/js/vue/User/app.js?id=177d52042c2071ccddeb"
}

@ -19,37 +19,44 @@ export default {
.backgrounds {
// background: linear-gradient(163deg, #1C0F41, #085156, #0C1630);
background-size: 600% 600%;
-webkit-animation: AnimationName 30s ease infinite;
-moz-animation: AnimationName 30s ease infinite;
-o-animation: AnimationName 30s ease infinite;
animation: AnimationName 30s ease infinite;
background-size: 100% 100%;
// -webkit-animation: MovingBackground 3s ease infinite;
// -moz-animation: MovingBackground 3s ease infinite;
// -o-animation: MovingBackground 3s ease infinite;
animation: MovingBackground 3s ease all infinite;
min-width: 100%;
min-height: 100%;
position:fixed;
z-index: -1;
background-position:0% 0%;
}
@-webkit-keyframes AnimationName {
// @-webkit-keyframes MovingBackground {
// 0%{background-position:37% 0%}
// 50%{background-position:64% 100%}
// 100%{background-position:37% 0%}
// }
// @-moz-keyframes MovingBackground {
// 0%{background-position:37% 0%}
// 50%{background-position:64% 100%}
// 100%{background-position:37% 0%}
// }
// @-o-keyframes MovingBackground {
// 0%{background-position:37% 0%}
// 50%{background-position:64% 100%}
// 100%{background-position:37% 0%}
// }
@keyframes MovingBackground {
0%{background-position:37% 0%}
50%{background-position:64% 100%}
100%{background-position:37% 0%}
}
@-moz-keyframes AnimationName {
0%{background-position:37% 0%}
50%{background-position:64% 100%}
100%{background-position:37% 0%}
}
@-o-keyframes AnimationName {
0%{background-position:37% 0%}
50%{background-position:64% 100%}
100%{background-position:37% 0%}
}
@keyframes AnimationName {
0%{background-position:37% 0%}
50%{background-position:64% 100%}
100%{background-position:37% 0%}
@keyframes FadeBackground {
0%{opacity:1}
50%{opacity:0}
100%{opacity:1}
}
</style>

@ -1,9 +1,9 @@
<template>
<v-layout wrap>
<v-container class="Header">
<v-icon class="Menu" @click.stop="drawer = !drawer" dark>fas fa-bars</v-icon>
<v-icon class="Menu" @click.stop="drawer = !drawer" dark>WMi-menu</v-icon>
<a :href="mainHref">
<v-icon class="Home" dark>fas fa-home</v-icon>
<v-icon class="Home" dark>WMi-Real-Estate</v-icon>
</a>
<div class="Name caption"> {{ getAuthUser.name }} </div>
<div class="Time">
@ -30,7 +30,7 @@
<v-tooltip bottom color="black" transition="slide-x-transition">
<template v-slot:activator="{ on }">
<v-btn class="mt-4" small @click.native.stop="logout" slot="activator" outlined fab color="black" dark v-on="on">
<v-icon dark>fas fa-power-off</v-icon>
<v-icon dark>WMi-off-1</v-icon>
</v-btn>
</template>
<span>خروج از حساب کاربری</span>
@ -75,7 +75,7 @@ export default {
hints: true,
drawer: false,
Items: [
// { titleEn: 'My Profile', titleFa: ' حساب کاربری من ', icon: 'dashboard', permission: "", href: '/User/List' },
{ titleEn: 'My Profile', titleFa: ' حساب کاربری من ', icon: 'dashboard', permission: "", href: '/User/Profile' },
// { titleEn: ' My Messages ', titleFa: ' پیام های من ', icon: 'question_answer', permission: "", href: '/User/List' },
{
titleEn: " My Users ",
@ -83,8 +83,15 @@ export default {
icon: "question_answer",
permission: "",
href: Routes.user(),
},
{
titleEn: " SMS Management ",
titleFa: " مدیریت پیام های کوتاه ",
icon: "question_answer",
permission: "",
href: '/User/SMS',
}
],
user: { name: "" },
timeNow: "",

@ -2,10 +2,10 @@
<div class="Tile">
<i v-if="icon" class="pre-icon" :class="[icon]"></i>
<div class="Title">
<span class="TitleFa Fa Bold">{{ TitleFa }}</span><br>
<span class="TitleFa Fa">{{ TitleFa }}</span><br>
<span class="TitleEn En">{{ TitleEn }}</span>
</div>
<v-icon v-if="hasDetail" class="post-icon">fas fa-chevron-left </v-icon>
<v-icon v-if="hasDetail" class="post-icon">WMi-left-open </v-icon>
<!-- <i v-if="hasDetail" class="WMi-left-open post-icon"></i> -->
</div>
</template>

@ -1,10 +1,10 @@
<template>
<v-breadcrumbs :items="items">
<template v-slot:divider>
<v-icon>fas fa-chevron-left</v-icon>
<v-icon>WMi-left-open</v-icon>
</template>
<template v-slot:item="props">
<router-link :to="{name: props.item.routeName}" class="WM-Link WM-Margin-T-5" :class="[LinkClass, props.item.disabled && 'disabled']"><v-icon>fas fa-{{ props.item.icon }}</v-icon> {{ props.item.text.toUpperCase() }}</router-link>
<router-link :to="{name: props.item.routeName}" class="WM-Link WM-Margin-T-5" :class="[LinkClass, props.item.disabled && 'disabled']"><v-icon>WMi-{{ props.item.icon }}</v-icon> {{ props.item.text.toUpperCase() }}</router-link>
</template>
</v-breadcrumbs>
</template>
@ -19,7 +19,7 @@ export default {
</script>
<style scoped lang="scss">
.WM-Link .v-icon{
margin-bottom: 7px;
margin-bottom: 3px;
margin-left: 5px;
}
.disabled {
@ -32,4 +32,8 @@ export default {
.v-breadcrumbs .WM-Link {
font-size: 14px;
}
.router-link-exact-active.router-link-active.WM-Link-Cyan .v-icon {
color: #32c5d2;
}
</style>

@ -1,12 +1,15 @@
<template>
<div class="WM-Info-Block" :class='direction'>
<div class="Label"><v-icon>fas fa-{{icon}}</v-icon> {{label}} </div>
<div class="Values" >
<v-chip v-for="(value, index) in values" :key="index" color="grey lighten-3"> {{ value }} </v-chip>
<div class="Label"><v-icon>WMi-{{icon}}</v-icon> {{label}} </div>
<div class="Values pt-1" >
<v-chip v-for="(value, index) in values" :key="index" color="grey lighten-3 ml-1"> {{ value }} </v-chip>
</div>
</div>
<!-- <wm-info-block-multiple label="دپارتمان" :values="['فنی مهندسی','برنامه نویسی']" icon="align-right" ></wm-info-block-multiple> -->
</template>
<script>
export default {
props: {

@ -3,6 +3,7 @@
<div class="Label"><v-icon>WMi-{{icon}}</v-icon> {{ label }} </div>
<div class="Value" :class='valueClass' > {{ value }} </div>
</div>
<!-- <wm-info-block label="نام به فارسی" value=" دکتر علی سیفی " icon="user" ></wm-info-block> -->
</template>
<script>
@ -20,7 +21,7 @@ export default {
.WM-Info-Block {
text-align: right;
padding: 5px 10px 10px 10px;
margin-bottom: 10px;
margin: 0px 2px 10px;
border-right: 1px solid #dcdcdc;
}
.WM-Info-Block.LTR {

@ -202,3 +202,17 @@
.WM-Pointer {
cursor: pointer;
}
.WM-ToDuplicate-Block {
padding: 5px 10px 2px 10px;
border: 1px solid #eeeeee;
border-right: 2px solid #000;
margin: 5px;
;
}
.WM-ToDuplicate-Block .Header {
text-align: right;
font-size: 22px;
margin: 5px 0px;
}

@ -244,15 +244,18 @@ table.v-table tbody td {
.v-btn.M .v-icon {
font-size: 25px;
}
.theme--dark.v-btn.v-btn--disabled:not(.v-btn--flat):not(.v-btn--text):not(.v-btn--outlined) {
background-color: rgba(0, 0, 0, 0.12) !important;
cursor: not-allowed;
}
.theme--dark.v-btn.v-btn--disabled, .theme--dark.v-btn.v-btn--disabled .v-btn__loading, .theme--dark.v-btn.v-btn--disabled .v-icon {
.theme--dark.v-btn.v-btn--disabled,
.theme--dark.v-btn.v-btn--disabled .v-btn__loading,
.theme--dark.v-btn.v-btn--disabled .v-icon {
color: rgba(0, 0, 0, 0.26) !important;
}
.v-tooltip .v-btn--outline:hover .v-icon,
.v-tooltip .v-btn--outline:focus .v-icon {
color: #fff;
@ -343,3 +346,37 @@ $Value in $Shadows {
.v-snack {
font-size: 16px;
}
// ------------------------------------------------------------------
// Badge :: Begin
// ------------------------------------------------------------------
.v-application--is-rtl .v-badge__badge {
right: auto;
left: -48px;
}
.v-badge__badge {
padding: 0 6px;
}
// ------------------------------------------------------------------
// Badge :: End
// ------------------------------------------------------------------
.vue-dropzone {
font-family: "iranyekan-regular", "Montserrat-Regular" !important;
}
// ------------------------------------------------------------------
// Expansion-Panel :: Begin
// ------------------------------------------------------------------
.v-expansion-panel:before {
box-shadow: none;
}
.v-expansion-panel-header {
padding: 0px;
}
// ------------------------------------------------------------------
// Expansion-Panel :: End
// ------------------------------------------------------------------

@ -3,9 +3,9 @@
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link href="https://use.fontawesome.com/releases/v5.0.13/css/all.css" rel="stylesheet">
{{-- <link href="https://use.fontawesome.com/releases/v5.0.13/css/all.css" rel="stylesheet"> --}}
<title> Welcome </title>
<title> Welcome 222 </title>
<!-- Styles -->

2
webpack.mix.js vendored

@ -29,8 +29,8 @@ mix.js('resources/js/Home/app.js', 'public/js/vue/Home');
require('./modules/wm-core/webpack.mix');
require('./modules/wm-common/webpack.mix');
require('./modules/wm-crm/webpack.mix');
require('./modules/wm-store/webpack.mix');
// require('./modules/wm-reservation/webpack.mix');

Loading…
Cancel
Save