Browse Source

Merge branch 'iteration-20240408-autoplay' into jenkins

lex 1 year ago
parent
commit
e860271ed8

+ 5 - 3
src/components/card-preview/video-modal/index.module.less

@@ -27,7 +27,8 @@
       font-size: max(24px, 14Px);
       font-weight: 600;
       line-height: 33px;
-      min-width: 150px;
+      // min-width: 150px;
+      flex-shrink: 0;
 
       .line {
         font-size: 20px;
@@ -53,6 +54,7 @@
     color: #fff;
     font-size: 12px;
     align-items: center;
+    flex-shrink: 0;
 
     .actionWrap {
       display: flex;
@@ -88,8 +90,8 @@
 
 
     .iconReplay {
-      width: 35px;
-      height: 35px;
+      width: 32px;
+      height: 32px;
       background-color: transparent;
       cursor: pointer;
       margin: 0 22px;

BIN
src/views/attend-class/image/icon-speed.png


+ 16 - 2
src/views/prepare-lessons/components/directory-main/index.module.less

@@ -58,6 +58,13 @@
     background-position: center center;
     margin-right: 18px;
     flex-shrink: 0;
+    transition: transform .2s ease;
+    cursor: pointer;
+
+    &:hover {
+      transform: scale(1.02);
+      transition: transform .2s ease;
+    }
 
     &::before {
       content: '';
@@ -176,9 +183,15 @@
   cursor: pointer;
   border-radius: 10px;
   font-size: max(17px, 12Px);
+  margin-bottom: 8px;
 
-  &:hover {
-    background: #E8F4FF;
+  &.childItem:hover {
+
+    // background: #E8F4FF;
+
+    .title {
+      color: var(--n-color);
+    }
   }
 
   .title {
@@ -233,6 +246,7 @@
     padding-left: 30px;
     font-size: max(15px, 12Px);
 
+
     .title {
       color: #131415;
     }

+ 5 - 4
src/views/prepare-lessons/components/lesson-main/courseware-head/index.module.less

@@ -1,6 +1,6 @@
 .headerTitle {
-  // display: flex;
-  // align-items: center;
+  display: flex;
+  align-items: center;
   font-weight: 600;
   font-size: max(18px, 14Px);
   color: #000000;
@@ -10,8 +10,8 @@
   border-bottom: 1px solid #F0F0F0;
 
   .iconBook {
-    width: 14px;
-    height: 19px;
+    width: 14Px;
+    height: 19Px;
     margin-right: 5px;
     flex-shrink: 0;
     background: url('../../../images/icon-book.png') no-repeat center;
@@ -60,6 +60,7 @@
       --n-rail-height: 20Px !important;
       --n-button-width-pressed: 16Px !important;
       --n-button-height: 16Px !important;
+      --n-button-width: 16Px !important;
       --n-rail-color: #CCCCCC !important;
       --n-rail-color-active: #2089FF !important;
     }

+ 1 - 1
src/views/prepare-lessons/components/lesson-main/courseware-head/index.tsx

@@ -45,7 +45,7 @@ export default defineComponent({
       <>
         <div class={styles.headerTitle}>
           <i class={styles.iconBook}></i>
-          <span>{prepareStore.getBaseCourseware.name}</span>
+          <span>{prepareStore.getSelectName}</span>
         </div>
 
         <div class={styles.formContainer}>