From d3f0ff6001c34c9ac37e9e776f090f5a696a1361 Mon Sep 17 00:00:00 2001
From: jazz <jazzxhunter@163.com>
Date: 星期三, 13 十二月 2023 15:08:23 +0800
Subject: [PATCH] Merge branch 'xio_dev'
---
src/assets/css/common.css | 66 +++++++++++++++++++++++++++++---
1 files changed, 59 insertions(+), 7 deletions(-)
diff --git a/src/assets/css/common.css b/src/assets/css/common.css
index 412271e..f9ac968 100644
--- a/src/assets/css/common.css
+++ b/src/assets/css/common.css
@@ -35,6 +35,7 @@
flex: 1;
-webkit-flex: 1;
}
+.flex-1-w1 {width: 1px;}
.w1{width: 0.0732vw;}.h1{height: 0.0732vw;}
.flex-center {
@@ -43,7 +44,21 @@
align-items: center;
-webkit-align-items: center;
}
-
+/* 姘村钩灞呬腑 */
+.flex-align-center{
+ justify-content: center;
+ -webkit-justify-content: center;
+}
+/* 姘村钩灞呭乏 */
+.flex-align-start{
+ justify-content: start;
+ -webkit-justify-content: start;
+}
+/* 姘村钩灞呭彸 */
+.flex-align-end{
+ justify-content: end;
+ -webkit-justify-content: end;
+}
.flex-ver {-webkit-align-items: center;align-items: center;}
.flex-col {-webkit-flex-flow: column;flex-flow: column;}
.flex-end{
@@ -181,7 +196,7 @@
right: 0;
bottom: 0;
z-index: 10;
- background: rgba(0,0,0,0.8);
+ background: rgba(0,0,0,0.67);
}
body{
overflow: hidden;
@@ -190,13 +205,26 @@
.page {
width: 100vw;
height: 100vh;
+ /* width: 1440px;
+ height: 900px; */
background-color: rgba(34,123,235,1);
box-sizing: border-box;
padding: 0 23px 42px 23px;
}
-
+/* 閬垮厤Chrome娴忚鍣ㄧ湅鍒癝afari榛戝 */
+@supports (-webkit-touch-callout: none) {
+ .page {
+ /* The hack for Safari */
+ /* height: -webkit-fill-available; */
+ /* height: -webkit-fill-available; */
+ }
+}
.page_header {
- min-height: 100px;
+ height: 100px;
+}
+
+.page_header .left {
+ cursor: pointer;
}
.page_logo_1 {
@@ -204,20 +232,27 @@
height: 45px;
display: block;
}
-
+.page_logo_1 .img {
+ width: 100%;
+ height: 100%;
+}
.page_logo_2 {
width: 132px;
height: 50px;
display: block;
margin-left: 10px;
}
-
+.page_logo_2 .img {
+ width: 100%;
+ height: 100%;
+}
.page_date {
line-height: 28px;
color: rgba(255,255,255,1);
font-size: 20px;
font-family: PingFangSC-regular;
text-align: right;
+ margin-left: 33px;
}
.page_week {}
@@ -235,5 +270,22 @@
.page_container {
width: 100%;
- height: calc( 100% - 100px );
+}
+
+.btn_ani {
+ animation-name: anim_scale;
+ animation-duration: 1.1s;
+ animation-iteration-count: infinite;
+}
+
+@keyframes anim_scale {
+ 0% {
+ scale: 1;
+ }
+ 50% {
+ scale: 1.1;
+ }
+ 100% {
+ scale: 1;
+}
}
\ No newline at end of file
--
Gitblit v1.8.0