From 740e0b8a319ea94c1c994251a403d3659f7baa62 Mon Sep 17 00:00:00 2001
From: libai <libai@yazhai.co>
Date: Thu, 12 Jan 2023 15:26:44 +0800
Subject: [PATCH] 测试
---
images/google-login-btn.png | Bin 1749 -> 0 bytes
images/login-icon5.png | Bin 0 -> 750 bytes
images/tiwtter-login-btn.png | Bin 0 -> 1324 bytes
mobile/css/login.css | 26 ++++++++------------------
mobile/css/login.less | 43 ++++++++++++++++++++++++++-----------------
mobile/images/d5.png | Bin 0 -> 1432 bytes
mobile/images/google-btn.png | Bin 0 -> 4236 bytes
mobile/images/twitter-btn.png | Bin 0 -> 2443 bytes
mobile/index.html | 7 ++++---
mobile/room/liveRoom.html | 7 ++++---
10 files changed, 42 insertions(+), 41 deletions(-)
create mode 100644 images/login-icon5.png
create mode 100644 images/tiwtter-login-btn.png
create mode 100644 mobile/images/d5.png
create mode 100644 mobile/images/google-btn.png
create mode 100644 mobile/images/twitter-btn.png
diff --git a/images/google-login-btn.png b/images/google-login-btn.png
index 9296204..dfa8507 100644
Binary files a/images/google-login-btn.png and b/images/google-login-btn.png differ
diff --git a/images/login-icon5.png b/images/login-icon5.png
new file mode 100644
index 0000000..c5435cc
Binary files /dev/null and b/images/login-icon5.png differ
diff --git a/images/tiwtter-login-btn.png b/images/tiwtter-login-btn.png
new file mode 100644
index 0000000..6597549
Binary files /dev/null and b/images/tiwtter-login-btn.png differ
diff --git a/mobile/css/login.css b/mobile/css/login.css
index 02dcc2e..56bb3bf 100644
--- a/mobile/css/login.css
+++ b/mobile/css/login.css
@@ -112,38 +112,28 @@
text-align: center;
margin-top: 0.2rem;
}
-.login-phone-btn {
+.login-twitter-btn {
+ position: relative;
width: 6.4rem;
height: 1.3rem;
- background: linear-gradient(to right, #E43984, #E538C1);
- border-radius: 1rem;
- text-align: center;
- position: relative;
- color: #fff;
- line-height: 1.3rem;
- font-size: 0.4rem;
+ background: url(../images/twitter-btn.png) no-repeat;
+ background-size: 100% 100%;
margin: 0 auto;
- margin-top: 1.8rem;
-}
-.login-phone-btn > img {
- width: 0.4rem;
- position: absolute;
- left: 0.6rem;
- top: 0.32rem;
+ margin-top: 0.5rem;
}
.login-google-btn {
position: relative;
width: 6.4rem;
height: 1.3rem;
line-height: 1.3rem;
- background: #FEE5F0;
+ background: linear-gradient(to bottom right, #E93485, #EA33BF);
border-radius: 1rem;
border: 1px solid #DA196E;
margin: 0 auto;
- margin-top: 0.5rem;
+ margin-top: 1.8rem;
text-align: center;
font-size: 0.4rem;
- color: #DC2376;
+ color: #fff;
}
.login-google-btn > img {
width: 0.72rem;
diff --git a/mobile/css/login.less b/mobile/css/login.less
index dff41bc..4dca0a1 100644
--- a/mobile/css/login.less
+++ b/mobile/css/login.less
@@ -114,23 +114,32 @@
margin-top: 0.2rem;
}
.login-phone-btn{
+ // width: 6.4rem;
+ // height: 1.3rem;
+ // background:linear-gradient(to right,#E43984,#E538C1);
+ // border-radius: 1rem;
+ // text-align: center;
+ // position: relative;
+ // color: #fff;
+ // line-height: 1.3rem;
+ // font-size: 0.4rem;
+ // margin: 0 auto;
+ // margin-top: 1.8rem;
+ // >img{
+ // width: 0.4rem;
+ // position: absolute;
+ // left: 0.6rem;
+ // top: 0.32rem;
+ // }
+ }
+ .login-twitter-btn{
+ position: relative;
width: 6.4rem;
height: 1.3rem;
- background:linear-gradient(to right,#E43984,#E538C1);
- border-radius: 1rem;
- text-align: center;
- position: relative;
- color: #fff;
- line-height: 1.3rem;
- font-size: 0.4rem;
+ background: url(../images/twitter-btn.png)no-repeat;
+ background-size: 100% 100%;
margin: 0 auto;
- margin-top: 1.8rem;
- >img{
- width: 0.4rem;
- position: absolute;
- left: 0.6rem;
- top: 0.32rem;
- }
+ margin-top: 0.5rem;
}
.login-google-btn{
position: relative;
@@ -139,15 +148,15 @@
height: 1.3rem;
line-height: 1.3rem;
border-radius: 1rem;
- background:#FEE5F0;
+ background:linear-gradient(to bottom right,#E93485,#EA33BF);
text-align: center;
border-radius: 1rem;
border: 1px solid #DA196E;
margin: 0 auto;
- margin-top: 0.5rem;
+ margin-top: 1.8rem;
text-align: center;
font-size: 0.4rem;
- color: #DC2376;
+ color: #fff;
>img{
width: 0.72rem;
position: absolute;
diff --git a/mobile/images/d5.png b/mobile/images/d5.png
new file mode 100644
index 0000000..f8d5191
Binary files /dev/null and b/mobile/images/d5.png differ
diff --git a/mobile/images/google-btn.png b/mobile/images/google-btn.png
new file mode 100644
index 0000000..f4e4473
Binary files /dev/null and b/mobile/images/google-btn.png differ
diff --git a/mobile/images/twitter-btn.png b/mobile/images/twitter-btn.png
new file mode 100644
index 0000000..75d4786
Binary files /dev/null and b/mobile/images/twitter-btn.png differ
diff --git a/mobile/index.html b/mobile/index.html
index 3735109..074af76 100644
--- a/mobile/index.html
+++ b/mobile/index.html
@@ -37,7 +37,7 @@
<link rel="stylesheet" href="css/base.css?v=2022112904">
<link rel="stylesheet" href="css/layer.css">
<link rel="stylesheet" href="css/index.css?v=2022120104">
- <link rel="stylesheet" href="css/login.css?v=2022120104">
+ <link rel="stylesheet" href="css/login.css?v=2023011201">
<link rel="manifest" href="manifest.webmanifest?v=2022120601" />
<script async defer src="lib/hello.js"></script>
@@ -248,14 +248,15 @@
<div class="login-show">
<span class="login-close">×</span>
<div class="login-p1">登入/註冊</div>
- <div class="login-phone-btn"><img src="images/phone-icon2.png">Phone</div>
+ <!-- <div class="login-phone-btn"><img src="images/phone-icon2.png">Phone</div> -->
<div class="login-google-btn"><img src="images/google1.png">Google<div id="buttonDiv-big"></div></div>
+ <div class="login-twitter-btn twitter_btn" ></div>
<div class="login-line"></div>
<div class="login-line-text">其他方式登入</div>
<ul class="login-more-btn">
<li class="line_btn"><img src="images/d2.png" alt=""></li>
<li class="facebook_btn"><img src="images/d3.png" alt=""></li>
- <li class="twitter_btn"><img src="images/d4.png" alt=""></li>
+ <li class="login-phone-btn"><img src="images/d5.png" alt=""></li>
</ul>
</div>
<div style="display: none;" class="login1">
diff --git a/mobile/room/liveRoom.html b/mobile/room/liveRoom.html
index 9d71efa..cf38f15 100644
--- a/mobile/room/liveRoom.html
+++ b/mobile/room/liveRoom.html
@@ -36,7 +36,7 @@
<link rel="stylesheet" href="../css/base.css?v=2022112804">
<link rel="stylesheet" href="../css/layer.css">
<link rel="stylesheet" href="css/liveRoom.css?v=2023010301">
- <link rel="stylesheet" href="../css/login.css?v=2022112804">
+ <link rel="stylesheet" href="../css/login.css?v=2023011201">
<link rel="manifest" href="../manifest.webmanifest?v=2022112308" />
<script src="../lib/hello.js" async defer></script>
<script src="https://accounts.google.com/gsi/client" async defer></script>
@@ -388,14 +388,15 @@
<div class="login-show">
<span class="login-close">×</span>
<div class="login-p1">登入/註冊</div>
- <div class="login-phone-btn"><img src="../images/phone-icon2.png">Phone</div>
+ <!-- <div class="login-phone-btn"><img src="images/phone-icon2.png">Phone</div> -->
<div class="login-google-btn"><img src="../images/google1.png">Google<div id="buttonDiv-big"></div></div>
+ <div class="login-twitter-btn twitter_btn" ></div>
<div class="login-line"></div>
<div class="login-line-text">其他方式登入</div>
<ul class="login-more-btn">
<li class="line_btn"><img src="../images/d2.png" alt=""></li>
<li class="facebook_btn"><img src="../images/d3.png" alt=""></li>
- <li class="twitter_btn"><img src="../images/d4.png" alt=""></li>
+ <li class="login-phone-btn"><img src="../images/d5.png" alt=""></li>
</ul>
</div>
<div style="display: none;" class="login1">
--
libgit2 0.25.0