Skip to content

Commit 57c6455

Browse files
committed
feat(footer): Fix custom footer issue and conflict files publish issue. #DEF-23
1 parent 17cbc26 commit 57c6455

File tree

4 files changed

+11
-5
lines changed

4 files changed

+11
-5
lines changed

assets/plugin-styles.txt.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

assets/src/plugin-styles.txt.scss

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -466,7 +466,8 @@
466466
.document-container
467467
{
468468
flex-basis: var(--content-width);
469-
padding-bottom: 260px;
469+
display: flex;
470+
flex-direction: column;
470471
}
471472

472473
.markdown-reading-view
@@ -481,7 +482,7 @@
481482
display: flex;
482483
width: 100%;
483484
max-width: 100%;
484-
padding-bottom: 30em;
485+
padding-bottom: 16em;
485486
align-items: flex-start;
486487
justify-content: center;
487488
}

src/html-generation/wms-footer.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,6 @@
1-
export const WMS_FOOTER = `<footer class="footer_d1NW"><div class="contactArea_F3xQ"><div><h2>联系我们</h2><div><p>网站:<a href="https://wms.webinfra.cloud" target="__blank">https://wms.webinfra.cloud</a></p><p>电话:<a href="tel:19537602183">19537602183</a></p><p>地址:上海市嘉定区云谷路399号嘉定新城科创智慧园T2办公楼</p></div></div><div class="qrs_s00F"><div class="qr_gmUh"><div class="qrTitle_TmNk"><span>关注公众号</span><br><span>了解前沿WMS知识</span></div><div style="margin-top:1rem"><img src="img/company_qr.jpg" alt="公众号二维码" style="width:80px;height:80px"></div></div><div class="qr_gmUh"><div class="qrTitle_TmNk"><span>客服微信</span><br><span>只冲WMS产品</span></div><div style="margin-top:1rem"><img src="img/sales_qr.jpg" alt="客服二维码" style="width:80px;height:80px"></div></div></div></div><div class="beian_B2zb"><div><a href="https://beian.miit.gov.cn/" target="_blank" rel="noopener noreferrer" style="color:inherit;text-decoration:none">沪ICP备2023003164号-1</a></div><div style="margin-left:1rem"><span>Copyright © <!-- -->2024<!-- --> 只冲科技, Inc. All rights reserved.</span></div></div></footer>`
2-
export const WMS_FOOTER_STYLE = `p img {max-height: 12rem;} .footer_d1NW{background-color:#303846;color:#fff;padding:1rem}.contactArea_F3xQ{align-items:center;color:#fff;display:flex;font-size:1rem;justify-content:center}.contactArea_F3xQ a{color:inherit;font-weight:700}.qrs_s00F{display:flex;flex:0 0 auto}.qr_gmUh{flex:1;min-width:118px;text-align:center}.beian_B2zb,.buttons_c5vH{align-items:center;display:flex}.qrTitle_TmNk{font-size:smaller}.beian_B2zb{color:#ffffff6b;flex-direction:row;font-size:small;justify-content:center;margin-top:2rem}@media screen and (max-width:767px){.contactArea_F3xQ{flex-direction:column}.qrs_s00F{width:100%}.beian_B2zb{display:none}}`
1+
export const WMS_FOOTER = `<div><footer class="footer_d1NW"><div class="footer_close_btn">X</div><div class="contactArea_F3xQ"><div><h2>联系我们</h2><div><p>网站:<a href="https://wms.webinfra.cloud" target="__blank">https://wms.webinfra.cloud</a></p><p>电话:<a href="tel:19537602183">19537602183</a></p><p>地址:上海市嘉定区云谷路399号嘉定新城科创智慧园T2办公楼</p></div></div><div class="qrs_s00F"><div class="qr_gmUh"><div class="qrTitle_TmNk"><span>关注公众号</span><br><span>了解前沿WMS知识</span></div><div style="margin-top:1rem"><img src="img/company_qr.jpg" alt="公众号二维码" style="width:80px;height:80px"></div></div><div class="qr_gmUh"><div class="qrTitle_TmNk"><span>客服微信</span><br><span>只冲WMS产品</span></div><div style="margin-top:1rem"><img src="img/sales_qr.jpg" alt="客服二维码" style="width:80px;height:80px"></div></div></div></div><div class="beian_B2zb"><div><a href="https://beian.miit.gov.cn/" target="_blank" rel="noopener noreferrer" style="color:inherit;text-decoration:none">沪ICP备2023003164号-1</a></div><div style="margin-left:1rem"><span>Copyright © <!-- -->2024<!-- --> 只冲科技, Inc. All rights reserved.</span></div></div></footer>
2+
<script>
3+
function toggleClass() {const footer = document.querySelector('.footer_d1NW');footer.classList.toggle('footer_close')};
4+
const btn = document.querySelector('.footer_close_btn'); btn.onclick=(e) => {e.preventDefault(); toggleClass();};
5+
</script></div>`
6+
export const WMS_FOOTER_STYLE = `p img {max-height: 12rem;} .footer_close{display: none;}.footer_close_btn{position: absolute; top: 1rem; right: 1rem;color: #fff;} .footer_d1NW{position: relative;background-color:#303846;color:#fff;padding:1rem}.contactArea_F3xQ{align-items:center;color:#fff;display:flex;font-size:1rem;justify-content:center}.contactArea_F3xQ a{color:inherit;font-weight:700}.qrs_s00F{display:flex;flex:0 0 auto}.qr_gmUh{flex:1;min-width:118px;text-align:center}.beian_B2zb,.buttons_c5vH{align-items:center;display:flex}.qrTitle_TmNk{font-size:smaller}.beian_B2zb{color:#ffffff6b;flex-direction:row;font-size:small;justify-content:center;margin-top:2rem}@media screen and (max-width:767px){.contactArea_F3xQ{flex-direction:column}.qrs_s00F{width:100%}.beian_B2zb{display:none}}`

src/main.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -770,6 +770,7 @@ export default class InvioPlugin extends Plugin {
770770
if (triggerSource === 'force') {
771771
pubPathList.push(...allFiles.map(file => file.path));
772772
pubPathList = pubPathList
773+
.filter(p => !p.endsWith('.conflict.md'))
773774
.filter((p, idx) => pubPathList.indexOf(p) === idx)
774775
}
775776
if (pubPathList?.length === 0) {

0 commit comments

Comments
 (0)