Skip to content
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.

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

修复配置文件里面的google calendar无法使用 #407

Merged
merged 3 commits into from
Oct 25, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 6 additions & 3 deletions _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -675,13 +675,16 @@ baidu_push: false
#
# API Documentation:
# https://developers.google.com/google-apps/calendar/v3/reference/events/list
# Enabled APIs and services
# api_key: https://console.developers.google.com/
# Create & manage a public Google calendar: https://support.google.com/calendar/answer/37083?hl=en
calendar:
enable: false
calendar_id: <required>
calendar_id: <required> # Your Google account E-Mail
api_key: <required>
orderBy: startTime
offsetMax: 24
offsetMin: 4
offsetMax: 24 # Time Range
offsetMin: 4 # Time Range
timeZone:
showDeleted: false
singleEvents: true
Expand Down
1 change: 1 addition & 0 deletions layout/_layout.swig
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@
{% include '_third-party/analytics/lean-analytics.swig' %}
{% include '_third-party/analytics/firestore.swig' %}
{% include '_third-party/seo/baidu-push.swig' %}
{% include '_third-party/schedule.swig' %}
{% include '_third-party/math/index.swig' %}
{% include '_third-party/needsharebutton.swig' %}
{% include '_third-party/rating.swig' %}
Expand Down
4 changes: 4 additions & 0 deletions layout/page.swig
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
#}{{ __('title.category') + page_title_suffix }}{#
#}{% elif page.type === "tags" and not page.title %}{#
#}{{ __('title.tag') + page_title_suffix }}{#
#}{% elif page.type === "schedule" and not page.title %}{#
#}{{ __('title.schedule') + page_title_suffix }}{#
#}{% else %}{#
#}{{ page.title + page_title_suffix }}{#
#}{% endif %}{#
Expand Down Expand Up @@ -58,6 +60,8 @@
{{ list_categories() }}
</div>
</div>
{% elif page.type === 'schedule' %}
{% include 'schedule.swig' %}
{% else %}
{{ page.content }}
{% endif %}
Expand Down
11 changes: 0 additions & 11 deletions layout/schedule.swig
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@
{% extends '_layout.swig' %}
{% import '_macro/sidebar.swig' as sidebar_template %}

{% block title %}{{ __('title.schedule') }} | {{ title }}{% endblock %}

{% block page_class %}page-post-detail page-calendar{% endblock %}

{% block content %}
{######################}
{### SCHEDULE BLOCK ###}
Expand All @@ -19,7 +12,3 @@
{### END SCHEDULE BLOCK ###}
{##########################}
{% endblock %}

{% block sidebar %}
{{ sidebar_template.render(false) }}
{% endblock %}
19 changes: 18 additions & 1 deletion source/css/_common/components/pages/schedule.styl
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,9 @@
}
li.event-past {
background: #FCFCFC
padding: 15px 0 15px 10px
& > * {
opacity: .6
opacity: .9
}
h2.event-summary {
color: #bbb
Expand All @@ -96,6 +97,22 @@
color: #FFF!important
}
}

li.event-future {
background: #222
color: #FFF
padding: 15px 0 15px 10px
h2.event-summary {
&:before {
transform: scale(1.2)
color: #FFF
animation: dot-flash 1s alternate infinite ease-in-out;
}
}
* {
color: #FFF!important
}
}
}
}