From 6d37dc93b40c6935f65ec4c68b7f6985c9d3bad5 Mon Sep 17 00:00:00 2001 From: jxmanxk <312142485@qq.com> Date: 星期二, 23 一月 2024 17:44:14 +0800 Subject: [PATCH] Merge branch 'xio_dev' --- src/assets/css/common.css | 25 +++++++++++++++++++------ 1 files changed, 19 insertions(+), 6 deletions(-) diff --git a/src/assets/css/common.css b/src/assets/css/common.css index dd7193b..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 { @@ -210,9 +211,16 @@ 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 { @@ -224,14 +232,20 @@ 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); @@ -256,7 +270,6 @@ .page_container { width: 100%; - height: calc( 100% - 100px ); } .btn_ani { @@ -270,7 +283,7 @@ scale: 1; } 50% { - scale: 1.05; + scale: 1.1; } 100% { scale: 1; -- Gitblit v1.8.0