Skip to content

Commit

Permalink
修改开源版本基础样式
Browse files Browse the repository at this point in the history
  • Loading branch information
livisky committed Jun 14, 2016
1 parent 1c72cb7 commit 868ce7a
Show file tree
Hide file tree
Showing 10 changed files with 129 additions and 114 deletions.
177 changes: 115 additions & 62 deletions liblog.sql

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
"dependencies": {
"babel-runtime": "6.x.x",
"geetest": "^1.0.1",
"jquery": "^2.2.2",
"marked": "^0.3.5",
"nodemailer": "^0.7.1",
"pm2": "^1.1.2",
Expand Down
6 changes: 3 additions & 3 deletions src/common/config/db.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ export default {
log_connect: true,
adapter: {
mysql: {
host: '127.0.0.1',
host: '139.196.185.229',
port: '3306',
database: 'liblog',
database: 'online',
user: 'root',
password: 'root',
password: '6286871',
prefix: 'li_',
encoding: 'utf8'
},
Expand Down
2 changes: 1 addition & 1 deletion src/home/controller/login.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ export default class extends Base {
await this.session("userInfo", info);
return this.json({status:1,msg:"登陆成功!"});
}else{
return this.json({status:0,msg:"用户名或密码错误!"});
return this.json({status:0,msg:"用户名或密码错误!"});
}
}

Expand Down
10 changes: 0 additions & 10 deletions view/home/inc/links.html

This file was deleted.

10 changes: 2 additions & 8 deletions view/home/inc/menu.html
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
<header class="header">
<div class="container">
<div class="logo">
<a href="/" title="" title="logo">
<img src="<%=_web.url%>static/common/images/common/logo.jpg" alt="前端汇"/>
</a>
<h1>Liblog <span style="font-size: 12px">v1.0</span></h1>
</div>
<div class="brand">你out了吗<br>www.jsout.com</div>
<ul class="site-nav site-navbar">
<li class="item current">
<a href="/"> 首页</a>
Expand Down Expand Up @@ -36,10 +33,7 @@
<div class="topbar">
<ul class="site-nav topmenu">
<li style="display: block;">
<a class="red" href="http://livisky.github.io/" target="_blank"><i class="glyphicon glyphicon-thumbs-up"></i>推荐:Liblog前端汇1.0</a>
</li>
<li>
<a href="/">前端汇</a>
<a class="red" href="http://livisky.github.io/" target="_blank"><i class="glyphicon glyphicon-thumbs-up"></i>推荐:Liblog v1.0</a>
</li>
<li>
<a href="/links.html">友情链接</a>
Expand Down
16 changes: 0 additions & 16 deletions view/home/inc/right.html
Original file line number Diff line number Diff line change
@@ -1,20 +1,4 @@
<style>
.qqlist{margin-left: -22px;}
.qqlist a{float: left;line-height: 35px;
height: 35px;margin-left: 4px;}
</style>
<DIV class="r_box f_r">
<div class="cloud qqregion">
<h3>交流咨询</h3>
<ul class="qqs">
<div>前端汇官方QQ群<br/>群号<span>256687601,欢迎加入!</span>
<div class="qqlist">
<a target="_blank" href="http://shang.qq.com/wpa/qunwpa?idkey=a9bb1b030c238e93e53f30003b0d31870533ba60902bc9733a72fca8342df7d8"><img border="0" src="<%=_web.url%>static/common/images/common/group.png" alt="前端汇-Liblog交流群" title="前端汇-Liblog交流群"></a>
<a target="_blank" href="http://shang.qq.com/wpa/qunwpa?idkey=a9bb1b030c238e93e53f30003b0d31870533ba60902bc9733a72fca8342df7d8"><img border="0" src="<%=_web.url%>static/common/images/common/group.png" alt="前端汇-Liblog交流群" title="前端汇-Liblog交流群"></a>
</div>
</div>
</ul>
</div>
<div class="tab" id="lp_right_select">

<div class="tab-top">
Expand Down
2 changes: 1 addition & 1 deletion view/home/login_index.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ <h3 class="panel-title">管理员登陆</h3>
</div>
<div class="form-group">
<label for="password">密码</label>
<input type="text" class="form-control" id="password" placeholder="密码"style="width: 440px;">
<input type="password" class="form-control" id="password" placeholder="密码"style="width: 440px;">
</div>
<button type="submit" class="btn btn-default" id="loginBtn">登陆</button>
</div>
Expand Down
11 changes: 0 additions & 11 deletions view/home/temp.html

This file was deleted.

8 changes: 7 additions & 1 deletion www/static/src/css/business/index/layout.css
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,13 @@ article.mainbd {
margin-bottom: 0px; border-bottom-color: currentColor; border-bottom-width: medium; border-bottom-style: none; box-shadow: none;
}
.logo {
width: 155px; overflow: hidden; padding-top: 5px; margin-top: -10px; margin-left: 6%; float: left;
padding-left: 10px;
overflow: hidden;
padding-top: 5px;
margin-top: -28px;
margin-left: 6%;
width:auto;
float: left;
}
.logo a {
background-position: 50% 50%; height: 44px; text-indent: -9999px; overflow: hidden; display: block; background-repeat: no-repeat;
Expand Down

0 comments on commit 868ce7a

Please sign in to comment.