From b943f47818f96e24b80828bf6b1d419884bfb742 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?TOP=E7=B3=AF=E7=B1=B3?= <1130395124@qq.com>
Date: Wed, 11 Oct 2023 21:42:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=89=8D=E7=AB=AFpx=E5=8D=95?=
=?UTF-8?q?=E4=BD=8D=E4=B8=BArem?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
css/parse.php | 22 +
css/responsive.css | 410 +++++++-------
css/responsive.less | 350 ++++++------
css/responsive.less.bak | 771 ++++++++++++++++++++++++++
css/style.css | 484 ++++++++--------
css/style.less | 497 +++++++++--------
css/style.less.bak | 1158 +++++++++++++++++++++++++++++++++++++++
index.html | 16 +-
js/main.js | 29 +-
story.html | 14 +-
10 files changed, 2903 insertions(+), 848 deletions(-)
create mode 100644 css/parse.php
create mode 100644 css/responsive.less.bak
create mode 100644 css/style.less.bak
diff --git a/css/parse.php b/css/parse.php
new file mode 100644
index 0000000..a0d6b53
--- /dev/null
+++ b/css/parse.php
@@ -0,0 +1,22 @@
+
diff --git a/js/main.js b/js/main.js
index 10b951a..8dcb964 100644
--- a/js/main.js
+++ b/js/main.js
@@ -33,30 +33,25 @@ function hideMenu() {
}
$(function () {
- function setRem() {
- var whdef = 100 / 1920;// 表示1920的设计图,使用100PX的默认值 1rem = 100px
- var wH = window.innerHeight;// 当前窗口的高度
- var wW = window.innerWidth;// 当前窗口的宽度
- var rem = wW * whdef;// 以默认比例值乘以当前窗口宽度,得到该宽度下的相应FONT-SIZE值
- $('html').css('font-size', rem + "px");
- $(window).resize(function () {
- var whdef = 100 / 1920;// 表示1920的设计图,使用100PX的默认值
- var wH = window.innerHeight;// 当前窗口的高度
- var wW = window.innerWidth;// 当前窗口的宽度
- var rem = wW * whdef;// 以默认比例值乘以当前窗口宽度,得到该宽度下的相应FONT-SIZE值
- $('html').css('font-size', rem + "px");
- });
+ function getRem() {
+ let windowWidth = window.innerWidth
+ return windowWidth * (100 / (windowWidth > 768 ? 1920 : 750));
}
- setRem();
+ function rszcal() {
+ $('html').css('font-size', getRem() + "px");
+ }
+ $(window).resize(rszcal);
+ rszcal();
+ let currentRem = getRem();
$('.header .menu-group').load('../common/header.html');
$('.footer').load('../common/footer.html');
$(window).scroll(function () {
let t = $(document).scrollTop(), flag;
if ($(window).width() > 768) {
- flag = t > 400;
+ flag = t > 4 * currentRem;
} else {
- flag = t > 60;
+ flag = t > 0.6 * currentRem;
}
if (flag) {
header.removeClass('style1').addClass('style2');
@@ -74,7 +69,7 @@ $(function () {
let id = $(this).attr('href');
let ot = $(id)[0].offsetTop;
window.scrollTo({
- top: ot - 90,
+ top: ot - (0.9 * currentRem),
behavior: "smooth",
});
});
diff --git a/story.html b/story.html
index 85116e5..ed220a5 100644
--- a/story.html
+++ b/story.html
@@ -56,12 +56,14 @@