xuemingqiang/leanote
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

default theme [ok]

Browse Source
This commit is contained in:
iiuazz
2014-09-12 21:40:14 +08:00
parent e6fb6e3f09
commit 8dd5239a8a
8 changed files with 177 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/views/Note/note-dev.html
View File

@ -13,6 +13,8 @@
<link rel="stylesheet" href="tinymce/skins/custom/skin.min.css" type="text/css" />
<!-- leanote css -->
<link href="css/font-awesome-4.0.3/css/font-awesome.css" rel="stylesheet" />
<link href="css/zTreeStyle/zTreeStyle.css" rel="stylesheet" />
<script>
var hash = location.hash;
if(hash == "#writing") {
@ -23,8 +25,6 @@ if(hash == "#writing") {
document.write(files);
</script>
<link href="css/font-awesome-4.0.3/css/font-awesome.css" rel="stylesheet" />
<link href="css/zTreeStyle/zTreeStyle.css" rel="stylesheet" />
<!-- For Develop writting mod -->
@ -253,7 +253,7 @@ function log(o) {
</span>
</div>
<ul class="folderBody" id="tagNav">
<ul class="folderBody clearfix" id="tagNav">
<li><a> <span class="label label-red">{{msg . "red"}}</span></a></li>
<li><a> <span class="label label-blue">{{msg . "blue"}}</span></a></li>
<li><a> <span class="label label-yellow">{{msg . "yellow"}}</span></a></li>

36
public/css/theme/basic.less
View File

@ -194,10 +194,14 @@
border-color: #ebeff2;
box-shadow: none;
}
#myNotebooks .folderBody {
padding-top: 3px;
}
#searchNotebookForList {
height: 30px;
width: 90%;
margin: 3px auto;
margin-top: 0;
border-color: #ebeff2;
box-shadow: none;
}
@ -260,3 +264,35 @@
border: 1px solid #eee;
border-radius: 3px;
}
// 设置
.notebook-setting {
display: none;
position: absolute;
right: 3px;
top: 0;
bottom: 0;
line-height: 30px;
}
.notebook-setting:before {
content: "\f013";
}
.ztree li a:hover .notebook-setting {
display: block;
}
#myTag .folderBody {
padding: 0 3px;
padding-bottom: 3px;
}
#myTag .folderBody li {
float: left;
padding: 3px;
line-height: normal;
}
#notebookList {
border-top: 1px solid rgba(255, 255, 255, 0.05);
}
.ztree {
padding: 0px;
}

86
public/css/theme/default.css
View File

