Merge branch 'master' of https://gitlab.com/willamall/willamall-admin

resources/js/Global/components/Dividers/PageTitle.vue

@@ -2,8 +2,8 @@
     <div class="WM-ImageHeader">
         <div class="Background" :style="'background-image:url(/images/Global/Header/'+imageAddress+'); height:'+imageHeight+'px;'">
             <div class="Title">
-                <h2 class="FA" :class="titleFaClass">  {{ titleFa }}  </h2>
+                <h2 class="Fa" :class="titleFaClass">  {{ titleFa }}  </h2>
-                <h3 class="EN" :class="color"> {{ titleEn }} </h3>
+                <h3 class="En " :class="color"> {{ titleEn }} </h3>
             </div>
         </div>
     </div>
@@ -41,18 +41,21 @@ export default {
         bottom:10px;
         right:50px;
     }
-    .WM-ImageHeader .Title .FA {
+    .WM-ImageHeader .Title .Fa {
         font-size: 32px;
         margin: 0px;
+        font-weight: 400;
     }
-    .WM-ImageHeader .Title .EN {
+    .WM-ImageHeader .Title .En {
+        font-weight: 200;
         font-size: 12px;
         border-radius: 5px;
         letter-spacing: 10px;
         display: inline-block;
-        padding: 7px 25px 2px 25px;
+        padding: 4px 15px 4px 25px;
         color: #fff;
         margin: 3px 0px 10px 0px;
         text-transform: uppercase;
     }
+
 </style>

resources/js/Global/components/Dividers/PartTitle.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="SectionTitle WM-Width-100">
-        <h4 class="TitleFa WM-Align-R" :class="TextFaColor" v-text="TitleFa"></h4>
+        <div class="TitleFa Fa Bold  WM-Align-R" :class="TextFaColor" v-text="TitleFa"></div>
-        <div class="TitleEn WM-Flex">
+        <div class="TitleEn En WM-Flex">
             <span :class="[color,TextColor]" v-text="TitleEn"></span>
             <div class="Line">
                 <div class="inner" :class="color"></div>
@@ -31,13 +31,13 @@ export default {
 -------------------------------------------------------- */
 
 .SectionTitle .TitleFa {
-    font-size: 1.7rem;
+    font-size: 1.4rem;
 }
 
 .SectionTitle .TitleEn {
     span {
         color: #fff;
-        padding: 6px 25px 2px 25px;
+        padding: 2px 20px 2px 25px;
         border-radius: 0.2em;
         letter-spacing: 0.5em;
         line-height: 18px;

resources/js/Global/components/Drawer/SideBar.vue

@@ -6,15 +6,15 @@
 				<v-icon class="Home" dark>fas fa-home</v-icon>
 			</a>
 			<div class="Time">
-				<div class="En WM-Font-22">{{ timeNow }}</div>
+				<div class="WM-Font-22 En ExtraBold">{{ timeNow }}</div>
-				<div class="WM-Font-14">{{  new Date() | moment("dddd  jDD  jMMMM jYYYY") }}</div>
+				<div class="WM-Font-14 Fa FaNum">{{  new Date() | moment("dddd  jDD  jMMMM jYYYY") }}</div>
 			</div>
 			<!-- <div class="Notification" dark>
                 <wm-notifications></wm-notifications>
 			</div>-->
 		</v-container>
 
-		<v-navigation-drawer v-model="drawer" app temporary right>
+		<v-navigation-drawer v-model="drawer" app temporary right width="320">
 			<v-list class="pa-1">
                 <div class="row user-info">
                     <v-flex lg9 class="pa-3">
@@ -131,7 +131,9 @@ export default {
     width: 48px;
     margin: 0px 10px;
 }
-
+.user-info .Title .Name {
+    font-size: 14px;
+}
 
 .Header .Menu {
 	position: absolute;
@@ -185,10 +187,10 @@ export default {
 .drawer {
 	position: fixed;
 	top: 0px;
-	left: -400px;
+	left: -500px;
 	bottom: 0px;
 	background-color: white;
-	width: 400px;
+	width: 500px;
 }
 
 .drawer.open {

resources/js/Global/components/Drawer/Tile.vue

@@ -2,10 +2,11 @@
     <div class="Tile">
         <i v-if="icon" class="pre-icon" :class="[icon]"></i>
         <div class="Title">
-            <span class="TitleFa">{{ TitleFa }}</span><br>
+            <span class="TitleFa Fa Bold">{{ TitleFa }}</span><br>
-            <span class="TitleEn">{{ TitleEn }}</span>
+            <span class="TitleEn En">{{ TitleEn }}</span>
         </div>
-        <i v-if="hasDetail" class="WMi-left-open post-icon"></i>
+        <v-icon v-if="hasDetail" class="post-icon">fas fa-chevron-left </v-icon>
+        <!-- <i v-if="hasDetail" class="WMi-left-open post-icon"></i> -->
     </div>
 </template>
 <script>
@@ -66,7 +67,7 @@ export default {
 
 .Tile .TitleFa {
     display: inline-block;
-    font-size: 20px;
+    font-size: 18px;
 }
 .Tile .TitleEn {
     display: inline-block;
@@ -78,17 +79,18 @@ export default {
 
 }
 .Tile .post-icon::before {
-    margin-top: 20px;
+    margin-top: 0px;
 }
 
 
-.WMi-left-open {
+.post-icon {
+    font-size: 24px !important;
     margin-right: auto;
     color: #888;
     -webkit-transition: 0.3s cubic-bezier(0.4, 0, 0.2, 1);
 	transition: 0.3s cubic-bezier(0.4, 0, 0.2, 1);
 }
-.Tile:hover .WMi-left-open {
+.Tile:hover .post-icon {
     transform: translateX(-4px);
 }
 </style>

resources/js/Global/components/Tiles/Tile.vue

@@ -4,8 +4,8 @@
             <div class="CoverBG WM-Block WM-Align-C Relative" :style="'background-image: linear-gradient('+GradientDirection+', #'+GradientBegin+' , #'+GradientEnd+'); height: '+TileHeight+';'">
                 <div class="Content">
                     <div class="Info">
-                        <div class="TitleFa"> {{ TitleFa }} </div>
+                        <div class="TitleFa Fa"> {{ TitleFa }} </div>
-                        <div class="TitleEn"> {{ TitleEn }} </div>
+                        <div class="TitleEn En"> {{ TitleEn }} </div>
                     </div>
                     <img class="Image" :src="$_getPath('images/Global/Tiles/'+ImageURL)" :height="ImageHeight"/>
                 </div>
@@ -67,7 +67,7 @@ export default {
         border-radius:5px;
     }
     .WM-ImageTile .TitleFa {
-        font-size:30px;
+        font-size:26px;
         color: #000;
     }
     .WM-ImageTile .TitleEn {

resources/js/Global/scss/Misc.scss

@@ -168,17 +168,19 @@
 .WM-Section .Title {
     float: right;
     margin-right: -30px;
+    margin-top: 8px;
 }
 
 .WM-Section .Title .FA {
-    font-size: 22px;
+    font-size: 20px;
-    line-height: 1.5;
+    line-height: 1.2;
 }
 
 .WM-Section .Title .EN {
     font-size: 12px;
     letter-spacing: 5px;
     text-transform: uppercase;
+    font-family: 'Montserrat-Regular', sans-serif;
 }
 
 .Duplicate {

resources/js/Global/scss/Modify.scss

@@ -3,7 +3,7 @@
 }
 
 .v-application {
-    font-family: "BYekan", "Montserrat-Regular" !important;
+    font-family: "iranyekan-regular", "Montserrat-Regular" !important;
     font-weight: 100;
 }
 
@@ -16,6 +16,11 @@ a:-webkit-any-link {
     text-decoration: none;
 }
 
+hr {
+    margin: 10px 0px;
+    border: 1px solid #eeeeee;
+}
+
 // a {
 //     color:#000 !important;
 // }
@@ -118,40 +123,45 @@ table.v-table tbody td {
     font-size: 15px;
 }
 
+// ------------------------------------------------------------------
+//                     .v-chip :: BEGIN
+// ------------------------------------------------------------------
 .v-chip .v-chip__content {
     padding: 0 10px;
-    font-size: 16px;
+    font-size: 14px;
 }
 
-.orange.darken-2 {
+.v-application--is-rtl .v-chip--pill .v-avatar--left {
-    background-color: #ff6b57 !important;
+    margin-right: -24px;
-    border-color: #ff6b57 !important;
+    font-family: 'Montserrat-ExtraBold', sans-serif;
 }
 
 .v-chip {
     height: 32px;
 }
 
-.v-btn+.v-btn {
+// ------------------------------------------------------------------
-    margin-right: 5px;
+//                     .inputs :: BEGIN
+// ------------------------------------------------------------------
+.v-label {
+    font-size: 14px;
 }
 
-.v-card__text.WM-JustSide {
+.v-list-item__title {
-    padding: 0px 16px;
+    font-size: 0.8rem;
 }
 
-.v-badge__badge span {
+.v-application--is-rtl .v-input.LTR .v-input__prepend-outer {
-    font-size: 18px;
+    margin: 8px 3px 0px 0px;
-    line-height: 18px;
 }
 
-.v-chip .v-avatar {
+.v-input.LTR .v-label.v-label--active {
-    font-size: 22px;
+    left: -35px !important;
 }
 
 .v-input.LTR input {
     direction: ltr;
-    font-family: "Montserrat-Regular" !important;
+    font-family: "Montserrat-Regular";
 }
 
 .v-input.LTR .v-label {
@@ -163,6 +173,41 @@ table.v-table tbody td {
     top: 3px;
 }
 
+// ------------------------------------------------------------------
+//                     .inputs :: END
+// ------------------------------------------------------------------
+.router-link-active.WM-Link-Cyan.disabled {
+    color: #32c5d2;
+    border-bottom: 2px solid #32c5d2;
+}
+
+.v-data-footer {
+    padding-left: 70px;
+}
+
+.orange.darken-2 {
+    background-color: #ff6b57 !important;
+    border-color: #ff6b57 !important;
+}
+
+.v-btn+.v-btn {
+    margin-right: 5px;
+}
+
+.v-card__text.WM-JustSide {
+    padding: 0px 16px;
+}
+
+.v-badge__badge span {
+    font-size: 16px;
+    line-height: 16px;
+    font-family: 'Montserrat-ExtraBold', sans-serif;
+}
+
+.v-chip .v-avatar {
+    font-size: 22px;
+}
+
 .Buttons {
     text-align: center;
     display: inline-flex;
@@ -209,6 +254,10 @@ table.v-table tbody td {
     color: #fff;
 }
 
+.v-tooltip span {
+    font-size: 14px;
+}
+
 .v-input.LTR label {
     left: 0px !important;
     right: auto !important;
@@ -267,10 +316,6 @@ $Value in $Shadows {
     font-size: 16px;
 }
 
-.v-application--is-rtl .v-chip--pill .v-avatar--left {
-    margin-right: -24px;
-}
-
 .v-list {
     text-align: right;
 }

resources/js/Global/scss/Tile.scss

@@ -57,6 +57,10 @@
     font-size: 13px;
 }
 
+.Info .TitleFa {
+    font-size: 16px;
+}
+
 //-----------------------------------Price
 .Content .Price {
     text-align: left;
@@ -77,5 +81,4 @@
     text-decoration-color: #ee3552;
     color: #ee3552;
     margin-top: -5px;
-
+}
-}

resources/js/Global/scss/style.scss

@@ -28,54 +28,68 @@
     font-family: 'iranyekan-bold';
     font-style: normal;
     font-weight: bold;
-    src: url('../assets/Fonts/IranYekan/eot/iranyekanwebbold.eot');
+    src: url('../assets/Fonts/IranYekan/Normal/eot/iranyekanwebbold.eot');
-    src: url('../assets/Fonts/IranYekan/woff/iranyekanwebbold.woff') format('woff'), /* FF3.6+, IE9, Chrome6+, Saf5.1+*/
+    src: url('../assets/Fonts/IranYekan/Normal/woff/iranyekanwebbold.woff') format('woff'), /* FF3.6+, IE9, Chrome6+, Saf5.1+*/
-    url('../assets/Fonts/IranYekan/ttf/iranyekanwebbold.ttf') format('truetype');
+    url('../assets/Fonts/IranYekan/Normal/ttf/iranyekanwebbold.ttf') format('truetype');
 }
 
 @font-face {
     font-family: 'iranyekan-thin';
     font-style: normal;
     font-weight: 100;
-    src: url('../assets/Fonts/IranYekan/eot/iranyekanwebthin.eot');
+    src: url('../assets/Fonts/IranYekan/Normal/eot/iranyekanwebthin.eot');
-    src: url('../assets/Fonts/IranYekan/woff/iranyekanwebthin.woff') format('woff'), /* FF3.6+, IE9, Chrome6+, Saf5.1+*/
+    src: url('../assets/Fonts/IranYekan/Normal/woff/iranyekanwebthin.woff') format('woff'), /* FF3.6+, IE9, Chrome6+, Saf5.1+*/
-    url('../assets/Fonts/IranYekan/ttf/iranyekanwebthin.ttf') format('truetype');
+    url('../assets/Fonts/IranYekan/Normal/ttf/iranyekanwebthin.ttf') format('truetype');
 }
 
 @font-face {
     font-family: 'iranyekan-light';
     font-style: normal;
     font-weight: 300;
-    src: url('../assets/Fonts/IranYekan/eot/iranyekanweblight.eot');
+    src: url('../assets/Fonts/IranYekan/Normal/eot/iranyekanweblight.eot');
-    src: url('../assets/Fonts/IranYekan/woff/iranyekanweblight.woff') format('woff'), /* FF3.6+, IE9, Chrome6+, Saf5.1+*/
+    src: url('../assets/Fonts/IranYekan/Normal/woff/iranyekanweblight.woff') format('woff'), /* FF3.6+, IE9, Chrome6+, Saf5.1+*/
-    url('../assets/Fonts/IranYekan/ttf/iranyekanweblight.ttf') format('truetype');
+    url('../assets/Fonts/IranYekan/Normal/ttf/iranyekanweblight.ttf') format('truetype');
 }
 
 @font-face {
     font-family: 'iranyekan-regular';
     font-style: normal;
     font-weight: normal;
-    src: url('../assets/Fonts/IranYekan/eot/iranyekanwebregular.eot');
+    src: url('../assets/Fonts/IranYekan/Normal/eot/iranyekanwebregular.eot');
-    src: url('../assets/Fonts/IranYekan/woff/iranyekanwebregular.woff') format('woff'), /* FF3.6+, IE9, Chrome6+, Saf5.1+*/
+    src: url('../assets/Fonts/IranYekan/Normal/woff/iranyekanwebregular.woff') format('woff'), /* FF3.6+, IE9, Chrome6+, Saf5.1+*/
-    url('../assets/Fonts/IranYekan/ttf/iranyekanwebregular.ttf') format('truetype');
+    url('../assets/Fonts/IranYekan/Normal/ttf/iranyekanwebregular.ttf') format('truetype');
 }
 
 @font-face {
     font-family: 'iranyekan-medium';
     font-style: normal;
     font-weight: 500;
-    src: url('../assets/Fonts/IranYekan/eot/iranyekanwebmedium.eot');
+    src: url('../assets/Fonts/IranYekan/Normal/eot/iranyekanwebmedium.eot');
-    src: url('../assets/Fonts/IranYekan/woff/iranyekanwebmedium.woff') format('woff'), /* FF3.6+, IE9, Chrome6+, Saf5.1+*/
+    src: url('../assets/Fonts/IranYekan/Normal/woff/iranyekanwebmedium.woff') format('woff'), /* FF3.6+, IE9, Chrome6+, Saf5.1+*/
-    url('../assets/Fonts/IranYekan/ttf/iranyekanwebmedium.ttf') format('truetype');
+    url('../assets/Fonts/IranYekan/Normal/ttf/iranyekanwebmedium.ttf') format('truetype');
 }
 
 
-/* ----
+/* --------------------------------------------------------------------
--------------------------------- English Fonts-------------------------------
+                IranYekan :: Farsi Numbers
--- */
+--------------------------------------------------------------------*/
 
 @font-face {
-    font-family: 'Montserrat-ExtraBold';
+    font-family: 'iranyekan-regular-faNum';
+    font-style: normal;
+    font-weight: normal;
+    src: url('../assets/Fonts/IranYekan/FaNumeral/eot/iranyekanwebregularfanum.eot');
+    src: url('../assets/Fonts/IranYekan/FaNumeral/woff/iranyekanwebregularfanum.woff') format('woff'), /* FF3.6+, IE9, Chrome6+, Saf5.1+*/
+    url('../assets/Fonts/IranYekan/FaNumeral/ttf/iranyekanwebregularfanum.ttf') format('truetype');
+}
+
+
+/* --------------------------------------------------------------------
+                Montserrat :: Begin
+--------------------------------------------------------------------*/
+
+@font-face {
+    font-family: 'Montserrat-Bold';
     font-style: normal;
     font-weight: bold;
     src: url('../assets/Fonts/Montserrat/Montserrat-ExtraBold.ttf') format('truetype');
@@ -95,6 +109,11 @@
     src: url('../assets/Fonts/Montserrat/Montserrat-Thin.ttf') format('truetype');
 }
 
+
+/* --------------------------------------------------------------------
+                Montserrat :: End
+--------------------------------------------------------------------*/
+
 body {
     color: #5c6873;
     font-family: "iranyekan-regular", 'Montserrat-Regular' !important;
@@ -121,6 +140,30 @@ a:hover {
     font-family: 'Montserrat-Regular', sans-serif;
 }
 
+.En.Thin {
+    font-family: 'Montserrat-Thin', sans-serif;
+}
+
+.En.ExtraBold {
+    font-family: 'Montserrat-ExtraBold', sans-serif;
+}
+
+.Fa {
+    font-family: 'iranyekan-regular', sans-serif;
+}
+
+.Fa.Thin {
+    font-family: 'iranyekan-thin', sans-serif;
+}
+
+.Fa.Bold {
+    font-family: 'iranyekan-bold', sans-serif;
+}
+
+.Fa.FaNum {
+    font-family: 'iranyekan-regular-faNum';
+}
+
 .Context {
     font-family: "BYekan-Edited", 'Montserrat-Regular' !important;
 }
@@ -219,4 +262,4 @@ input:-internal-autofill-selected {
 @import 'Inputs.scss';
 @import 'SizeAndPositioning.scss';
 @import 'Colors.scss';
-@import 'Modify.scss';
+@import 'Modify.scss';

resources/js/Home/App.vue

@@ -1,7 +1,7 @@
 <template>
 	<v-app>
 		<div id="app">
-			<wm-background ImageName="Purple"></wm-background>
+			<wm-background C1="C33764" C2="1D2671" C3="211f20"></wm-background>
 			<app-menu></app-menu>
 			<v-content>
 				<v-container fluid class="Login">
@@ -16,7 +16,7 @@
 </template>
 
 <script>
-import Background from "@Global/components/Body/Backgrounds/Gradient-Image";
+import Background from "@Global/components/Body/Backgrounds/Gradient-CSS";
 import Menu from "@Global/components/Drawer/SideBar";
 import { mapMutations } from "vuex";
 

resources/js/Home/views/AddModule.vue

@@ -15,8 +15,8 @@
 					<div :class="'itrator En '+module.color_class+'--text'">{{index+1}}</div>
 					<v-layout row wrap class="WM-Margin-0">
 						<v-flex lg4 class="Title">
-							<div class="FA">{{ module.title_fa }}</div>
+							<div class="Fa">{{ module.title_fa }}</div>
-							<div class="EN">{{ module.title_en }}</div>
+							<div class="En">{{ module.title_en }}</div>
 						</v-flex>
 						<v-flex lg4 class="Price">
 							<div class="Old En" v-if="module.old_price">{{ Intl.NumberFormat().format(module.old_price) }}</div>
@@ -168,10 +168,10 @@ export default {
 .ModuleItem .Title {
 	text-align: right;
 }
-.ModuleItem .FA {
+.ModuleItem .Fa {
-	font-size: 26px;
+	font-size: 22px;
 }
-.ModuleItem .EN {
+.ModuleItem .En {
 	font-size: 12px;
 	letter-spacing: 5px;
 	text-transform: uppercase;
@@ -221,4 +221,8 @@ export default {
 	font-size: 14px;
 	color: #6d6d6d;
 }
+
+.v-btn--round .v-btn__content .v-icon {
+    color: #fff;
+}
 </style>