diff --git a/css/font.css b/css/font.css index 39d5b2e29..ddf2a101d 100644 --- a/css/font.css +++ b/css/font.css @@ -16,9 +16,9 @@ @font-face { font-family: "iconfont"; /* Project id 2831425 */ - src: url('../font/font_2831425_x34rhwyvdnp.woff2') format('woff2'), - url('../font/font_2831425_x34rhwyvdnp.woff') format('woff'), - url('../font/font_2831425_x34rhwyvdnp.ttf') format('truetype'); + src: url('../font/iconfont.woff2') format('woff2'), + url('../font/iconfont.woff') format('woff'), + url('../font/iconfont.ttf') format('truetype'); } .iconfont { @@ -29,6 +29,14 @@ -moz-osx-font-smoothing: grayscale; } +.icon-z_shangpinheji:before { + content: "\e683"; +} + +.icon-a-daohangzhiyindingwei-05:before { + content: "\e970"; +} + .icon-volume-x:before { content: "\e67a"; } diff --git a/css/mobile.css b/css/mobile.css index c0ec3eb84..b719def0e 100644 --- a/css/mobile.css +++ b/css/mobile.css @@ -1,4 +1,4 @@ -@charset"utf-8"; +@charset "utf-8"; /*小于1400px时*/ @media (max-width: 1400px) {} diff --git a/css/style.css b/css/style.css index 38af1d3db..76b9f9d0d 100644 --- a/css/style.css +++ b/css/style.css @@ -214,6 +214,15 @@ i.iconfont.icon-yinhao-copy { font-size: 1.10rem; } +#hitokoto_text { + word-break: break-all; + text-overflow: ellipsis; + overflow: hidden; + display: -webkit-box; + -webkit-line-clamp: 2; + -webkit-box-orient: vertical; +} + .hitokoto-from { margin-top: 10px; font-weight: bold; @@ -462,6 +471,11 @@ span.link-name { font-size: 1.15rem; } +i.iconfont.icon-a-daohangzhiyindingwei-05, +i.iconfont.icon-z_shangpinheji { + font-size: 2rem; +} + /*更多页面*/ .more { display: none !important; diff --git a/font/font_2831425_x34rhwyvdnp.woff b/font/font_2831425_x34rhwyvdnp.woff deleted file mode 100644 index 01ff4c3fb..000000000 Binary files a/font/font_2831425_x34rhwyvdnp.woff and /dev/null differ diff --git a/font/font_2831425_x34rhwyvdnp.woff2 b/font/font_2831425_x34rhwyvdnp.woff2 deleted file mode 100644 index 069f46a8e..000000000 Binary files a/font/font_2831425_x34rhwyvdnp.woff2 and /dev/null differ diff --git a/font/font_2831425_x34rhwyvdnp.ttf b/font/iconfont.ttf similarity index 72% rename from font/font_2831425_x34rhwyvdnp.ttf rename to font/iconfont.ttf index eab829f7c..7fdef7dd3 100644 Binary files a/font/font_2831425_x34rhwyvdnp.ttf and b/font/iconfont.ttf differ diff --git a/font/iconfont.woff b/font/iconfont.woff new file mode 100644 index 000000000..733124ade Binary files /dev/null and b/font/iconfont.woff differ diff --git a/font/iconfont.woff2 b/font/iconfont.woff2 new file mode 100644 index 000000000..5d971f51f Binary files /dev/null and b/font/iconfont.woff2 differ diff --git a/index.html b/index.html index 1a24c3272..eb0dd03be 100644 --- a/index.html +++ b/index.html @@ -167,10 +167,12 @@ class="weekday">星期一
00:00:00
- 天气 加载失败 N/A°C~N/A°C  + 天气  + 加载失败  + °C~ + °C  + +
@@ -212,26 +214,26 @@
- +
- - 实验室 + + 起始页
- - 网址导航 + + 网址集
- +
- - 相册 + + 实验室
@@ -312,9 +314,9 @@
- +
- 图片站 + 时光相册
diff --git a/js/main.js b/js/main.js index bd3954142..d551f56c8 100644 --- a/js/main.js +++ b/js/main.js @@ -83,8 +83,8 @@ if (isFirefox = navigator.userAgent.indexOf("Firefox") > 0) { fetch('https://v1.hitokoto.cn?max_length=24') .then(response => response.json()) .then(data => { - $('#hitokoto_text').text(data.hitokoto) - $('#from_text').text(data.from) + $('#hitokoto_text').html(data.hitokoto) + $('#from_text').html(data.from) }) .catch(console.error) @@ -94,12 +94,12 @@ fetch('https://v1.hitokoto.cn?max_length=24') fetch('https://www.yiketianqi.com/free/day?appid=43986679&appsecret=TksqGZT7&unescape=1') .then(response => response.json()) .then(data => { - $('#wea_text').text(data.wea) - $('#city_text').text(data.city) - $('#tem_night').text(data.tem_night) - $('#tem_day').text(data.tem_day) - $('#win_text').text(data.win) - $('#win_speed').text(data.win_speed) + $('#wea_text').html(data.wea) + $('#city_text').html(data.city) + $('#tem_night').html(data.tem_night) + $('#tem_day').html(data.tem_day) + $('#win_text').html(data.win) + $('#win_speed').html(data.win_speed) }) .catch(console.error)