diff --git a/assets/css/joe.normalize.css b/assets/css/joe.normalize.css index fb7ba3b..b15e64c 100644 --- a/assets/css/joe.normalize.css +++ b/assets/css/joe.normalize.css @@ -1 +1 @@ -*{margin:0;padding:0;box-sizing:border-box;outline:none;-webkit-tap-highlight-color:transparent}::-webkit-scrollbar{width:8px;height:8px}::-webkit-scrollbar-thumb{border-radius:4px;background:var(--seat)}::-webkit-scrollbar-track{background:transparent}::-moz-selection{color:#fff;background:var(--theme)}::selection{color:#fff;background:var(--theme)}body{font-size:14px;font-family:'Helvetica Neue', Helvetica, 'PingFang SC', 'Hiragino Sans GB', 'Microsoft YaHei', '微软雅黑', Arial, sans-serif;padding-bottom:constant(safe-area-inset-bottom);padding-bottom:env(safe-area-inset-bottom)}body::before{content:'';position:fixed;top:0;left:0;right:0;bottom:0;z-index:-520;pointer-events:none}input[type='text']{-webkit-appearance:none;border-radius:0;font-size:13px;font-weight:500}iframe{display:block;border:none;margin:0 auto;vertical-align:middle}textarea{font-size:14px;resize:none;-webkit-appearance:none}li{list-style:none}a{text-decoration:none}h1,h2,h3,h4,h5,h6{font-weight:500}img{border:0;vertical-align:middle}img[src=''],img:not([src]){border:0;opacity:0}svg,canvas{vertical-align:middle}button{cursor:pointer;-webkit-appearance:none;font-size:13px}table{border-collapse:collapse;border-spacing:0}.joe_main{min-width:0;flex:1;padding:15px 0}.joe_container{display:flex;width:100%;margin:0 auto;padding:0 15px}@media (min-width: 576px){.joe_container{max-width:540px}}@media (min-width: 768px){.joe_container{max-width:720px}}@media (min-width: 992px){.joe_container{max-width:960px}}@media (min-width: 1200px){.joe_container{max-width:1140px}}@media (min-width: 1400px){.joe_container{max-width:1320px}} +*{margin:0;padding:0;box-sizing:border-box;outline:none;-webkit-tap-highlight-color:transparent}::-webkit-scrollbar{width:8px;height:8px}::-webkit-scrollbar-thumb{border-radius:4px;background:var(--seat)}::-webkit-scrollbar-track{background:transparent}::-moz-selection{color:#fff;background:var(--theme)}::selection{color:#fff;background:var(--theme)}body{font-size:14px;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;padding-bottom:constant(safe-area-inset-bottom);padding-bottom:env(safe-area-inset-bottom)}body::before{content:'';position:fixed;top:0;left:0;right:0;bottom:0;z-index:-520;pointer-events:none}input[type='text']{-webkit-appearance:none;border-radius:0;font-size:13px;font-weight:500}iframe{display:block;border:none;margin:0 auto;vertical-align:middle}textarea{font-size:14px;resize:none;-webkit-appearance:none}li{list-style:none}a{text-decoration:none}h1,h2,h3,h4,h5,h6{font-weight:500}img{border:0;vertical-align:middle}img[src=''],img:not([src]){border:0;opacity:0}svg,canvas{vertical-align:middle}button{cursor:pointer;-webkit-appearance:none;font-size:13px}table{border-collapse:collapse;border-spacing:0}.joe_main{min-width:0;flex:1;padding:15px 0}.joe_container{display:flex;width:100%;margin:0 auto;padding:0 15px}@media (min-width: 576px){.joe_container{max-width:540px}}@media (min-width: 768px){.joe_container{max-width:720px}}@media (min-width: 992px){.joe_container{max-width:960px}}@media (min-width: 1200px){.joe_container{max-width:1140px}}@media (min-width: 1400px){.joe_container{max-width:1320px}} diff --git a/assets/css/joe.normalize.scss b/assets/css/joe.normalize.scss index 625987d..654bc1f 100644 --- a/assets/css/joe.normalize.scss +++ b/assets/css/joe.normalize.scss @@ -1,75 +1,75 @@ * { - margin: 0; - padding: 0; - box-sizing: border-box; - outline: none; - -webkit-tap-highlight-color: transparent; + margin: 0; + padding: 0; + box-sizing: border-box; + outline: none; + -webkit-tap-highlight-color: transparent; } ::-webkit-scrollbar { - width: 8px; - height: 8px; + width: 8px; + height: 8px; } ::-webkit-scrollbar-thumb { - border-radius: 4px; - background: var(--seat); + border-radius: 4px; + background: var(--seat); } ::-webkit-scrollbar-track { - background: transparent; + background: transparent; } ::selection { - color: #fff; - background: var(--theme); + color: #fff; + background: var(--theme); } body { - font-size: 14px; - /* 我们对字体进行统一规范,力求在各个操作系统下都有最佳展示效果。 */ - font-family: 'Helvetica Neue', Helvetica, 'PingFang SC', 'Hiragino Sans GB', 'Microsoft YaHei', '微软雅黑', Arial, sans-serif; - padding-bottom: constant(safe-area-inset-bottom); + font-size: 14px; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + padding-bottom: constant(safe-area-inset-bottom); padding-bottom: env(safe-area-inset-bottom); } body::before { - content: ''; - position: fixed; - top: 0; - left: 0; - right: 0; - bottom: 0; - z-index: -520; - pointer-events: none; + content: ''; + position: fixed; + top: 0; + left: 0; + right: 0; + bottom: 0; + z-index: -520; + pointer-events: none; } input[type='text'] { - -webkit-appearance: none; - border-radius: 0; - font-size: 13px; - font-weight: 500; + -webkit-appearance: none; + border-radius: 0; + font-size: 13px; + font-weight: 500; } iframe { - display: block; - border: none; - margin: 0 auto; - vertical-align: middle; + display: block; + border: none; + margin: 0 auto; + vertical-align: middle; } textarea { - font-size: 14px; - resize: none; - -webkit-appearance: none; + font-size: 14px; + resize: none; + -webkit-appearance: none; } li { - list-style: none; + list-style: none; } a { - text-decoration: none; + text-decoration: none; } h1, @@ -78,71 +78,71 @@ h3, h4, h5, h6 { - font-weight: 500; + font-weight: 500; } img { - border: 0; - vertical-align: middle; + border: 0; + vertical-align: middle; } img[src=''], img:not([src]) { - border: 0; - opacity: 0; + border: 0; + opacity: 0; } svg, canvas { - vertical-align: middle; + vertical-align: middle; } button { - cursor: pointer; - -webkit-appearance: none; - font-size: 13px; + cursor: pointer; + -webkit-appearance: none; + font-size: 13px; } table { - border-collapse: collapse; - border-spacing: 0; + border-collapse: collapse; + border-spacing: 0; } .joe_main { - min-width: 0; - flex: 1; - padding: 15px 0; + min-width: 0; + flex: 1; + padding: 15px 0; } .joe_container { - display: flex; - width: 100%; - margin: 0 auto; - padding: 0 15px; + display: flex; + width: 100%; + margin: 0 auto; + padding: 0 15px; } @media (min-width: 576px) { - .joe_container { - max-width: 540px; - } + .joe_container { + max-width: 540px; + } } @media (min-width: 768px) { - .joe_container { - max-width: 720px; - } + .joe_container { + max-width: 720px; + } } @media (min-width: 992px) { - .joe_container { - max-width: 960px; - } + .joe_container { + max-width: 960px; + } } @media (min-width: 1200px) { - .joe_container { - max-width: 1140px; - } + .joe_container { + max-width: 1140px; + } } @media (min-width: 1400px) { - .joe_container { - max-width: 1320px; - } + .joe_container { + max-width: 1320px; + } } diff --git a/core/function.php b/core/function.php index fe9f20c..c4c1e69 100644 --- a/core/function.php +++ b/core/function.php @@ -3,7 +3,7 @@ /* 获取主题当前版本号 */ function _getVersion() { - return "5.4.5"; + return "5.4.6"; }; /* 判断是否是手机 */ diff --git a/functions.php b/functions.php index fc67ead..bf5760d 100644 --- a/functions.php +++ b/functions.php @@ -326,6 +326,18 @@ function themeConfig($form) $JBirthDay->setAttribute('class', 'joe_content joe_global'); $form->addInput($JBirthDay); + $JCustomFont = new Typecho_Widget_Helper_Form_Element_Text( + 'JCustomFont', + NULL, + NULL, + '自定义网站字体(非必填)', + '介绍:用于修改全站字体,填写则使用引入的字体,不填写使用默认字体
+ 格式:字体URL链接
+ 注意:由于体积文件较大,建议使用cdn链接方式进行引入' + ); + $JCustomFont->setAttribute('class', 'joe_content joe_global'); + $form->addInput($JCustomFont); + $JAside = new Typecho_Widget_Helper_Form_Element_Checkbox( 'JAside', array( diff --git a/public/config.php b/public/config.php new file mode 100644 index 0000000..8f340b1 --- /dev/null +++ b/public/config.php @@ -0,0 +1,58 @@ + + \ No newline at end of file diff --git a/public/include.php b/public/include.php index c250942..0076187 100644 --- a/public/include.php +++ b/public/include.php @@ -1,32 +1,4 @@ - - +need('public/config.php'); ?>