diff --git a/package-lock.json b/package-lock.json index e663947..36fe40d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1684,7 +1684,7 @@ }, "util": { "version": "0.10.3", - "resolved": "http://registry.npmjs.org/util/-/util-0.10.3.tgz", + "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz", "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=", "dev": true, "requires": { @@ -1854,7 +1854,7 @@ }, "supports-color": { "version": "2.0.0", - "resolved": "http://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", "dev": true } @@ -2812,6 +2812,17 @@ "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz", "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=" }, + "clipboard": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/clipboard/-/clipboard-2.0.6.tgz", + "integrity": "sha512-g5zbiixBRk/wyKakSwCKd7vQXDjFnAMGHoEyBogG/bw9kTD9GvdAvaoRR1ALcEzt3pVKxZR0pViekPMIS0QyGg==", + "optional": true, + "requires": { + "good-listener": "^1.2.2", + "select": "^1.1.2", + "tiny-emitter": "^2.0.0" + } + }, "cliui": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz", @@ -3713,6 +3724,12 @@ "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=", "dev": true }, + "delegate": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/delegate/-/delegate-3.2.0.tgz", + "integrity": "sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw==", + "optional": true + }, "delegates": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", @@ -4786,7 +4803,7 @@ }, "supports-color": { "version": "2.0.0", - "resolved": "http://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", "dev": true } @@ -5676,6 +5693,15 @@ "minimatch": "~3.0.2" } }, + "good-listener": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/good-listener/-/good-listener-1.2.2.tgz", + "integrity": "sha1-1TswzfkxPf+33JoNR3CWqm0UXFA=", + "optional": true, + "requires": { + "delegate": "^3.1.2" + } + }, "got": { "version": "8.3.2", "resolved": "https://registry.npmjs.org/got/-/got-8.3.2.tgz", @@ -9372,6 +9398,14 @@ "integrity": "sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==", "dev": true }, + "prismjs": { + "version": "1.21.0", + "resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.21.0.tgz", + "integrity": "sha512-uGdSIu1nk3kej2iZsLyDoJ7e9bnPzIgY0naW/HdknGj61zScaprVEVGHrPoXqI+M9sP0NDnTK2jpkvmldpuqDw==", + "requires": { + "clipboard": "^2.0.0" + } + }, "private": { "version": "0.1.8", "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz", @@ -9552,7 +9586,7 @@ }, "yargs": { "version": "3.10.0", - "resolved": "http://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz", "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=", "dev": true, "requires": { @@ -10480,6 +10514,12 @@ } } }, + "select": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/select/-/select-1.1.2.tgz", + "integrity": "sha1-DnNQrN7ICxEIUoeG7B1EGNEbOW0=", + "optional": true + }, "select-hose": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz", @@ -10967,7 +11007,7 @@ }, "sprintf-js": { "version": "1.0.3", - "resolved": "http://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=" }, "sshpk": { @@ -11259,7 +11299,7 @@ }, "strip-eof": { "version": "1.0.0", - "resolved": "http://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz", + "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz", "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=", "dev": true }, @@ -11477,7 +11517,7 @@ }, "through": { "version": "2.3.8", - "resolved": "http://registry.npmjs.org/through/-/through-2.3.8.tgz", + "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=" }, "thunky": { @@ -11507,6 +11547,12 @@ "integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=", "dev": true }, + "tiny-emitter": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.1.0.tgz", + "integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==", + "optional": true + }, "tinymce": { "version": "4.9.7", "resolved": "https://registry.npmjs.org/tinymce/-/tinymce-4.9.7.tgz", @@ -11626,7 +11672,7 @@ }, "tty-browserify": { "version": "0.0.0", - "resolved": "http://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz", + "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz", "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=", "dev": true }, @@ -12084,6 +12130,12 @@ "vue-style-loader": "^4.1.0" } }, + "vue-masonry-css": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/vue-masonry-css/-/vue-masonry-css-1.0.3.tgz", + "integrity": "sha512-viecHQiHVLez7HlYUQsv1wJb2MT/RDSzkDp6m3In41vPrk6OsBmT2qRE8LZqYIA4daIwrnx/Xm8h4fjOpuE3hw==", + "dev": true + }, "vue-meta": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/vue-meta/-/vue-meta-1.6.0.tgz", @@ -12120,6 +12172,11 @@ "moment-jalaali": "^0.9.2" } }, + "vue-prism-editor": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/vue-prism-editor/-/vue-prism-editor-1.2.2.tgz", + "integrity": "sha512-Lq2VgVygTx3Whn/tC8gD4m1ajA4lzSyCTqPLZA1Dq/ErbBaZA93FWRblwCoDR7AD2nXhGWuiTzb5ih3guzB7DA==" + }, "vue-resource": { "version": "1.5.1", "resolved": "https://registry.npmjs.org/vue-resource/-/vue-resource-1.5.1.tgz", diff --git a/package.json b/package.json index a7ed405..22f363a 100644 --- a/package.json +++ b/package.json @@ -36,6 +36,7 @@ "loadash": "^1.0.0", "object-to-formdata": "^2.1.2", "postcss-loader": "^3.0.0", + "prismjs": "^1.21.0", "raw-loader": "^0.5.1", "v-mask": "^2.2.3", "vee-validate": "^2.2.15", @@ -49,6 +50,7 @@ "vue-jalali-moment": "^1.0.0", "vue-moment": "^4.1.0", "vue-persian-datetime-picker": "^2.1.6", + "vue-prism-editor": "^1.2.2", "vue-router": "^3.0.2", "vue-scroll-reveal": "^1.0.11", "vue-the-mask": "^0.11.1", @@ -75,6 +77,7 @@ "sass": "^1.22.12", "sass-loader": "^7.3.1", "vue": "^2.6.10", + "vue-masonry-css": "^1.0.3", "vue-meta": "^1.5.2", "vue-resource": "^1.5.1", "vue-template-compiler": "^2.6.10", diff --git a/public/fonts/fontello.eot b/public/fonts/fontello.eot index 2cd8da7..61b1cbc 100644 Binary files a/public/fonts/fontello.eot and b/public/fonts/fontello.eot differ diff --git a/public/fonts/fontello.svg b/public/fonts/fontello.svg index 27432ca..dcaa443 100644 --- a/public/fonts/fontello.svg +++ b/public/fonts/fontello.svg @@ -176,7 +176,7 @@ - + @@ -342,7 +342,7 @@ - + @@ -418,6 +418,8 @@ + + @@ -438,6 +440,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -448,16 +474,30 @@ + + + + + + + + + + + + + + @@ -466,6 +506,8 @@ + + @@ -602,6 +644,10 @@ + + + + @@ -610,6 +656,10 @@ + + + + @@ -706,12 +756,16 @@ + + + + @@ -730,6 +784,8 @@ + + @@ -746,6 +802,8 @@ + + @@ -756,14 +814,28 @@ + + + + + + + + + + + + + + @@ -774,10 +846,14 @@ + + + + @@ -832,6 +908,20 @@ + + + + + + + + + + + + + + @@ -844,10 +934,14 @@ + + + + @@ -890,22 +984,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -914,10 +1050,16 @@ + + + + + + @@ -934,6 +1076,8 @@ + + diff --git a/public/fonts/fontello.ttf b/public/fonts/fontello.ttf index 26d14e3..1bf14f5 100644 Binary files a/public/fonts/fontello.ttf and b/public/fonts/fontello.ttf differ diff --git a/public/fonts/fontello.woff b/public/fonts/fontello.woff index 17cd64d..d2f16a8 100644 Binary files a/public/fonts/fontello.woff and b/public/fonts/fontello.woff differ diff --git a/public/fonts/fontello.woff2 b/public/fonts/fontello.woff2 index 058cf87..61892ce 100644 Binary files a/public/fonts/fontello.woff2 and b/public/fonts/fontello.woff2 differ diff --git a/resources/js/Global/components/Blocks/Icon.vue b/resources/js/Global/components/Blocks/Icon.vue index 0f5015a..d30da22 100644 --- a/resources/js/Global/components/Blocks/Icon.vue +++ b/resources/js/Global/components/Blocks/Icon.vue @@ -44,13 +44,15 @@ export default { line-height: 45px; } .we-icon .label { - font-size: 13px; + font-size: 12px; text-align: right; line-height: 16px; margin-right: 3px; + margin-bottom: 2px; + opacity: 0.7; } .we-icon .value { - font-size: 15px; + font-size: 16px; } .we-icon.sm .number { diff --git a/resources/js/Global/components/Blocks/Info.vue b/resources/js/Global/components/Blocks/Info.vue index 313773f..8adf2c2 100644 --- a/resources/js/Global/components/Blocks/Info.vue +++ b/resources/js/Global/components/Blocks/Info.vue @@ -33,6 +33,7 @@ export default { .info-block .Label { color: #797979; font-size: 12px; + margin-bottom: 4px; } .info-block:not(.LTR) .Value { color: #000; diff --git a/resources/js/Global/components/Blocks/Name-En.vue b/resources/js/Global/components/Blocks/Name-En.vue new file mode 100644 index 0000000..7900324 --- /dev/null +++ b/resources/js/Global/components/Blocks/Name-En.vue @@ -0,0 +1,224 @@ + + + + diff --git a/resources/js/Global/components/Blocks/Name.vue b/resources/js/Global/components/Blocks/Name.vue index c7b054d..dc65d5c 100644 --- a/resources/js/Global/components/Blocks/Name.vue +++ b/resources/js/Global/components/Blocks/Name.vue @@ -54,7 +54,7 @@ } .name-block .text .title-fa { font-size: 20px; - line-height: 22px; + line-height: 26px; } .name-block .text .title-en { font-size: 12px; diff --git a/resources/js/Global/components/Blocks/Price.vue b/resources/js/Global/components/Blocks/Price.vue index ffe6d1d..68eb533 100644 --- a/resources/js/Global/components/Blocks/Price.vue +++ b/resources/js/Global/components/Blocks/Price.vue @@ -4,7 +4,13 @@
{{ Intl.NumberFormat().format(Number(original_price)) }}
12 WMi-percentage
-
{{ Intl.NumberFormat().format(price) }}
+
+ +
+ WMi-{{ (direction == 'positive') ? 'plus' : 'minus'}} + {{ Intl.NumberFormat().format(price) }} +
+
{{ zeroLabel }}
@@ -18,6 +24,8 @@ price: { default: 1000 }, label: { default: 'تومان' }, zeroLabel: String, + top_label: String, + direction: String, }, }; @@ -36,6 +44,11 @@ .we-price .number { font-size: 25px; line-height: 20px; + direction: ltr; + } + .we-price .number .direction { + margin-right: -10px; + margin-left: -10px; } .we-price .discount { @@ -70,6 +83,9 @@ opacity: 0.7; text-align: left; } + .we-price .label.top { + text-align: right; + } /*----------------------------------------------------*/ /* Misc */ @@ -124,6 +140,9 @@ .we-price.theme-#{$color} .number-original { color: $value; } + .we-price.theme-#{$color}-full .number, .we-price.theme-#{$color}-full .label, .we-price.theme-#{$color}-full .direction { + color: $value; + } } diff --git a/resources/js/Global/components/Dividers/Section-Title-Big.vue b/resources/js/Global/components/Dividers/Section-Title-Big.vue new file mode 100644 index 0000000..25d3c18 --- /dev/null +++ b/resources/js/Global/components/Dividers/Section-Title-Big.vue @@ -0,0 +1,56 @@ + + + diff --git a/resources/js/Global/components/Dividers/Section-Title.vue b/resources/js/Global/components/Dividers/Section-Title.vue index 95c1a29..2b18bdc 100644 --- a/resources/js/Global/components/Dividers/Section-Title.vue +++ b/resources/js/Global/components/Dividers/Section-Title.vue @@ -1,6 +1,7 @@