zcy
/
MES-Springboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

pull/1/head
759675757@qq.com 2019-05-22 16:27:17 +08:00
parent e64fa80d25 fe236ca9b7
commit e711199666
3 changed files with 39 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
sparchetype/src/main/resources/static/img/blog/home-bg.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 169 KiB

After

Width:  |  Height:  |  Size: 447 KiB

62
sparchetype/src/main/resources/templates/client/blog/include.html
View File

@ -5,27 +5,35 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="description" content="">
<meta name="author" content="">
<title>bootdo面向学习型的开源框架</title>
<title>在进步的编程运动员</title>
<link href="/css/bootstrap.min.css" rel="stylesheet">
<link href="/css/blog/clean-blog.css" rel="stylesheet">
<link href="/css/font-awesome.min.css" rel="stylesheet">
<style type="text/css">
@media (max-width:768px){
.side{ display:none; }
@media (max-width: 768px) {
.side {
display: none;
}
}
@media (min-width:768px){
.side{ display:block; }
@media (min-width: 768px) {
.side {
display: block;
}
}
.side{
.side {
position: fixed;
width: 50px;
right: 5%;
bottom: 15%;
z-index: 100;
}
.side ul{
list-style:none;
.side ul {
list-style: none;
}
.side ul li {
width: 35px;
height: 35px;
@ -33,14 +41,15 @@
position: relative;
margin-top: 9px;
}
.side ul li .qqbdimg {
padding: 7px;
margin-top: 5px;
margin-bottom: 1px;
/* margin-left: 22px; */
position: absolute;
width: 53px;
height: 54px;
width: 54px;
height: 74px;
/* margin-left: 9px; */
bottom: 0;
right: -7px;
@ -52,21 +61,24 @@
font: 14px/54px "微软雅黑";
overflow: hidden;
}
.side ul li .qqbdimg:hover{
overflow:hidden;
.side ul li .qqbdimg:hover {
overflow: hidden;
padding: 7px;
margin-top: 5px;
width:124px;
height:124px;
opacity:1;
z-index:100;
right:0;
background:rgb(142, 142, 142);
width: 124px;
height: 124px;
opacity: 1;
z-index: 100;
right: 0;
background: rgb(142, 142, 142);
}
.side ul li img {
width: 100%;
height: 100%;
}
.side ul li .sidetop {
height: 100%;
display: block;
@ -88,7 +100,7 @@
class="icon-bar"></span> <span class="icon-bar"></span> <span
class="icon-bar"></span>
</button>
<a class="navbar-brand" href="/" style="font-size: 24px;">BootDo</a>
<a class="navbar-brand" href="/" style="font-size: 24px;">SongPeng</a>
</div>
<div class="collapse navbar-collapse"
id="bs-example-navbar-collapse-1">
@ -107,13 +119,13 @@
<div class="row">
<div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1">
<ul class="list-inline text-center">
<li><a href="https://jq.qq.com/?_wv=1027&k=5ICuFaQ"> <span
<li><a href="https://shang.qq.com/wpa/qunwpa?idkey=8d1883ba3decb39e0420f6f466e79bb5ba1fed279aca0197b3826975877786b5"> <span
class="fa-stack fa-lg"> <i
class="fa fa-circle fa-stack-2x"></i> <i
class="fa fa-qq fa-stack-1x fa-inverse"></i>
</span>
</a></li>
<li><a href="https://www.oschina.net/p/bootdo"> <span
<li><a href="/"> <span
class="fa-stack fa-lg"> <i
class="fa fa-circle fa-stack-2x"></i> <i
class="fa fa-home fa-stack-1x fa-inverse"></i>
@ -126,15 +138,15 @@
</span>
</a></li>
</ul>
<p class="copyright text-muted">Copyright &copy; bootdo.com
2017</p>
<p class="copyright text-muted">鲁ICP备17042918号</p>
<p class="copyright text-muted">Copyright &copy; iamsongpeng.com
2019</p>
<p class="copyright text-muted">浙ICP备10241024号</p>
</div>
</div>
</div>
</footer>
<div class="side" >
<div class="side">
<ul>
<li>
<div class="qqbdimg">

4
sparchetype/src/main/resources/templates/client/blog/index.html
View File

@ -11,8 +11,8 @@
<div class="row">
<div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1">
<div class="site-heading">
<h1>BootDo Blog</h1>
<span class="subheading">bootdo 博客</span>
<h1>SongPeng Blog</h1>
<span class="subheading">宋鹏的博客</span>
</div>
</div>
</div>