@ -180,10 +180,14 @@
border-color: #ebeff2;
box-shadow: none;
}
#myNotebooks .folderBody {
padding-top: 3px;
}
#searchNotebookForList {
height: 30px;
width: 90%;
margin: 3px auto;
margin-top: 0;
border-color: #ebeff2;
box-shadow: none;
}
@ -236,6 +240,35 @@
border: 1px solid #eee;
border-radius: 3px;
}
.notebook-setting {
display: none;
position: absolute;
right: 3px;
top: 0;
bottom: 0;
line-height: 30px;
}
.notebook-setting:before {
content: "\f013";
}
.ztree li a:hover .notebook-setting {
display: block;
}
#myTag .folderBody {
padding: 0 3px;
padding-bottom: 3px;
}
#myTag .folderBody li {
float: left;
padding: 3px;
line-height: normal;
}
#notebookList {
border-top: 1px solid rgba(255, 255, 255, 0.05);
}
.ztree {
padding: 0px;
}
::selection {
background: #000000;
color: #ffffff;
@ -602,15 +635,6 @@ a.raw:hover {
width: 20px;
border-right: none;
}
.each-user ul {
list-style: none;
margin: 0;
padding: 0;
}
.each-user ul a {
padding-left: 20px;
font-size: 12px;
}
#myNotebooks.opened .fa-left {
/*
background-color: #65bd77;
@ -651,19 +675,22 @@ a.raw:hover {
.folderBody li {
line-height: 30px;
}
.folderBody a {
padding-left: 20px;
display: block;
color: #ADBECE;
cursor: pointer;
.ztree > li {
border-bottom: 1px solid transparent;
border-color: rgba(255, 255, 255, 0.05);
line-height: 35px;
}
.ztree li a.curSelectedNode {
background-color: rgba(0, 0, 0, 0.3);
border-radius: 3px;
color: #fff;
}
.ztree li a {
color: #ADBECE;
}
.folderBody a:hover,
.folderBody .contextmenu-hover {
color: #fff;
background-color: rgba(0, 0, 0, 0.05) !important;
background-color: rgba(0, 0, 0, 0.1) !important;
}
.folderBody a.active,
.folderBody a.active:hover {
@ -1312,17 +1339,22 @@ background-position:-1px -670px
overflow: scroll;
list-style: none;
}
.notebook-setting {
display: none;
position: absolute;
right: 3px;
top: 0;
bottom: 0;
line-height: 30px;
#searchNotebookForList {
border: 1px solid rgba(255, 255, 255, 0.3);
color: #ccc;
background-color: #37485e;
}
.notebook-setting:before {
content: "\f013";
#searchNotebookForList:focus {
outline: none !important;
box-shadow: none;
}
.ztree li a:hover .notebook-setting {
display: block;
.label-default {
background-color: #191D2B;
}
.each-user {
border: 1px solid rgba(0, 0, 0, 0.09);
background-color: #37485e;
}
#myShareNotebooks .folderBody {
background: none;
}

60
public/css/theme/default.less
View File

@ -398,15 +398,6 @@ a.raw:hover {
border-right: none;
}
}
.each-user ul {
list-style: none;
margin: 0;
padding:0;
a {
padding-left: 20px;
font-size: 12px;
}
}
#myNotebooks.opened .fa-left {
/*
@ -436,28 +427,32 @@ a.raw:hover {
.closed .folderBody {
display: none;
}
@leftBgColor: #37485e;
.folderBody {
list-style: none;
margin: 0;
padding: 0;
background-color: #37485e;
background-color: @leftBgColor;
}
.folderBody li {
line-height: 30px;
}
.folderBody a {
padding-left: 20px;
display: block;
color: #ADBECE;
cursor: pointer;
.ztree > li {
border-bottom: 1px solid transparent;
border-color: rgba(255,255,255,0.05);
line-height: 35px;
}
.ztree li a.curSelectedNode {
background-color: rgba(0,0,0,0.3);
border-radius: 3px;
color: #fff;
}
.ztree li a {
color: #ADBECE;
}
.folderBody a:hover, .folderBody .contextmenu-hover {
// background-color: @borderColor !important;
color: #fff;
background-color: rgba(0,0,0,0.05) !important;
background-color: rgba(0,0,0,0.1) !important;
}
.folderBody a.active, .folderBody a.active:hover {
background-color: #25313e !important; // @bgColor;
@ -1172,18 +1167,23 @@ background-position:-1px -670px
list-style: none;
}
// 设置
.notebook-setting {
display: none;
position: absolute;
right: 3px;
top: 0;
bottom: 0;
line-height: 30px;
//----------------------
#searchNotebookForList {
border: 1px solid rgba(255, 255, 255, 0.3);
color: #ccc;
background-color: @leftBgColor;
&:focus {
outline: none !important;
box-shadow: none;
}
}
.notebook-setting:before {
content: "\f013";
.label-default {
background-color: #191D2B;
}
.ztree li a:hover .notebook-setting {
display: block;
.each-user {
border: 1px solid rgba(0, 0, 0, 0.09);
background-color: @leftBgColor;
}
#myShareNotebooks .folderBody {
background: none;
}

51
public/css/theme/simple.css
View File

@ -180,10 +180,14 @@
border-color: #ebeff2;
box-shadow: none;
}
#myNotebooks .folderBody {
padding-top: 3px;
}
#searchNotebookForList {
height: 30px;
width: 90%;
margin: 3px auto;
margin-top: 0;
border-color: #ebeff2;
box-shadow: none;
}
@ -236,6 +240,35 @@
border: 1px solid #eee;
border-radius: 3px;
}
.notebook-setting {
display: none;
position: absolute;
right: 3px;
top: 0;
bottom: 0;
line-height: 30px;
}
.notebook-setting:before {
content: "\f013";
}
.ztree li a:hover .notebook-setting {
display: block;
}
#myTag .folderBody {
padding: 0 3px;
padding-bottom: 3px;
}
#myTag .folderBody li {
float: left;
padding: 3px;
line-height: normal;
}
#notebookList {
border-top: 1px solid rgba(255, 255, 255, 0.05);
}
.ztree {
padding: 0px;
}
::selection {
background: #000000;
color: #ffffff;
@ -589,15 +622,6 @@ a.raw:hover {
width: 20px;
border-right: none;
}
.each-user ul {
list-style: none;
margin: 0;
padding: 0;
}
.each-user ul a {
padding-left: 20px;
font-size: 12px;
}
#myNotebooks.opened .fa-left {
/*
background-color: #65bd77;
@ -634,12 +658,6 @@ a.raw:hover {
background-color: #ffffff;
color: #0fb264;
}
.folderBody a {
padding-left: 20px;
display: block;
color: #444;
cursor: pointer;
}
.folderBody a:hover,
.folderBody .contextmenu-hover {
background-color: #ebeff2 !important;
@ -1273,3 +1291,6 @@ background-position:-1px -670px
overflow: scroll;
list-style: none;
}
#notebookList {
border-top: 1px dashed #eee;
}

19
public/css/theme/simple.less
View File

@ -386,15 +386,6 @@ a.raw:hover {
border-right: none;
}
}
.each-user ul {
list-style: none;
margin: 0;
padding:0;
a {
padding-left: 20px;
font-size: 12px;
}
}
#myNotebooks.opened .fa-left {
/*
@ -431,12 +422,7 @@ a.raw:hover {
background-color: @bgColor;
color: @hColor;
}
.folderBody a {
padding-left: 20px;
display: block;
color: #444;
cursor: pointer;
}
.folderBody a:hover, .folderBody .contextmenu-hover {
background-color: @borderColor !important;
}
@ -1130,3 +1116,6 @@ background-position:-1px -670px
overflow: scroll;
list-style: none;
}
#notebookList {
border-top: 1px dashed #eee;
}

8
public/js/app/notebook.js
View File

@ -129,12 +129,19 @@ Notebook.getTreeSetting = function(isSearch, isShare){
var notebookId = treeNode.NotebookId;
Notebook.changeNotebook(notebookId);
};
var onDblClick = function(e) {
var notebookId = $(e.target).attr("notebookId");
if(!Notebook.isAllNotebookId(notebookId) && !Notebook.isTrashNotebookId(notebookId)) {
self.updateNotebookTitle(e.target);
}
}
} else {
var onClick = function(e, treeId, treeNode) {
var notebookId = treeNode.NotebookId;
var fromUserId = $(e.target).closest('.friend-notebooks').attr("fromUserId");
Share.changeNotebook(fromUserId, notebookId);
};
var onDblClick = null;
}
var setting = {
@ -167,6 +174,7 @@ Notebook.getTreeSetting = function(isSearch, isShare){
beforeDrop: beforeDrop,
onDrop: onDrop,
onClick: onClick,
onDblClick: onDblClick,
beforeRename: function(treeId, treeNode, newName, isCancel) {
if(newName == "") {
if(treeNode.IsNew) {

2
public/js/app/page.js
View File

@ -606,7 +606,7 @@ $(function() {
// 点击展开
$("#notebookMin div.minContainer").click(function() {
var target = $(this).attr("target");
maxLeft(false);
maxLeft(true);
if(target == "#notebookList") {
if($("#myNotebooks").hasClass("closed")) {
$("#myNotebooks .folderHeader").trigger("click");