From eb6674449920c5452811feee3d82f6c6b965089d Mon Sep 17 00:00:00 2001
From: 徐旺旺 <11530253@qq.com>
Date: 星期二, 30 三月 2021 17:05:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/BaseNav/PublicBounced/GasComponents/GasVideo.vue | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/GasVideo.vue b/src/components/BaseNav/PublicBounced/GasComponents/GasVideo.vue
index eb83145..fc152ab 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/GasVideo.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/GasVideo.vue
@@ -1,12 +1,12 @@
<template>
- <div class="win">
+ <div class="win" >
<!-- 鍥涗釜瑙掔殑杈规鏁堟灉 -->
<div class="border_corner border_corner_left_top"></div>
<div class="border_corner border_corner_right_top"></div>
<div class="border_corner border_corner_left_bottom"></div>
<div class="border_corner border_corner_right_bottom"></div>
<div class="main">
- <div>
+ <div class="main-video">
<video width="100%" height="100%" controls>
<source src="movie.mp4" type="video/mp4">
<source src="movie.ogg" type="video/ogg">
@@ -22,17 +22,22 @@
}
</script>
-<style scoped>
+<style scoped lang="less">
.win {
- width: 100%;
+ /*width: 100%;*/
/*height: 100%;*/
position: relative;
- display: inline-block;
-//border: 1px solid #396d83;
+ //display: inline-block;
+ background-color: rgba(33, 41, 69,0.9);
+/*//border: 1px solid #396d83;*/
}
.main {
width: 100%;
height: 100%;
+ .main-video {
+ padding: 7px;
+ border: 1px solid #396d83;
+ }
}
.border_corner{
z-index: 2500;
@@ -40,7 +45,7 @@
width: 14px;
height: 14px;
background: rgba(0,0,0,0);
- border: 2px solid #47d5ea;
+ border: 1.5px solid #47d5ea;
}
.border_corner_left_top{
top: 0;
@@ -59,7 +64,6 @@
left: 0;
border-right: none;
border-top: none;
- border-bottom-left-radius: 4px;
}
.border_corner_right_bottom{
bottom: 0;
--
Gitblit v1.8.0