Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
优化:文章阅读样式优化
  • Loading branch information
zhuchunshu committed Nov 29, 2022
1 parent ad4cfe0 commit 3dcb35e
Show file tree
Hide file tree
Showing 5 changed files with 34 additions and 8 deletions.
7 changes: 5 additions & 2 deletions app/Plugins/Topic/resources/assets/css/app.css
Expand Up @@ -1804,6 +1804,9 @@
.vditor-sv__marker--strong {
font-weight: bold;
}
.vditor-reset {
font-family: -apple-system, BlinkMacSystemFont, Helvetica Neue, PingFang SC, Microsoft YaHei, Source Han Sans SC, Noto Sans CJK SC, WenQuanYi Micro Hei, sans-serif;
}
.imgList {
display: flex;
flex-wrap: wrap;
Expand All @@ -1828,10 +1831,10 @@ pre {
font-size: 16px;
}
.article p {
margin-bottom: 5px;
margin-bottom: 1px;
word-wrap: break-word;
word-break: normal;
line-height: 1.5;
line-height: 1.25;
font-size: 16px;
}
.article h1 {
Expand Down
7 changes: 5 additions & 2 deletions app/Plugins/Topic/resources/package/sass/app.less
Expand Up @@ -2,6 +2,9 @@
@import "~@fancyapps/ui/dist/fancybox.css";


.vditor-reset {
font-family:-apple-system, BlinkMacSystemFont, Helvetica Neue, PingFang SC, Microsoft YaHei, Source Han Sans SC, Noto Sans CJK SC, WenQuanYi Micro Hei, sans-serif;
}
.imgList {
display: flex;
flex-wrap: wrap;
Expand Down Expand Up @@ -31,10 +34,10 @@ pre {
}

.article p {
margin-bottom: 5px;
margin-bottom: 1px;
word-wrap: break-word;
word-break: normal;
line-height: 1.5;
line-height: 1.25;
font-size: 16px;
}

Expand Down
6 changes: 5 additions & 1 deletion app/helpers.php
Expand Up @@ -789,7 +789,11 @@ function get_client_ip_data($ip=null): array
'Origin' => 'https://members.ip-api.com'
]
]);
$result['pro']=$result['regionName'];
if (Arr::has($result, 'regionName')) {
$result['pro']=$result['regionName'];
}else{
$result['pro']='';
}
return $result;
}
}
Expand Down
19 changes: 17 additions & 2 deletions public/js/app.js
Expand Up @@ -2489,6 +2489,19 @@ try {// window.$ = window.jQuery = require('jquery');
* allows your team to easily build robust real-time web applications.
*/

/***/ }),

/***/ "./resources/sass/plugins/Topic/app.less":
/*!***********************************************!*\
!*** ./resources/sass/plugins/Topic/app.less ***!
\***********************************************/
/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {

"use strict";
__webpack_require__.r(__webpack_exports__);
// extracted by mini-css-extract-plugin


/***/ }),

/***/ "./resources/sass/app.scss":
Expand Down Expand Up @@ -2818,6 +2831,7 @@ process.umask = function() { return 0; };
/******/ // [resolve, reject, Promise] = chunk loading, 0 = chunk loaded
/******/ var installedChunks = {
/******/ "/js/app": 0,
/******/ "plugins/Topic/css/app": 0,
/******/ "css/app": 0
/******/ };
/******/
Expand Down Expand Up @@ -2866,8 +2880,9 @@ process.umask = function() { return 0; };
/******/ // startup
/******/ // Load entry module and return exports
/******/ // This entry module depends on other loaded chunks and execution need to be delayed
/******/ __webpack_require__.O(undefined, ["css/app"], () => (__webpack_require__("./resources/js/app.js")))
/******/ var __webpack_exports__ = __webpack_require__.O(undefined, ["css/app"], () => (__webpack_require__("./resources/sass/app.scss")))
/******/ __webpack_require__.O(undefined, ["plugins/Topic/css/app","css/app"], () => (__webpack_require__("./resources/js/app.js")))
/******/ __webpack_require__.O(undefined, ["plugins/Topic/css/app","css/app"], () => (__webpack_require__("./resources/sass/plugins/Topic/app.less")))
/******/ var __webpack_exports__ = __webpack_require__.O(undefined, ["plugins/Topic/css/app","css/app"], () => (__webpack_require__("./resources/sass/app.scss")))
/******/ __webpack_exports__ = __webpack_require__.O(__webpack_exports__);
/******/
/******/ })()
Expand Down
3 changes: 2 additions & 1 deletion public/mix-manifest.json
@@ -1,5 +1,5 @@
{
"/js/app.js": "/js/app.js?id=4f8642873e0e2a19cece",
"/js/app.js": "/js/app.js?id=5f4131c4a24b6dabd927",
"/js/install.js": "/js/install.js?id=e2a427dad25f612dc8fb",
"/js/vue.js": "/js/vue.js?id=c0ed491e9d9bbd0212ac",
"/js/alpine.js": "/js/alpine.js?id=3b24a5041f6ceb43ef89",
Expand All @@ -13,5 +13,6 @@
"/plugins/Topic/js/tag.js": "/plugins/Topic/js/tag.js?id=56aaf760485da588a88d",
"/plugins/User/js/order.js": "/plugins/User/js/order.js?id=ece0287ab56ebf7881ee",
"/plugins/Core/js/app.js": "/plugins/Core/js/app.js?id=9bc41947722837bad834",
"/plugins/Topic/css/app.css": "/plugins/Topic/css/app.css?id=0f65782d30f3ff05c2c3",
"/css/app.css": "/css/app.css?id=68b329da9893e34099c7"
}

0 comments on commit 3dcb35e

Please sign in to comment.