@gcorevideo/player 2.20.22 → 2.21.3

package/assets/audio-selector/style.scss

@@ -1,21 +1,22 @@
-*, :focus, :visited {
-    outline: none!important;
+*,
+:focus,
+:visited {
+  outline: none !important;
 }
 
-.audio_selector[data-track-selector] {
-  float: right;
-  margin-top: 4px;
+.media-control-audio-tracks {
   position: relative;
-  width: 50px;
-  font-family: Roboto, "Open Sans", Arial, sans-serif;
 
   button {
     background-color: transparent;
     color: #fff;
     -webkit-font-smoothing: antialiased;
     border: none;
-    font-size: 14px;
     cursor: pointer;
+    display: flex;
+    align-items: center;
+
+    padding: 0;
 
     .audio-text {
       text-overflow: ellipsis;
@@ -25,13 +26,11 @@
       background-color: transparent;
       -webkit-font-smoothing: antialiased;
       border: none;
-      font-size: 14px;
       cursor: pointer;
-      padding-top: 5px;
     }
 
     &:hover {
-      color: #c9c9c9;
+      color: white;
     }
 
     &.changing {
@@ -41,23 +40,28 @@
     span.audio-arrow {
       width: 9px;
       height: 6px;
-      margin-top: 11px;
       margin-left: 5px;
     }
   }
 
-  &> ul {
+  &>ul {
     max-width: 114px;
     list-style-type: none;
     position: absolute;
-    bottom: 25px;
-    border: 1px solid black;
     display: none;
-    background-color: #e6e6e6;
+    background-color: rgb(74 74 74 / 60%);
+    border: none;
+    min-width: 60px;
+    border-radius: 4px;
+    bottom: 40px;
+    right: -2px;
   }
 
   li {
-    font-size: 10px;
+    font-size: var(--font-size-media-controls-dropdown);
+
+    text-align: right;
+    height: 30px;
 
     &[data-title] {
       background-color: #c3c2c2;
@@ -65,92 +69,54 @@
     }
 
     a {
-      color: #444;
-      padding: 2px 10px;
       display: block;
       text-decoration: none;
       text-overflow: ellipsis;
       overflow: hidden;
       white-space: nowrap;
 
+      height: 30px;
+      padding: 5px 10px;
+      color: #fffffe;
+
       &:hover {
-        background-color: #555;
+        text-decoration: none;
+        background-color: rgb(0 0 0 / 40%);
         color: white;
-
-        a {
-          color: white;
-          text-decoration: none;
-        }
       }
+
     }
 
     &.current a {
       color: #f00;
     }
 
-  }
-}
-
-.audio_selector[data-track-selector] {
-  width: auto;
-  margin-top: 7px;
-  margin-right: 20px;
-
-  button[data-level-selector-button],
-  button[data-track-selector-button] {
-    display: flex;
-    justify-content: center;
-    padding: 0;
-
-    &:hover {
-      color: white;
-    }
-  }
-
-  ul {
-    background-color: rgb(74 74 74 / 60%);
-    border: none;
-    min-width: 60px;
-    transform: rotate(180deg);
-    border-radius: 4px;
-    bottom: 40px;
-    right: -2px;
-
-    li {
-      transform: rotate(-180deg);
-      font-size: 16px;
-      text-align: right;
-      height: 30px;
-
+    &:first-child {
       a {
-        height: 30px;
-        padding: 5px 10px;
-        color: #fffffe;
-
-        &:hover {
-          background-color: rgb(0 0 0 / 40%);
-        }
-      }
-
-      &:first-child {
-        a {
-          border-bottom-left-radius: 4px;
-          border-bottom-right-radius: 4px;
-        }
+        border-bottom-left-radius: 4px;
+        border-bottom-right-radius: 4px;
       }
+    }
 
-      &:last-child {
-        a {
-          border-top-left-radius: 4px;
-          border-top-right-radius: 4px;
-        }
+    &:last-child {
+      a {
+        border-top-left-radius: 4px;
+        border-top-right-radius: 4px;
       }
     }
   }
 }
 
 @keyframes pulse {
-  0% {color: #fff;}
-  50% {color: #ff0101}
-  100% {color: #B80000;}
-}
+  0% {
+    color: #fff;
+  }
+
+  50% {
+    color: #ff0101
+  }
+
+  100% {
+    color: #B80000;
+  }
+}

package/assets/audio-selector/track-selector.ejs

@@ -2,10 +2,10 @@
     <span class='audio-text'><%= title %></span> <span class="audio-arrow"></span>
 </button>
 <ul class='gcore-skin-bg-color'>
-    <% for (var i = 0; i < tracks.length; i++) { %>
+    <% for (const track of tracks) { %>
         <li>
-            <a href="#" class='gcore-skin-text-color' data-track-selector-select="<%= tracks[i].id %>">
-                <%= tracks[i].label || tracks[i].name %>
+            <a href="#" class='gcore-skin-text-color' data-track-selector-select="<%= track.id %>">
+                <%= track.label %>
             </a>
         </li>
     <% }; %>

package/assets/bottom-gear/bottomgear.ejs

@@ -1,12 +1,10 @@
-<div class="media-control-gear" data-<%= name %>>
-    <button type="button" class="button-gear gplayer-lite-btn gcore-skin-button-color" data-gear-button="-1">
-        <span class="gear-icon"><%= icon %></span>
-    </button>
-    <div class="gear-wrapper gcore-skin-bg-color">
-        <ul class="gear-options-list">
-            <% items.forEach(function (gear) { %>
-                <li data-<%= gear %>></li>
-            <% }); %>
-        </ul>
-    </div>
-</div>
+<button type="button" class="button-gear media-control-button gplayer-lite-btn gcore-skin-button-color gear-icon" data-gear-button="-1">
+    <%= icon %>
+</button>
+<div class="gear-wrapper gcore-skin-bg-color">
+    <ul class="gear-options-list">
+        <% for (const item of items) { %>
+            <li data-<%= item %>></li>
+        <% } %>
+    </ul>
+</div>

package/assets/bottom-gear/gear-sub-menu.scss

@@ -77,19 +77,4 @@
       }
     }
   }
-
-  svg {
-    height: 20px;
-  }
 }
-
-
-// &.changing {
-//  animation: pulse 0.5s infinite alternate;
-// }
-
-// @keyframes pulse {
-//  0% {color: #fff;}
-//  50% {color: #ff0101}
-//  100% {color: #B80000;}
-// }

package/assets/bottom-gear/gear.scss

@@ -1,17 +1,7 @@
 .media-control-skin-1[data-media-control-skin-1] {
   .media-control-gear {
-    float: right;
-    font-family: Roboto, "Open Sans", Arial, sans-serif;
-
-    .button-gear {
-      height: 40px;
-      width: 40px;
-      padding-right: 20px;
-
-      svg {
-        height: 20px;
-      }
-    }
+    order: 99;
+    height: 20px;
 
     .gear-wrapper {
       position: absolute;
@@ -19,10 +9,6 @@
       bottom: 52px;
       display: none;
 
-      // background: var(--primary-background-color);
-      // background-color: rgb(200 0 0 / 50%);
-
-      //background-color: rgb(0 0 0 / 70%);
       width: 250px;
       min-height: 48px;
       z-index: 9999;
@@ -37,7 +23,6 @@
         }
 
         .gear-option {
-          //color: var(--primary-text-color);
           margin: 0;
           text-align: left;
           line-height: 22px;
@@ -45,16 +30,6 @@
           width: 250px;
           font-size: 12px;
 
-          // &:hover {
-          //  color: var(--hover-text-color);
-
-          //  svg {
-          //    path {
-          //      fill: var(--hover-text-color);
-          //    }
-          //  }
-          // }
-
           .gear-option_arrow-right-icon {
             float: right;
             margin-right: -14px;
@@ -67,13 +42,9 @@
 
           svg {
             height: 20px;
-
-          //  path {
-          //    fill: var(--primary-text-color);
-          //  }
           }
         }
       }
     }
   }
-}
+}

package/assets/media-control/media-control.ejs

@@ -36,24 +36,12 @@
     <% var renderIndicator = function(name) { %>
         <div class="media-control-indicator gcore-skin-text-color" data-<%= name %>></div>
     <% }; %>
-    <% var renderBottomGear = function(name) { %>
-        <div class="media-control-bottomgear" data-<%= name %>></div>
-    <% }; %>
-    <% var renderPIP = function(name) { %>
-        <div class="media-control-pip" data-<%= name %>></div>
-    <% }; %>
     <% var renderQuality = function(name) { %>
         <div class="media-control-quality" data-<%= name %>></div>
     <% }; %>
     <% var renderNerd = function(name) { %>
         <div class="media-control-nerd" data-<%= name %>></div>
     <% }; %>
-    <% var renderAudioTracks = function(name) { %>
-        <div class="media-control-audio-tracks" data-<%= name %>></div>
-    <% }; %>
-    <% var renderSubtitles = function(name) { %>
-        <div class="media-control-subtitles" data-<%= name %>></div>
-    <% }; %>
     <% var renderMultiCamera = function(name) { %>
         <div class="media-control-multicamera" data-<%= name %>></div>
     <% }; %>
@@ -92,39 +80,31 @@
                 renderIndicator(setting);
             } else if (setting === "quality") {
                 renderQuality(setting)
-            } else if (setting === "bottomgear") {
-                renderBottomGear(setting)
-            } else if (setting === "pip") {
-                renderPIP(setting)
             } else if (setting === "nerd") {
                 renderNerd(setting)
             } else if (setting === "multicamera") {
                 renderMultiCamera(setting)
-            } else if (setting === "subtitles") {
-                renderSubtitles(setting)
             } else if (setting === "playbackrate") {
                 renderPlaybackRate(setting)
             } else if (setting === "vr") {
                 renderVR(setting)
             } else if (setting === "clipsText") {
                 renderClipsText(setting)
-            } else if (setting === "audiotracks") {
-                renderAudioTracks(setting)
             } else {
                 renderButton(setting);
             }
         });
     }; %>
