From 8bb474b9fcf3f964d7937bcb2c3e7bb2d139bf7c Mon Sep 17 00:00:00 2001
From: chenyabin <Chenab123!>
Date: 星期三, 07 四月 2021 09:24:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/BaseNav/PublicBounced/GasComponents/PublicVideo.vue | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicVideo.vue b/src/components/BaseNav/PublicBounced/GasComponents/PublicVideo.vue
index 9519388..9c29b81 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/PublicVideo.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/PublicVideo.vue
@@ -6,12 +6,12 @@
<div class="border_corner border_corner_left_bottom"></div>
<div class="border_corner border_corner_right_bottom"></div>
<div class="main">
- <div class="main-video">
+<!-- <div class="main-video">-->
<video controls>
<source src="movie.mp4" type="video/mp4">
<source src="movie.ogg" type="video/ogg">
</video>
- </div>
+<!-- </div>-->
</div>
</div>
</template>
@@ -30,15 +30,14 @@
.main {
border: 1px solid #396d83;
padding: 6px;
- .main-video {
- width: 100%;
- height: 100%;
+ //.main-video {
+ height: 378px;
video {
width: 100%;
- height: 100%;
+ height: 378px;
outline: none;
}
- }
+ //}
}
.border_corner{
z-index: 999;
@@ -46,7 +45,7 @@
width: 14px;
height: 14px;
background: rgba(0,0,0,0);
- border: 1.5px solid #47d5ea;
+ border: 1px solid #47d5ea;
}
.border_corner_left_top{
top: 0;
--
Gitblit v1.8.0