Skip to content

Improve styles of Gitalk & Gitment #568

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stevenjoezhang merged 2 commits into from
Jan 6, 2019
Merged

Improve styles of Gitalk & Gitment #568

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
245606d
swig
stevenjoezhang Jan 5, 2019
2b4f53a
gitalk.css -> gitalk.min.css
stevenjoezhang Jan 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/zh-CN/MATH.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ math:
mathjax:
# Use 2.7.1 as default, jsdelivr as default CDN, works everywhere even in China
cdn: //cdn.jsdelivr.net/npm/mathjax@2.7.1/MathJax.js?config=TeX-AMS-MML_HTMLorMML
# For newMathJax CDN (cdnjs.cloudflare.com) with fallback to oldMathJax (cdn.mathjax.org).
# For newMathJax CDN (cdnjs.cloudflare.com) with fallback to oldMathJax (cdn.mathjax.org).
#cdn: //cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML
# For direct link to MathJax.js with CloudFlare CDN (cdnjs.cloudflare.com).
#cdn: //cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.1/MathJax.js?config=TeX-MML-AM_CHTML
Expand Down
4 changes: 2 additions & 2 deletions layout/_macro/post.swig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@
</div>
{% endif %}
<!--/noindex-->
{% elif post.excerpt %}
{% elif post.excerpt %}
{{ post.excerpt }}
<!--noindex-->
{% if theme.read_more_btn %}
Expand Down Expand Up @@ -342,7 +342,7 @@
{% endif %}
{% else %}
{{ post.content }}
{% endif %}
{% endif %}
</div>

{% if theme.related_posts.enable and (theme.related_posts.display_in_home or not is_index) %}
Expand Down
2 changes: 1 addition & 1 deletion layout/_partials/comments.swig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
</div>

{% elif theme.gitalk.enable %}
<div id="gitalk-container">
<div class="comments" id="gitalk-container">
</div>

{% endif %}
Expand Down
2 changes: 1 addition & 1 deletion layout/_partials/share/baidushare.swig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
}
}
</script>
{% elseif theme.baidushare.type === "slide" %}
{% elif theme.baidushare.type === "slide" %}
<script>
window._bd_share_config = {
"common": {
Expand Down
11 changes: 1 addition & 10 deletions layout/_scripts/schemes/gemini.swig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1 @@
{%
set scripts = [
'src/affix.js',
'src/schemes/pisces.js'
]
%}

{% for script in scripts %}
<script src="{{ url_for(theme.js) }}/{{ script }}?v={{ version }}"></script>
{% endfor %}
{% include 'pisces.swig' %}
2 changes: 1 addition & 1 deletion layout/_third-party/analytics/analytics-with-widget.swig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% include 'busuanzi-counter.swig' %}
{% include 'tencent-mta.swig' %}
{% include 'tencent-analytics.swig' %}
{% include 'cnzz-analytics.swig' %}
{% include 'cnzz-analytics.swig' %}
2 changes: 1 addition & 1 deletion layout/_third-party/analytics/tencent-mta.swig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
var _mtac = {};
(function() {
var mta = document.createElement("script");
mta.src = "https://pingjs.qq.com/h5/stats.js?v2.0.4";
mta.src = "https://pingjs.qq.com/h5/stats.js";
mta.setAttribute("name", "MTAH5");
mta.setAttribute("sid", "{{theme.tencent_mta}}");
var s = document.getElementsByTagName("script")[0];
Expand Down
4 changes: 2 additions & 2 deletions layout/_third-party/comments/gitalk.swig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{% set gitalk_js_url = '//cdn.jsdelivr.net/npm/gitalk@1.4.0/dist/gitalk.min.js' %}
{% set gitalk_js_url = '//cdn.jsdelivr.net/npm/gitalk@1/dist/gitalk.min.js' %}
{% if theme.vendors.gitalk_js %}
{% set gitalk_js_url = theme.vendors.gitalk_js %}
{% endif %}
<script src="{{ gitalk_js_url }}"></script>

{% set gitalk_css_url = '//cdn.jsdelivr.net/npm/gitalk@1.4.0/dist/gitalk.css' %}
{% set gitalk_css_url = '//cdn.jsdelivr.net/npm/gitalk@1/dist/gitalk.css' %}
Copy link
Member

@ivan-nginx ivan-nginx Jan 6, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://cdn.jsdelivr.net/npm/gitalk@1/dist/gitalk.min.css ?

Copy link
Contributor Author

@stevenjoezhang stevenjoezhang Jan 6, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated

Copy link
Member

@ivan-nginx ivan-nginx Jan 6, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So, if pull is ready, squash it.

{% if theme.vendors.gitalk_css %}
{% set gitalk_css_url = theme.vendors.gitalk_css %}
{% endif %}
Expand Down
20 changes: 14 additions & 6 deletions layout/_third-party/comments/gitment.swig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,19 @@
{% endif %}
<!-- END LOCAL -->

<style>
#gitment-container a {
border-bottom: none;
}
{% if theme.gitment.cleanly %}
<style>
a.gitment-editor-footer-tip { display: none; }
.gitment-container.gitment-footer-container { display: none; }
</style>
a.gitment-editor-footer-tip {
display: none;
}
.gitment-container.gitment-footer-container {
display: none;
}
{% endif %}
</style>

<script>
function renderGitment() {
Expand All @@ -24,7 +31,7 @@
owner: '{{ theme.gitment.github_user }}',
repo: '{{ theme.gitment.github_repo }}',
{% if theme.gitment.mint %}
lang: '{{ theme.gitment.language }}' || navigator.language || navigator.systemLanguage || navigator.userLanguage,
lang: '{{ theme.gitment.language }}' || navigator.language || navigator.systemLanguage || navigator.userLanguage,
{% endif %}
oauth: {
{% if theme.gitment.mint and theme.gitment.redirect_protocol %}
Expand All @@ -36,7 +43,8 @@
client_secret: '{{ theme.gitment.client_secret }}',
{% endif %}
client_id: '{{ theme.gitment.client_id }}'
}});
}
});
gitment.render('gitment-container');
}

Expand Down
1 change: 0 additions & 1 deletion source/css/_schemes/Mist/_header.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
}
}


.logo-line-before,
.logo-line-after {
display: block;
Expand Down
4 changes: 0 additions & 4 deletions source/css/_schemes/Mist/index.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@

.headband { display: none; }


// Search
// --------------------------------------------------
.site-search {
Expand All @@ -38,14 +37,12 @@
}
}


// Page - Container
// --------------------------------------------------
.container .main-inner {
+mobile() { width: auto; }
}


// Page - Post details
// --------------------------------------------------
.page-post-detail {
Expand All @@ -57,7 +54,6 @@
.post-meta { margin-bottom: 60px; }
}


// Pagination
// --------------------------------------------------
.pagination {
Expand Down
1 change: 0 additions & 1 deletion source/css/_schemes/Pisces/_sidebar.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,6 @@
.fa-globe { font-size: 15px; }
}


.links-of-blogroll {
text-align: center;
margin-top: 20px;
Expand Down