change icon for share , change color in text of Infobox

2026-04-05 18:23:48 +00:00 · 2021-01-21 20:49:32 +01:00
parent 98d1926ab3
commit 078d920c19
8 changed files with 35 additions and 52 deletions
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -75,43 +75,23 @@
    "/chunks/user-storage.js": "/chunks/user-storage.js?id=5cfec8a8f8a8aef24ef2",
    "/chunks/user-subscription.js": "/chunks/user-subscription.js?id=c001bef2d6d5171cb359",
    "/chunks/users.js": "/chunks/users.js?id=6e68cb068f69fba3199c",
-    "/js/main.d83583876987f36df6b8.hot-update.js": "/js/main.d83583876987f36df6b8.hot-update.js",
-    "/js/main.49802462cdf65df4676c.hot-update.js": "/js/main.49802462cdf65df4676c.hot-update.js",
-    "/js/main.9c970ec909adce157866.hot-update.js": "/js/main.9c970ec909adce157866.hot-update.js",
-    "/js/main.5fb8e5212adaa6a7b208.hot-update.js": "/js/main.5fb8e5212adaa6a7b208.hot-update.js",
-    "/js/main.16650d32da49bbb800ac.hot-update.js": "/js/main.16650d32da49bbb800ac.hot-update.js",
-    "/js/main.d31d77135031cfc391de.hot-update.js": "/js/main.d31d77135031cfc391de.hot-update.js",
-    "/js/main.057f5121d85b27756cc6.hot-update.js": "/js/main.057f5121d85b27756cc6.hot-update.js",
-    "/js/main.d945537113f0848d8a88.hot-update.js": "/js/main.d945537113f0848d8a88.hot-update.js",
-    "/js/main.584afc298489d3b4d533.hot-update.js": "/js/main.584afc298489d3b4d533.hot-update.js",
-    "/js/main.7ba5414dc1654e6ded67.hot-update.js": "/js/main.7ba5414dc1654e6ded67.hot-update.js",
-    "/js/main.86966d0282fee6167620.hot-update.js": "/js/main.86966d0282fee6167620.hot-update.js",
-    "/js/main.fb559d55100f8d2eca4d.hot-update.js": "/js/main.fb559d55100f8d2eca4d.hot-update.js",
-    "/js/main.20dab96dfb66dcb8bced.hot-update.js": "/js/main.20dab96dfb66dcb8bced.hot-update.js",
-    "/js/main.97e744453baf7f5485ce.hot-update.js": "/js/main.97e744453baf7f5485ce.hot-update.js",
-    "/js/main.1792ac8c502b673e3011.hot-update.js": "/js/main.1792ac8c502b673e3011.hot-update.js",
-    "/js/main.e085096c539382bd7b2f.hot-update.js": "/js/main.e085096c539382bd7b2f.hot-update.js",
-    "/js/main.8bf0eec3d3a529852672.hot-update.js": "/js/main.8bf0eec3d3a529852672.hot-update.js",
-    "/js/main.ee247e2f807d75c5d10d.hot-update.js": "/js/main.ee247e2f807d75c5d10d.hot-update.js",
-    "/js/main.65fc57a1c1bb1924b483.hot-update.js": "/js/main.65fc57a1c1bb1924b483.hot-update.js",
-    "/js/main.10a12e697aa8dc8fb094.hot-update.js": "/js/main.10a12e697aa8dc8fb094.hot-update.js",
-    "/js/main.24df4cc6fc3a1a0b22ab.hot-update.js": "/js/main.24df4cc6fc3a1a0b22ab.hot-update.js",
-    "/js/main.c87d1e1905f3a3ab37a3.hot-update.js": "/js/main.c87d1e1905f3a3ab37a3.hot-update.js",
-    "/js/main.3672a53f8b55375d8c8e.hot-update.js": "/js/main.3672a53f8b55375d8c8e.hot-update.js",
-    "/js/main.8e7ea1713e1f6fa13484.hot-update.js": "/js/main.8e7ea1713e1f6fa13484.hot-update.js",
-    "/js/main.ec99c43313882992c378.hot-update.js": "/js/main.ec99c43313882992c378.hot-update.js",
-    "/js/main.4ec54458775fa5ada1fd.hot-update.js": "/js/main.4ec54458775fa5ada1fd.hot-update.js",
-    "/js/main.e50aea748bc03f82b612.hot-update.js": "/js/main.e50aea748bc03f82b612.hot-update.js",
-    "/js/main.e7528d831cdad6914026.hot-update.js": "/js/main.e7528d831cdad6914026.hot-update.js",
-    "/js/main.b9efb30bfaa86ea01c8a.hot-update.js": "/js/main.b9efb30bfaa86ea01c8a.hot-update.js",
-    "/js/main.28bd654e59013dc0d4be.hot-update.js": "/js/main.28bd654e59013dc0d4be.hot-update.js",
-    "/js/main.7884305d4592aaeaaf95.hot-update.js": "/js/main.7884305d4592aaeaaf95.hot-update.js",
-    "/js/main.73c766a268b2f2a0d0e1.hot-update.js": "/js/main.73c766a268b2f2a0d0e1.hot-update.js",
-    "/js/main.5df5b00fce58de42a3c4.hot-update.js": "/js/main.5df5b00fce58de42a3c4.hot-update.js",
-    "/js/main.15752cd5687d5cfd275b.hot-update.js": "/js/main.15752cd5687d5cfd275b.hot-update.js",
-    "/js/main.65cd0241aad9a18c205a.hot-update.js": "/js/main.65cd0241aad9a18c205a.hot-update.js",
-    "/js/main.a58fbdb65dc26ff29cbc.hot-update.js": "/js/main.a58fbdb65dc26ff29cbc.hot-update.js",
-    "/js/main.3f752e40b0eb5c9edb86.hot-update.js": "/js/main.3f752e40b0eb5c9edb86.hot-update.js",
-    "/js/main.3a94369aa0ffee771f8d.hot-update.js": "/js/main.3a94369aa0ffee771f8d.hot-update.js",
-    "/js/main.b51471b22f71626e4409.hot-update.js": "/js/main.b51471b22f71626e4409.hot-update.js"
+    "/js/main.93835132e94cb70cd948.hot-update.js": "/js/main.93835132e94cb70cd948.hot-update.js",
+    "/js/main.14e2786738b678e42790.hot-update.js": "/js/main.14e2786738b678e42790.hot-update.js",
+    "/js/main.1e09d5a114b47f78f735.hot-update.js": "/js/main.1e09d5a114b47f78f735.hot-update.js",
+    "/js/main.4d2831225ff8c15f9574.hot-update.js": "/js/main.4d2831225ff8c15f9574.hot-update.js",
+    "/js/main.a042e64d43031251bbaa.hot-update.js": "/js/main.a042e64d43031251bbaa.hot-update.js",
+    "/js/main.a694129c76d54bc01c54.hot-update.js": "/js/main.a694129c76d54bc01c54.hot-update.js",
+    "/js/main.b4e7813819304123bca8.hot-update.js": "/js/main.b4e7813819304123bca8.hot-update.js",
+    "/js/main.662b49470346b4b76841.hot-update.js": "/js/main.662b49470346b4b76841.hot-update.js",
+    "/js/main.c8076428be03059b7e5e.hot-update.js": "/js/main.c8076428be03059b7e5e.hot-update.js",
+    "/js/main.3c7083753a45cd005131.hot-update.js": "/js/main.3c7083753a45cd005131.hot-update.js",
+    "/js/main.507f77403a28efa7443a.hot-update.js": "/js/main.507f77403a28efa7443a.hot-update.js",
+    "/js/main.2fd90b99aa2342fdef5f.hot-update.js": "/js/main.2fd90b99aa2342fdef5f.hot-update.js",
+    "/js/main.bd0b6550dcc4e063c4b2.hot-update.js": "/js/main.bd0b6550dcc4e063c4b2.hot-update.js",
+    "/js/main.6be3a1f5d38918f938a0.hot-update.js": "/js/main.6be3a1f5d38918f938a0.hot-update.js",
+    "/js/main.77ffad300745cf6a660f.hot-update.js": "/js/main.77ffad300745cf6a660f.hot-update.js",
+    "/js/main.e8e09c42dd190eb3bbcb.hot-update.js": "/js/main.e8e09c42dd190eb3bbcb.hot-update.js",
+    "/js/main.c91c2d641e78f5b70169.hot-update.js": "/js/main.c91c2d641e78f5b70169.hot-update.js",
+    "/js/main.47d4d2225326852931a0.hot-update.js": "/js/main.47d4d2225326852931a0.hot-update.js",
+    "/js/main.69855deb7789f02f9f19.hot-update.js": "/js/main.69855deb7789f02f9f19.hot-update.js"
 }
--- a/resources/js/components/Others/Popup/PopupHeader.vue
+++ b/resources/js/components/Others/Popup/PopupHeader.vue
@@ -2,7 +2,8 @@
    <div class="popup-header">
        <div class="icon">
            <corner-down-right-icon v-if="icon === 'move'" size="15" class="title-icon"></corner-down-right-icon>
-            <link-icon v-if="icon === 'share'" size="17" class="title-icon"></link-icon>
+            <share-icon v-if="icon === 'share'" size="17" class="title-icon"></share-icon>
+            <!-- <link-icon v-if="icon === 'share'" size="17" class="title-icon"></link-icon> -->
            <edit2-icon v-if="icon === 'edit'" size="17" class="title-icon"></edit2-icon>
        </div>
        <div class="label">
@@ -13,7 +14,7 @@
 </template>

 <script>
-    import {CornerDownRightIcon, LinkIcon, XIcon, Edit2Icon} from 'vue-feather-icons'
+    import {CornerDownRightIcon, LinkIcon, XIcon, Edit2Icon, ShareIcon} from 'vue-feather-icons'
    import {events} from '@/bus'

    export default {
@@ -23,6 +24,7 @@
        ],
        components: {
            CornerDownRightIcon,
+            ShareIcon,
            Edit2Icon,
            LinkIcon,
            XIcon,
--- a/resources/js/components/Others/ShareCreate.vue
+++ b/resources/js/components/Others/ShareCreate.vue
@@ -11,9 +11,7 @@

            <!-- Infobox for successfull sended email -->
            <div v-if="isGeneratedShared && shareViaEmail" class="info-box">
-                <InfoBox >
-                    {{$t('shared_form.email_successfully_send_message')}}
-                </InfoBox>
+                <InfoBox v-html="$t('shared_form.email_successfully_send_message')"/>
            </div>


--- a/resources/js/components/Others/ShareEdit.vue
+++ b/resources/js/components/Others/ShareEdit.vue
@@ -11,13 +11,11 @@

            <!-- Infobox for successfull sended email -->
            <div v-if="sendToRecipientsMenu && isEmailSended" class="info-box">
-                <InfoBox >
-                    {{$t('shared_form.email_successfully_send_message')}}
-                </InfoBox>
+                <InfoBox v-html="$t('shared_form.email_successfully_send_message')"/>
            </div>

            <div v-if="! sendToRecipientsMenu || (sendToRecipientsMenu && isEmailSended)" class="input-wrapper copy-input">
-                    <label class="input-label">{{ $t('shared_form.label_shared_url') }}:</label>
+                    <label class="input-label">{{ $t('shared_form.label_share_vie_email') }}:</label>
                    <CopyInput size="small" :value="pickedItem.shared.link" :share-via-email="sendToRecipientsMenu ? false : true" />
            </div>

--- a/resources/js/i18n/lang/cn.json
+++ b/resources/js/i18n/lang/cn.json
@@ -698,7 +698,7 @@
 		"expiration_hour": "{value}h.",
 		"expiration_day": "{value}d.",
 		"placeholder_permission": "请设置权限",
-		"email_successfully_send_message": "Your item was successfully sended to recipients emails.",
+		"email_successfully_send_message": "Your item was &nbsp; <span id='colored-text'>successfully sended</span> &nbsp; to recipients emails.",
 		"share_by_link": "Share by Link",
 		"share_by_email": "Share by Email",
 		"recipients_label": "Recipients",
--- a/resources/js/i18n/lang/en.json
+++ b/resources/js/i18n/lang/en.json
@@ -607,7 +607,7 @@
 		"change_pass": "Change Password",
 		"confirm": "Confirm",
 		"save": "Save Changes",
-		"stop": "Stop Sharing",
+		"stop": "Cancel Sharing",
 		"title": "Update sharing options",
 		"go_back": "Go Back",
 		"send_to_recipients": "Send to Recipients"
@@ -709,7 +709,7 @@
 		"expiration_hour": "{value}h.",
 		"expiration_day": "{value}d.",
 		"placeholder_permission": "Select your permission",
-		"email_successfully_send_message": "Your item was successfully sended to recipients emails.",
+		"email_successfully_send_message": "Your item was &nbsp; <span id='colored-text'>successfully sended</span> &nbsp; to recipients emails.",
 		"share_by_link": "Share by Link",
 		"share_by_email": "Share by Email",
 		"recipients_label": "Recipients",
--- a/resources/js/i18n/lang/sk.json
+++ b/resources/js/i18n/lang/sk.json
@@ -700,7 +700,7 @@
 		"expiration_hour": "{value}h.",
 		"expiration_day": "{value}d.",
 		"placeholder_permission": "Zvoľte oprávnenia",
-		"email_successfully_send_message": "Vaša položka bola úspešne odoslaná na e-maily príjemcov.",
+		"email_successfully_send_message": "Vaša položka bola &nbsp; <span id='colored-text'>úspešne odoslaná</span> &nbsp; na e-maily príjemcov.",
 		"share_by_link": "Zdieľať odkazom",
 		"share_by_email": "Zdieľať e-mailom",
 		"recipients_label": "Príjemcovia",
--- a/resources/sass/app.scss
+++ b/resources/sass/app.scss
@@ -441,6 +441,11 @@
  }

 }
+#colored-text {
+  color: $theme;
+  @include font-size(16);
+  font-weight: 700;
+}

 .windows {