DIYgod 9 anni fa
parent
commit
f02f18ca4d
5 ha cambiato i file con 35 aggiunte e 25 eliminazioni
  1. 0 0
      dist/DPlayer.min.css
  2. 0 0
      dist/DPlayer.min.js
  3. 0 0
      dist/DPlayer.min.js.map
  4. 15 13
      src/DPlayer.js
  5. 20 12
      src/DPlayer.scss

File diff suppressed because it is too large
+ 0 - 0
dist/DPlayer.min.css


File diff suppressed because it is too large
+ 0 - 0
dist/DPlayer.min.js


File diff suppressed because it is too large
+ 0 - 0
dist/DPlayer.min.js.map


+ 15 - 13
src/DPlayer.js

@@ -168,7 +168,9 @@
                 +               this.getSVG('comment')
                 + `         </button>
                             <div class="dplayer-comment-box">
-                                <div class="dplayer-comment-setting"></div>
+                                <button class="dplayer-icon dplayer-comment-setting-icon">`
+                +                   this.getSVG('setting')
+                + `             </button>
                                 <div class="dplayer-comment-setting-box">
                                     <div class="dplayer-comment-setting-type">
                                         <label>
@@ -194,24 +196,24 @@
                                             <span style="background: #e54256"></span>
                                         </label>
                                         <label>
-                                            <input type="radio" name="dplayer-danmaku-color" value="#ffe133">
-                                            <span style="background: #ffe133"></span>
+                                            <input type="radio" name="dplayer-danmaku-color" value="#FFAB00">
+                                            <span style="background: #FFAB00"></span>
                                         </label>
                                         <label>
-                                            <input type="radio" name="dplayer-danmaku-color" value="#39ccff">
-                                            <span style="background: #39ccff"></span>
+                                            <input type="radio" name="dplayer-danmaku-color" value="#ffe133">
+                                            <span style="background: #ffe133"></span>
                                         </label>
                                         <label>
-                                            <input type="radio" name="dplayer-danmaku-color" value="#f424ff">
-                                            <span style="background: #f424ff"></span>
+                                            <input type="radio" name="dplayer-danmaku-color" value="#64DD17">
+                                            <span style="background: #64DD17"></span>
                                         </label>
                                         <label>
-                                            <input type="radio" name="dplayer-danmaku-color" value="#ff9d33">
-                                            <span style="background: #ff9d33"></span>
+                                            <input type="radio" name="dplayer-danmaku-color" value="#39ccff">
+                                            <span style="background: #39ccff"></span>
                                         </label>
                                         <label>
-                                            <input type="radio" name="dplayer-danmaku-color" value="#bde846">
-                                            <span style="background: #bde846"></span>
+                                            <input type="radio" name="dplayer-danmaku-color" value="#D500F9">
+                                            <span style="background: #D500F9"></span>
                                         </label>
                                         <label>
                                             <input type="radio" name="dplayer-danmaku-color" value="#444">
@@ -880,7 +882,7 @@
             const commentInput = this.element.getElementsByClassName('dplayer-comment-input')[0];
             const commentIcon = this.element.getElementsByClassName('dplayer-comment-icon')[0];
             const commentBox = this.element.getElementsByClassName('dplayer-comment-box')[0];
-            const commentSettingIcon = this.element.getElementsByClassName('dplayer-comment-setting')[0];
+            const commentSettingIcon = this.element.getElementsByClassName('dplayer-comment-setting-icon')[0];
             const commentSettingBox = this.element.getElementsByClassName('dplayer-comment-setting-box')[0];
             const commentSendIcon = this.element.getElementsByClassName('dplayer-send-icon')[0];
 
@@ -971,7 +973,7 @@
             this.element.getElementsByClassName('dplayer-comment-setting-color')[0].addEventListener('click', () => {
                 const sele = this.element.querySelector('input[name="dplayer-danmaku-color"]:checked+span');
                 if (sele) {
-                    commentSettingIcon.setAttribute('style', sele.getAttribute('style'));
+                    commentSettingIcon.getElementsByClassName('dplayer-fill')[0].style.fill = this.element.querySelector('input[name="dplayer-danmaku-color"]:checked').value;
                 }
             });
 

+ 20 - 12
src/DPlayer.scss

@@ -583,20 +583,28 @@
                         transform: translateX(0);
                     }
 
-                    .dplayer-comment-setting {
-                        height: 20px;
-                        width: 20px;
+                    .dplayer-comment-setting-icon {
+                        height: 24px;
+                        width: 24px;
                         position: absolute;
-                        top: 7px;
+                        top: 5px;
                         left: 7px;
-                        border-radius: 50%;
-                        background: #ddd;
-                        cursor: pointer;
-                        transition: all .2s ease-in-out;
-                        box-sizing: border-box;
+                        padding: 0;
+                        opacity: 1;
 
                         &:hover {
-                            background: #aaa;
+                            .dplayer-fill {
+                                fill: #aaa;
+                            }
+                        }
+
+                        .dplayer-fill {
+                            transition: all .2s ease-in-out;
+                            fill: #ddd;
+                        }
+
+                        .dplayer-svg-shadow {
+                            stroke: none;
                         }
                     }
 
@@ -604,7 +612,7 @@
                         position: absolute;
                         background: #fff;
                         bottom: 40px;
-                        left: -60px;
+                        left: -82.5px;
                         box-shadow: 0 0 25px rgba(0,0,0,.3);
                         border-radius: 4px;
                         padding: 5px;
@@ -671,7 +679,7 @@
                                 width: 24px;
                                 height: 24px;
                                 display: inline-block;
-                                border-radius: 50%;
+                                border-radius: 7px;
                                 box-sizing: border-box;
                                 cursor: pointer;
 

Some files were not shown because too many files changed in this diff