Merge pull request #3642 from dragos-efy/efy

Fix: Share Button
This commit is contained in:
Bnyro 2024-05-25 15:17:54 +02:00 committed by GitHub
commit e70a0908ce
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 30 additions and 37 deletions

View file

@ -12,7 +12,7 @@
}, },
"dependencies": { "dependencies": {
"dompurify": "3.1.3", "dompurify": "3.1.3",
"efy": "24.5.19", "efy": "24.5.23",
"fast-xml-parser": "4.3.6", "fast-xml-parser": "4.3.6",
"hotkeys-js": "3.13.7", "hotkeys-js": "3.13.7",
"javascript-time-ago": "2.5.10", "javascript-time-ago": "2.5.10",
@ -38,7 +38,7 @@
"@vitejs/plugin-legacy": "5.4.0", "@vitejs/plugin-legacy": "5.4.0",
"@vitejs/plugin-vue": "5.0.4", "@vitejs/plugin-vue": "5.0.4",
"@vue/compiler-sfc": "3.4.25", "@vue/compiler-sfc": "3.4.25",
"efy": "24.5.19", "efy": "24.5.23",
"eslint": "8.57.0", "eslint": "8.57.0",
"eslint-config-prettier": "9.1.0", "eslint-config-prettier": "9.1.0",
"eslint-plugin-prettier": "5.1.3", "eslint-plugin-prettier": "5.1.3",

View file

@ -9,8 +9,8 @@ dependencies:
specifier: 3.1.3 specifier: 3.1.3
version: 3.1.3 version: 3.1.3
efy: efy:
specifier: 24.5.19 specifier: 24.5.23
version: 24.5.19 version: 24.5.23
fast-xml-parser: fast-xml-parser:
specifier: 4.3.6 specifier: 4.3.6
version: 4.3.6 version: 4.3.6
@ -2944,8 +2944,8 @@ packages:
resolution: {integrity: sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==} resolution: {integrity: sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==}
dev: true dev: true
/efy@24.5.19: /efy@24.5.23:
resolution: {integrity: sha512-/xwwn5fVKjnSTIpKyldCMYvC+RG1V0Bqo0h08Bi8K3HY+rfJlR1nNcIYfB75KMU2FcXf+KvdAdL3ukjTTKRUdw==} resolution: {integrity: sha512-qw7itJDE8NvUOej8xxOcVvZF6gasoQsgB/IJ3BUhd8YEgJ2SSdRa1DOJdrdfhtdSg9pbEgwuL3j/P1DHOc/Qdw==}
dev: false dev: false
/ejs@3.1.10: /ejs@3.1.10:

View file

@ -23,7 +23,7 @@
<h6 class="mb-2 mt-2" v-text="generatedLink" /> <h6 class="mb-2 mt-2" v-text="generatedLink" />
</a> </a>
<QrCode v-if="showQrCode" :text="generatedLink" class="mb-[10rem]" /> <QrCode v-if="showQrCode" :text="generatedLink" class="mb-[10rem]" />
<div class="flex flex-wrap justify-end" style="gap: var(--efy_gap0)"> <div class="flex flex-wrap" style="gap: var(--efy_gap0)">
<button v-t="'actions.generate_qrcode'" class="btn" @click="showQrCode = !showQrCode" /> <button v-t="'actions.generate_qrcode'" class="btn" @click="showQrCode = !showQrCode" />
<button v-t="'actions.follow_link'" class="btn ml-3" @click="followLink()" /> <button v-t="'actions.follow_link'" class="btn ml-3" @click="followLink()" />
<button v-t="'actions.copy_link'" class="btn ml-3" @click="copyLink()" /> <button v-t="'actions.copy_link'" class="btn ml-3" @click="copyLink()" />

View file

@ -484,7 +484,7 @@ export default {
seekBarColors: { seekBarColors: {
base: "rgba(255, 255, 255, 0.3)", base: "rgba(255, 255, 255, 0.3)",
buffered: "rgba(255, 255, 255, 0.54)", buffered: "rgba(255, 255, 255, 0.54)",
played: "var(--efy_piped_color1)", played: "var(--efy_piped_color)",
}, },
}; };

View file

@ -712,31 +712,21 @@ video::-webkit-media-text-track-display {
video::cue { video::cue {
background: transparent; background: transparent;
} }
.player-container.pp-trans video::-webkit-media-text-track-display { .player-container {
background: transparent !important; &.pp-trans video::-webkit-media-text-track-display {
backdrop-filter: none; background: transparent !important;
margin-bottom: unset; backdrop-filter: none;
line-height: 1.2; margin-bottom: unset;
text-shadow: 0 0 5rem #000; line-height: 1.2;
text-shadow: 0 0 5rem #000;
}
&.pp-solid video::-webkit-media-text-track-display {
background: var(--efy_bg) !important;
color: var(--efy_text);
backdrop-filter: none;
}
} }
.player-container.pp-solid video::-webkit-media-text-track-display {
background: var(--efy_bg) !important;
color: var(--efy_text);
backdrop-filter: none;
}
@media (width <= 768px) {
.share-btn {
aspect-ratio: 1;
}
.share-btn strong {
display: none;
}
.share-btn svg {
margin: 0;
}
}
@media (max-width: 639px) { @media (max-width: 639px) {
video::-webkit-media-text-track-display { video::-webkit-media-text-track-display {
font-size: 16rem !important; font-size: 16rem !important;

View file

@ -48,11 +48,14 @@ $ready('#efy_sidebar', ()=>{
} }
// Get EFY Color Gradient in Piped // Get EFY Color Gradient in Piped
let efy_colors = efy.colors; const efy_piped_color =()=>{ let efy_colors = [];
efy_colors.forEach((a,i)=>{ efy.colors.forEach((a,i)=>{
let b = a.split(' '); b.shift(); b[3] = '/ ' + b[3]; a = a.split(' ').slice(1); a[3] = `/ ${a[3]}`;
efy_colors[i] = `oklch(${b.join(' ')})`; efy_colors[i] = `oklch(${a.join(' ')})`;
}); });
$css_prop('--efy_piped_color1', String(efy_colors)); $css_prop('--efy_piped_color', String(efy_colors));
}; efy_piped_color();
$event($('#efy_gradient'), 'change', efy_piped_color);
}, 1); }, 1);