Merge remote-tracking branch 'origin/wangh_branch' into wangh_branch

# Conflicts:
#	src/demo/src/main/resources/templates/index.html
wangh_branch
王壕 3 years ago
commit 35fd05457e

@ -13,4 +13,4 @@ spring:
username: root username: root
password: root password: root
thymeleaf: thymeleaf:
cache: false cache: false

@ -1,5 +1,5 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en" xmlns:th="http://www.thymeleaf.org">
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"> <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
@ -8,25 +8,25 @@
<title>Signin Template for Bootstrap</title> <title>Signin Template for Bootstrap</title>
<!-- Bootstrap core CSS --> <!-- Bootstrap core CSS -->
<link rel="stylesheet" href="/css/bootstrap.min.css"> <link rel="stylesheet" th:href="@{/css/bootstrap.min.css}">
<!-- Custom styles for this template --> <!-- Custom styles for this template -->
<link rel="stylesheet" href="/css/signin.css"> <link rel="stylesheet" th:href="@{/css/signin.css}">
</head> </head>
<body class="text-center"> <body class="text-center">
<form class="form-signin" action="web/dashboard"> <form class="form-signin" action="dashboard.html">
<img class="mb-4" src="/img/bootstrap-solid.svg" alt="" width="72" height="72"> <img class="mb-4" th:src="@{/img/bootstrap-solid.svg}" alt="" width="72" height="72">
<h1 class="h3 mb-3 font-weight-normal">Please sign in</h1> <h1 class="h3 mb-3 font-weight-normal">Please sign in</h1>
<label class="sr-only">Username</label> <label class="sr-only">Username</label>
<input type="text" class="form-control" placeholder="微信授权登录(未实现)" required="" autofocus=""> <input type="text" class="form-control" placeholder="微信授权登录(未实现)" required="" autofocus="">
<div class="checkbox mb-3"> <div class="checkbox mb-3">
<label> <label>
<input type="checkbox" value="remember-me"> Remember me <input type="checkbox" value="remember-me"> Remember me
</label> </label>
</div> </div>
<button class="btn btn-lg btn-primary btn-block" type="submit">Sign in</button> <button class="btn btn-lg btn-primary btn-block" type="submit">Sign in</button>
<p class="mt-5 mb-3 text-muted">© 2017-2018</p> <p class="mt-5 mb-3 text-muted">© 2017-2018</p>

Loading…
Cancel
Save