Merge branch 'vgaNAR6ta' of https://git.labolyon.fr/vgaNAR6ta/drags-and-nerds into vgaNAR6ta

2026-04-21 01:59:10 +02:00
parent 5507942029 13df9c0601
commit 1ec359f546
13 changed files with 705 additions and 2 deletions
@@ -21,8 +21,12 @@
        </button>
      </div>
      <div class="windowContent" id="visualizerContent">
+<<<<<<< HEAD
        <video controls id="displayedImgStyle" :src="selectedVideo.src" :type="selectedVideo.format">
        </video>
+=======
+        <video controls id="displayedImgStyle" :src="selectedVideo.src"></video>
+>>>>>>> 13df9c06016b4c751d7817b8f3b1108bf669a990
        <div class="reactBar">
          <p class="reactStatStyle">{{selectedVideo.like}}</p>
          <button data-tooltip="j'aime bien" type="button" class="iconBtnStyle" :class="{reactedStyle: selectedVideo.isLiked}" @mousedown.capture="likeImg" @touchstart.capture="likeImg">