Merge branch 'development' into custom-builds/current

* development: Translated using Weblate (Estonian) Bump mini-css-extract-plugin from 2.8.0 to 2.8.1 (FreeTubeApp#4742) Bump electron from 28.2.3 to 29.1.0 (FreeTubeApp#4743) Bump lefthook from 1.6.1 to 1.6.4 (FreeTubeApp#4740) Bump the babel group with 2 updates (FreeTubeApp#4739) Bump swiper from 11.0.6 to 11.0.7 (FreeTubeApp#4741) Bump electron-builder from 24.12.0 to 24.13.3 (FreeTubeApp#4744) Split view count and published date into two lines on small displays (FreeTubeApp#4736)
PikachuEXE · Mar 6, 2024 · 77bbb77 · 77bbb77
2 parents 16c2e9a + e1b5ff8
commit 77bbb77
Show file tree

Hide file tree

Showing 5 changed files with 223 additions and 199 deletions.
diff --git a/package.json b/package.json
@@ -65,7 +65,7 @@
     "marked": "^12.0.0",
     "path-browserify": "^1.0.1",
     "process": "^0.11.10",
-    "swiper": "^11.0.6",
+    "swiper": "^11.0.7",
     "video.js": "7.21.5",
     "videojs-contrib-quality-levels": "^3.0.0",
     "videojs-http-source-selector": "^1.1.6",
@@ -80,17 +80,17 @@
     "youtubei.js": "^9.1.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.23.9",
+    "@babel/core": "^7.24.0",
     "@babel/eslint-parser": "^7.23.10",
     "@babel/plugin-proposal-class-properties": "^7.18.6",
-    "@babel/preset-env": "^7.23.9",
+    "@babel/preset-env": "^7.24.0",
     "@double-great/stylelint-a11y": "^3.0.2",
     "babel-loader": "^9.1.3",
     "copy-webpack-plugin": "^12.0.2",
     "css-loader": "^6.10.0",
     "css-minimizer-webpack-plugin": "^6.0.0",
-    "electron": "^28.2.3",
-    "electron-builder": "^24.12.0",
+    "electron": "^29.1.0",
+    "electron-builder": "^24.13.3",
     "eslint": "^8.57.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-config-standard": "^17.1.0",
@@ -106,8 +106,8 @@
     "html-webpack-plugin": "^5.6.0",
     "js-yaml": "^4.1.0",
     "json-minimizer-webpack-plugin": "^5.0.0",
-    "lefthook": "^1.6.1",
-    "mini-css-extract-plugin": "^2.8.0",
+    "lefthook": "^1.6.4",
+    "mini-css-extract-plugin": "^2.8.1",
     "npm-run-all": "^4.1.5",
     "postcss": "^8.4.35",
     "postcss-scss": "^4.0.9",

diff --git a/src/renderer/components/watch-video-info/watch-video-info.scss b/src/renderer/components/watch-video-info/watch-video-info.scss
@@ -85,29 +85,43 @@
   color: var(--tertiary-text-color);
 
   .likeSection {
-  color: var(--tertiary-text-color);
-  display: flex;
-  flex-direction: column;
-  margin-inline-start: auto;
-  margin-block-start: 4px;
-  max-inline-size: 210px;
-  text-align: end;
+    color: var(--tertiary-text-color);
+    display: flex;
+    flex-direction: column;
+    margin-inline-start: auto;
+    margin-block-start: 4px;
+    max-inline-size: 210px;
+    text-align: end;
 
-  @media screen and (max-width: 680px) {
-    margin-inline-start: 0;
-    text-align: start;
-  }
+    @media screen and (max-width: 680px) {
+      margin-inline-start: 0;
+      text-align: start;
+    }
 
-  .likeBar {
-    border-radius: 4px;
-    block-size: 8px;
-    margin-block-end: 4px;
+    .likeBar {
+      border-radius: 4px;
+      block-size: 8px;
+      margin-block-end: 4px;
+    }
+
+    .likeCount {
+      margin-inline-end: 0;
+      display: flex;
+      gap: 3px;
+    }
   }
+  .datePublishedAndViewCount {
+    @media only screen and (max-width: 460px) {
+      display: flex;
+      justify-content: left;
+      flex-direction: column;
 
-  .likeCount {
-    margin-inline-end: 0;
-    display: flex;
-    gap: 3px;
+      .seperator {
+        display: none;
+      }
+    }
+  }
+  .videoViews {
+    white-space: nowrap;
   }
-}
 }
diff --git a/src/renderer/components/watch-video-info/watch-video-info.vue b/src/renderer/components/watch-video-info/watch-video-info.vue
@@ -10,8 +10,10 @@
     <div class="videoMetrics">
       <div class="datePublishedAndViewCount">
         {{ publishedString }} {{ dateString }}
-        <template v-if="!hideVideoViews">
-          • {{ parsedViewCount }}
+        <template
+          v-if="!hideVideoViews"
+        >
+          <span class="seperator">• </span><span class="videoViews">{{ parsedViewCount }}</span>
         </template>
       </div>
       <div

diff --git a/static/locales/et.yaml b/static/locales/et.yaml
@@ -161,6 +161,7 @@ User Playlists:
     Select a playlist to add your N videos to: Vali esitusloend, kuhu soovid oma video
       lisada | Vali esitusloend, kuhu soovid oma {videoCount} videot lisada
     N playlists selected: '{playlistCount} valitud'
+    Added {count} Times: Lisatud {count} kord | Lisatud {count} korda
   SinglePlaylistView:
     Toast:
       There were no videos to remove.: Ei leidnud ühtegi videot, mida saaks eemaldada.