-    <% if (settings.default && settings.default.length) { %>
-        <div class="media-control-center-panel" data-media-control>
-            <% render(settings.default); %>
-        </div>
-    <% } %>
     <% if (settings.left && settings.left.length) { %>
         <div class="media-control-left-panel" data-media-control>
             <% render(settings.left); %>
         </div>
     <% } %>
+    <% if (settings.default && settings.default.length) { %>
+        <div class="media-control-center-panel" data-media-control>
+            <% render(settings.default); %>
+        </div>
+    <% } %>
     <% if (settings.right && settings.right.length) { %>
         <div class="media-control-right-panel" data-media-control>
             <% render(settings.right); %>

package/assets/media-control/media-control.scss

@@ -2,7 +2,11 @@
 @use "container";
 @use "width270";
 @use "width370";
-// @import "https://fonts.googleapis.com/css?family=Roboto";
+
+:root {
+  --font-size-media-controls: 14px;
+  --font-size-media-controls-dropdown: 16px;
+}
 
 .media-control-skin-1[data-media-control-skin-1] {
   position: absolute;
@@ -11,6 +15,7 @@
   z-index: 9999;
   pointer-events: none;
   font-family: Roboto, "Open Sans", Arial, sans-serif;
+  font-size: var(--font-size-media-controls);
 
   &.dragging {
     pointer-events: auto;
@@ -55,30 +60,32 @@
     position: absolute;
     bottom: 0;
     width: 100%;
+    padding: 0 12px 0 8px;
     height: var(--bottom-panel);
-    font-size: 0;
     vertical-align: middle;
     pointer-events: auto;
     transition: bottom 0.4s ease-out;
-
-    .media-control-left-panel[data-media-control-skin-1] {
-      position: absolute;
-      top: 0;
-      left: 4px;
-      height: 100%;
+    display: flex;
+    justify-content: space-between;
+
+    .media-control-left-panel {
+      display: flex;
+      align-items: center;
+      gap: 0.5rem;
+      justify-content: flex-start;
     }
 
-    .media-control-center-panel[data-media-control-skin-1] {
+    .media-control-center-panel {
       height: 100%;
       text-align: center;
       line-height: var(--bottom-panel);
     }
 
-    .media-control-right-panel[data-media-control-skin-1] {
-      position: absolute;
-      top: 0;
-      right: 4px;
-      height: 100%;
+    .media-control-right-panel {
+      display: flex;
+      align-items: center;
+      gap: 1rem;
+      justify-content: flex-end;
     }
 
     button.media-control-button {
@@ -87,8 +94,8 @@
       padding: 0;
       cursor: pointer;
       display: inline-block;
-      height: 40px;
-      width: 20px;
+      height: 20px;
+      width: 24px;
 
       svg {
         height: 20px;
@@ -119,9 +126,9 @@
 
       &[data-fullscreen] {
         float: right;
+        order: 100;
         background-color: transparent;
         border: 0;
-        margin-right: 12px;
         height: 40px;
       }
 
@@ -133,20 +140,13 @@
         float: right;
         height: 100%;
       }
-
-      &[data-playpause], &[data-playstop] {
-        float: left;
-        margin-left: 8px;
-        margin-right: 14px;
-      }
     }
 
     .media-control-indicator {
+
       &[data-position],
       &[data-duration] {
-        display: inline-block;
-        float: left;
-        font-size: 14px;
+        display: flex;
         color: white;
         cursor: default;
         line-height: var(--bottom-panel);
@@ -154,7 +154,7 @@
       }
 
       &[data-position] {
-        margin: 1px 6px 0 7px;
+        margin: 1px 0 0 7px;
       }
 
       &[data-duration] {
@@ -180,7 +180,6 @@
         overflow: hidden;
         display: inline-block;
         float: left;
-        font-size: 14px;
         color: white;
         cursor: default;
         line-height: var(--bottom-panel);
@@ -240,7 +239,7 @@
       }
     }
 
-    .bar-container[data-seekbar].seek-disabled + .bar-scrubber[data-seekbar] {
+    .bar-container[data-seekbar].seek-disabled+.bar-scrubber[data-seekbar] {
       cursor: default;
       display: none;
     }
@@ -267,15 +266,13 @@
     }
 
     .drawer-container[data-volume] {
-      float: left;
-      display: inline-block;
+      display: flex;
+      justify-content: flex-start;
       height: var(--bottom-panel);
       cursor: pointer;
       box-sizing: border-box;
-      margin-right: 20px;
 
       .drawer-icon-container[data-volume] {
-        float: left;
         bottom: 0;
 
         .drawer-icon[data-volume] {
@@ -303,7 +300,6 @@
       }
 
       .bar-container[data-volume] {
-        float: left;
         position: relative;
         margin-left: 10px;
         top: 8px;
@@ -388,3 +384,87 @@
     }
   }
 }
+
+/* TODO distribute between plugins' styles */
+.media-control-skin-1[data-media-control-skin-1] {
+  .media-control-subtitles {
+
+    button[data-subtitles-button] {
+      display: flex;
+      justify-content: center;
+      padding: 0;
+      align-items: center;
+
+      &:hover {
+        color: white;
+      }
+    }
+
+    ul { // TODO extract common styles
+      background-color: rgb(74 74 74 / 60%);
+      border: none;
+      width: auto;
+      border-radius: 4px;
+      bottom: 52px;
+      margin-left: -28px;
+
+      li {
+        font-size: 16px;
+        text-align: center;
+        white-space: nowrap;
+        height: 30px;
+
+        a {
+          height: 30px;
+          padding: 5px 10px;
+          color: #fffffe;
+
+          &:hover {
+            background-color: rgb(0 0 0 / 40%);
+          }
+        }
+
+        &.current a {
+          background-color: rgb(0 0 0 / 40%);
+        }
+
+        &:first-child {
+          a {
+            border-bottom-left-radius: 4px;
+            border-bottom-right-radius: 4px;
+          }
+        }
+
+        &:last-child {
+          a {
+            border-top-left-radius: 4px;
+            border-top-right-radius: 4px;
+          }
+        }
+      }
+    }
+  }
+
+  .seek-time[data-seek-time] {
+    height: 26px;
+    line-height: 26px;
+    bottom: 52px;
+    border-radius: 3px;
+    background-color: rgb(74 74 74 / 70%);
+
+    span {
+      letter-spacing: 0.8px;
+      font-size: 14px;
+      font-family: Roboto, "Open Sans", Arial, sans-serif;
+    }
+
+    span[data-seek-time] {
+      padding-left: 8px;
+      padding-right: 8px;
+    }
+
+    span[data-duration] {
+      display: none !important;
+    }
+  }
+}