diff --git a/app/templates/userpage_get.html b/app/templates/userpage_get.html index 8c684b6..220e7bf 100644 --- a/app/templates/userpage_get.html +++ b/app/templates/userpage_get.html @@ -52,6 +52,44 @@ cursor: pointer; } +<<<<<<< HEAD +======= + @keyframes shakes { + 10%, 90% { + transform: translate3d(-1px, 0, 0); + } + 20%, 50% { + transform: translate3d(+2px, 0, 0); + } + 30%, 70% { + transform: translate3d(-4px, 0, 0); + } + 40%, 60% { + transform: translate3d(+4px, 0, 0); + } + 50% { + transform: translate3d(-4px, 0, 0); + } + } + + .lead { + font-size: 22px; + font-family: Helvetica, sans-serif; + white-space: pre-wrap; + } + + .arrow { + padding: 0; + font-size: 20px; + line-height: 21px; + display: inline-block; + } + + .arrow:hover { + cursor: pointer; + } + +>>>>>>> 8cbc7c9 (修复快速点击下一页按钮点击频率过快时页面跳转到未知名页面)
@@ -59,13 +97,14 @@English Pal for {{ username }} {% if username == admin_name %} - 管理 + 管理 {% endif %} 退出 重设密码
{% for message in get_flashed_messages() %} +<<<<<<< HEAD阅读文章并回答问题
Article added on: {{ today_article["date"] }}
{{ today_article['question'] }}
Article added on: {{ today_article["date"] }}
{{ today_article["article_title"] }}
{{ today_article["article_body"] }}
{{ today_article['source'] }}
{{ today_article['question'] }}