Skip to content

S
solo-1
Commit b88c8e79 authored by Vanessa's avatar Vanessa
Browse files
Options

✨ fixed #12299

parent d7a38706
Hide whitespace changes
Inline Side-by-side
Showing with 81 additions and 25 deletions
src/main/webapp/CHANGE_LOGS.html
View file @ b88c8e79
<!DOCTYPE html>
<html>
<head>
<meta name="viewport" content="initial-scale=1.0,user-scalable=no,maximum-scale=1,width=device-width">
<meta name="viewport" content="initial-scale=1.0,user-scalable=no,maximum-scale=1" media="(device-height: 568px)">
<title>Solo Change Logs</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link rel="apple-touch-icon" href="/favicon.png">
<style>
a {
color: #4285f4;
}
h2 {
margin: 20px 10px 0;
font-size: 20px;
}
ul {
margin-top: 0;
}
ul span {
font-size: 12px;
}
</style>
</head>
<body>
<h2>Release 2.1.0 - May 25, 2017</h2>
......
src/main/webapp/article-pwd.ftl
View file @ b88c8e79
......@@ -4,11 +4,10 @@
<h2>
${articleTitle}
</h2>
<br>
<#if msg??>
<div>${msg}</div>
</#if>
<form method="POST" action="${servePath}/console/article-pwd">
<form class="form" method="POST" action="${servePath}/console/article-pwd">
<label for="pwdTyped">访问密码：</label>
<input type="password" id="pwdTyped" name="pwdTyped" />
<input type="hidden" name="articleId" value="${articleId}" />
......
src/main/webapp/css/default-init.css
View file @ b88c8e79
......@@ -54,7 +54,6 @@ input {
font-size: 13px;
margin: 15px 0;
padding: 7px 8px;
transition: all 0.15s ease-in 0s;
vertical-align: middle;
width: 410px;
font-family: \5fae\8f6f\96c5\9ed1;
......@@ -142,7 +141,6 @@ button:active {
.wrap {
border-top: 5px solid #E6E5D9;
min-height: 400px;
padding: 110px 0;
background-color: #F3F1E5;
}
......@@ -157,10 +155,9 @@ button:active {
border-left: 1px solid #E6E5D9;
float: right;
font-size: 15px;
margin: 24px 0;
padding: 12px 24px;
padding: 20px;
width: 470px;
min-height: 300px;
min-height: 360px;
}
.main a {
......@@ -197,11 +194,6 @@ button:active {
/* end article-pwd */
/* start 403/404/500 */
.img-403, .img-500 {
margin: 20px 0 0 45px;
padding: 5px;
}
.a-403, .a-500, .a-404 {
margin: 20px 50px 0 0 ;
text-align: right;
......@@ -211,8 +203,12 @@ button:active {
margin: 10px 75px 0 0 ;
}
.img-500 {
margin: 20px 0 0 25px;
.img-500,
.img-403,
.img-404 {
max-width: 100%;
margin: 20px 0 ;
padding: 0;
}
.a-500 {
......@@ -250,10 +246,6 @@ button:active {
width: 470px;
}
#init .form {
padding: 10px 20px;
}
#init input,
.register input {
margin: 5px 0;
......@@ -282,3 +274,44 @@ button:active {
margin-left: 10px;
}
/* end init */
/* start responsive */
@media (max-width: 780px) {
.wrap {
padding: 40px 0;
}
.content {
width: auto;
}
.logo {
display: none;
}
.main {
border: 0;
float: none;
width: auto;
}
input {
width: 100%;
box-sizing: border-box;
display: block;
}
.a-500,
.a-403,
.a-404 {
margin: 0 20px 0 0;
}
#init {
width: 100%;
padding: 0 20px;
box-sizing: border-box;
left: 0;
}
}
/* end responsive */
\ No newline at end of file
src/main/webapp/error/404.ftl
View file @ b88c8e79
......@@ -2,7 +2,7 @@
<@commonPage "404 Not Found!">
<h2>404 Not Found!</h2>
<img class="img-t0t" width="488" src="${staticServePath}/images/404.gif" title="404" alt="404 Not Found!"/>
<img class="img-404" src="${staticServePath}/images/404.gif" title="404" alt="404 Not Found!"/>
<div class="a-404">
欢迎访问
<a href="https://hacpai.com">黑客与画家</a>
......
src/main/webapp/error/500.ftl
View file @ b88c8e79
......@@ -5,7 +5,7 @@
<img class="img-500" src="${staticServePath}/images/500.png" title="500: internal error" alt="500: internal error" />
<div class="a-500">
Please
<a href="https://github.com/b3log/solo/issues/new">report</a> it to help us.
<a href="https://github.com/b3log/solo/issues/new">report</a>.
Return to <a href="${servePath}">Index</a>.
</div>
</@commonPage>
\ No newline at end of file
src/main/webapp/init.ftl
View file @ b88c8e79
......@@ -62,7 +62,7 @@
var getUserInfo = function() {
if (validate()) {
$("#init").animate({
"top": -100
"top": -$('#user').height() + ($('.main h2').offset().top + 10)
});
$("#user").animate({
......@@ -87,7 +87,7 @@
var returnTo = function() {
$("#init").animate({
"top": 190
"top": $('.main h2').offset().top + 42
});
$("#user").animate({
......@@ -155,7 +155,7 @@
}
$('.main').css({
height: '336px',
height: '350px',
'overflow': 'hidden'
})
})();
......
src/main/webapp/js/common.js
View file @ b88c8e79
......@@ -64,9 +64,9 @@ var Util = {
var addKillPanel = function() {
if (Cookie.readCookie("showKill") === "") {
var left = ($(window).width() - 701) / 2,
top = ($(window).height() - 420) / 2;
top1 = ($(window).height() - 420) / 2;
$("body").append("<div style='display: block; height: 100%; width: 100%; position: fixed; background-color: rgb(0, 0, 0); opacity: 0.6; top: 0px;z-index:11'></div>"
+ "<iframe style='left:" + left + "px;z-index:20;top: " + top + "px; position: fixed; border: 0px none; width: 701px; height: 420px;' src='" + latkeConfig.servePath + "/kill-browser'></iframe>");
+ "<iframe style='left:" + left + "px;z-index:20;top: " + top1 + "px; position: fixed; border: 0px none; width: 701px; height: 420px;' src='" + latkeConfig.servePath + "/kill-browser'></iframe>");
}
};
......
src/main/webapp/macro-common-page.ftl
View file @ b88c8e79
......@@ -3,11 +3,14 @@
<html>
<head>
<meta charset="utf-8"/>
<meta name="viewport" content="initial-scale=1.0,user-scalable=no,maximum-scale=1,width=device-width">
<meta name="viewport" content="initial-scale=1.0,user-scalable=no,maximum-scale=1" media="(device-height: 568px)">
<meta name="robots" content="none"/>
<title><#if blogTitle??>${blogTitle} - </#if>${title}</title>
<link type="text/css" rel="stylesheet"
href="${staticServePath}/css/default-init${miniPostfix}.css?${staticResourceVersion}" charset="utf-8"/>
<link rel="icon" type="image/png" href="${staticServePath}/favicon.png"/>
<link rel="apple-touch-icon" href="${staticServePath}/favicon.png">
</head>
<body>
<div class="wrap">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment