基本样式修改

This commit is contained in:
life
2015-02-06 21:04:54 +08:00
parent ec4e790449
commit 19eb994845
10 changed files with 447 additions and 248 deletions

226
note.html
View File

@@ -42,60 +42,11 @@ function log(o) {
<div id="page"> <div id="page">
<div id="pageInner"> <div id="pageInner">
<!-- 头部 --> <!-- header start -->
<!-- <div id="headerContainer"> --> <div id="header" style="display: none">
<div id="header">
<!--
<div id="headerLeft" class="pull-left">
</div>
-->
<div id="logo" class="pull-left">
<!--<span>lea</span>note -->
<!--<img style="height: 45px;" src="/images/logo/leanote_white.png" title="leanote, 不一样的笔记" alt="leanote">-->
</div>
<div id="switcher" class="pull-left">
<i class="fa fa-align-justify" id="leftSwitcher" title="Hidden slide bar"></i>
<span id="leftSwitcher2" title="Show slide bar"></span>
</div>
<!-- search -->
<div class="pull-left" id="searchWrap">
<form class="navbar-form form-inline col-lg-2" id="searchNote">
<input class="form-control" placeholder="Search" type="text" id="searchNoteInput">
</form>
</div>
<!-- 全局按钮 --> <!-- 全局按钮 -->
<div class="pull-left" style="" id="newNoteWrap"> <div class="pull-left" style="" id="newNoteWrap">
<!-- 新建笔记 --> <!-- 新建笔记 -->
<div id="newMyNote">
<a id="newNoteBtn" title="New note">
<i class="fa fa-file-o"></i>
<span class="new-note-text">New note</span>
<span class="new-note-text-abbr">New</span>
</a>
<span class="new-split">|</span>
<a id="newNoteMarkdownBtn" title="New markdown note">
<span class="new-markdown-text">New Markdown</span>
<span class="new-markdown-text-abbr">Md</span>
</a>
<span class="for-split"> - </span>
<span id="curNotebookForNewNote" notebookId=""></span>
<!--
<div class="dropdown" style="display: inline-block">
<a class="ios7-a dropdown-toggle"
id="listNotebookDropdownMenu" data-toggle="dropdown">
<i class="fa fa-angle-down"></i>
</a>
<div class="dropdown-menu dropdown-list" id="searchNotebookForAddDropdownList">
<input type="text" placeholder="Search notebook" class="form-control" id="searchNotebookForAdd"/>
<ul class="clearfix" role="menu" aria-labelledby="listNotebookDropdownMenu" id="notebookNavForNewNote">
</ul>
</div>
</div>
-->
</div>
<!-- 只为新建别人的笔记 --> <!-- 只为新建别人的笔记 -->
<div id="newSharedNote" style="display: none"> <div id="newSharedNote" style="display: none">
<a id="newSharedNoteBtn"> <a id="newSharedNoteBtn">
@@ -127,30 +78,6 @@ function log(o) {
</span> </span>
</div> </div>
<div class="pull-right" style="margin: 0 10px" id="myProfile">
<div class="dropdown">
<a class="dropdown-toggle" title="{{.userInfo.Username}}" data-toggle="dropdown" style="line-height: 60px;">
<span class="username">
lif@leanote.com
</span>
<i class="fa fa-angle-down"></i>
</a>
<ul class="dropdown-menu li-a" role="menu">
<li role="presentation" class="my-link" >
<a target="_blank" href="{{$.blogUrl}}/{{.userInfo.Username}}">
<i class="fa fa-bold"></i>
Blog</a>
</li>
<li role="presentation" class="divider"></li>
<li role="presentation" onclick="logout()">
<i class="fa fa-sign-out"></i>
Logout
</li>
</ul>
</div>
</div>
<div class="pull-right top-nav writting-hide" id="myBlog"> <div class="pull-right top-nav writting-hide" id="myBlog">
<a target="_blank" href="{{$.blogUrl}}/{{.userInfo.Username}}"> <a target="_blank" href="{{$.blogUrl}}/{{.userInfo.Username}}">
Blog Blog
@@ -159,6 +86,7 @@ function log(o) {
<div style="clear: both"></div> <div style="clear: both"></div>
</div> </div>
<!-- header end -->
<div id="mainContainer" class="clearfix"> <div id="mainContainer" class="clearfix">
<div id="mainMask"> <div id="mainMask">
@@ -169,6 +97,20 @@ function log(o) {
</div> </div>
<div id="leftNotebook"> <div id="leftNotebook">
<div id="notebook"> <div id="notebook">
<div class="folderNote closed" id="myShareNotebooks">
<div class="folderHeader">
<i class="fa fa-star-o fa-left"></i>
<span>
Started
</span>
</div>
<ul class="folderBody" id="shareNotebooks">
<li>a</li>
</ul>
</div>
<div class="folderNote opened" id="myNotebooks"> <div class="folderNote opened" id="myNotebooks">
<div class="folderHeader clearfix"> <div class="folderHeader clearfix">
<i class="fa fa-book pull-left fa-left"></i> <i class="fa fa-book pull-left fa-left"></i>
@@ -203,16 +145,14 @@ function log(o) {
</ul> </ul>
</div> </div>
<div class="folderNote closed" id="myShareNotebooks"> <!-- Trash -->
<div class="folderTrash closed" id="">
<div class="folderHeader"> <div class="folderHeader">
<i class="fa fa-file fa-left"></i> <i class="fa fa-trash fa-left"></i>
<span> <span>
Recent Notes Trash
</span> </span>
</div> </div>
<ul class="folderBody" id="shareNotebooks">
</ul>
</div> </div>
<!-- <!--
@@ -253,11 +193,37 @@ function log(o) {
</div> </div>
<!-- <!--
底下隐藏/展开 底下
<div id="notebookBottom"> 用于同步
<i class="fa fa-angle-left" id="leftSwitcher"></i>
</div>
--> -->
<div id="notebookBottom" class="clearfix">
<!-- fa-spin -->
<a class="pull-left sync-icon"><i class="fa fa-refresh"></i></a>
<div class="pull-right" id="myProfile">
<div class="dropdown">
<a class="dropdown-toggle" title="{{.userInfo.Username}}" data-toggle="dropdown">
<span class="username">
life@leanote.com
</span>
<i class="fa fa-angle-down"></i>
</a>
<ul class="dropdown-menu li-a" role="menu">
<li role="presentation" class="my-link" >
<a target="_blank" href="{{$.blogUrl}}/{{.userInfo.Username}}">
<i class="fa fa-bold"></i>
Blog</a>
</li>
<li role="presentation" class="divider"></li>
<li role="presentation" onclick="logout()">
<i class="fa fa-sign-out"></i>
Logout
</li>
</ul>
</div>
</div>
</div>
</div> </div>
<div class="noteSplit" id="notebookSplitter"></div> <div class="noteSplit" id="notebookSplitter"></div>
@@ -268,69 +234,40 @@ function log(o) {
<br /> <br />
loading... loading...
</div> </div>
<div id="noteList"> <div id="noteList">
<div class="clearfix" id="notesAndSort" style="position: relative"> <div class="clearfix" id="notesAndSort" style="position: relative">
<div class="pull-left">
<a id="sortType">
<i class="fa fa-sort-amount-desc"></i>
</a>
<!-- 我的笔记本 --> <!-- 我的笔记本 -->
<div class="dropdown" id="myNotebookNavForListNav"> <div id="myNotebookNavForListNav">
<a class="ios7-a dropdown-toggle" id="dropdownMenu1" data-toggle="dropdown">
<span id="curNotebookForListNote">Newest</span> <span id="curNotebookForListNote">Newest</span>
<!--
<i class="fa fa-angle-down"></i>
-->
</a>
<!-- 如果notebook过多, 则会产生滚动 弃用
<div class="dropdown-menu dropdown-list" style="left: 5px;">
<ul role="menu" aria-labelledby="dropdownMenu1" id="notebookNavForListNote"></ul>
</div>
-->
</div>
<!-- 共享的笔记本 -->
<div class="dropdown" id="sharedNotebookNavForListNav" style="display: none">
<a class="ios7-a dropdown-toggle" id="dropdownMenu2" data-toggle="dropdown">
<span id="curSharedNotebookForListNote">Newest</span>
<!--
<i class="fa fa-angle-down"></i>
-->
</a>
<ul class="dropdown-menu" role="menu"
aria-labelledby="dropdownMenu2" style="left: 5px;" id="sharedNotebookNavForListNote">
</ul>
</div>
</div> </div>
<div class="pull-left" id="tagSearch" style="line-height: 38px"> <div class="pull-left" id="tagSearch" style="line-height: 38px">
</div> </div>
<div id="sortType">
<div class="dropdown"> <div id="newMyNote">
<a class="ios7-a dropdown-toggle" id="dropdownMenu1" <a id="newNoteBtn" title="New note">
data-toggle="dropdown"> <span class="new-note-text" title="New note">+</span>
<!--
<i class="fa fa-sort-alpha-asc">
</i>Sort <i class="fa fa-angle-down"></i>
-->
</a> </a>
<!-- <span class="new-split">|</span>
<ul class="dropdown-menu" role="menu" <a id="newNoteMarkdownBtn" title="New markdown note">
aria-labelledby="dropdownMenu1" <span class="new-markdown-text" title="New markdown note">+M</span>
style="right: 3px; ! important; left: -100px; min-width: 100px;"> </a>
<li role="presentation"><a role="menuitem" tabindex="-1" <span id="curNotebookForNewNote" notebookId="" style="display: none"></span>
href="#">创建日期</a></li>
<li role="presentation"><a role="menuitem" tabindex="-1"
href="#">修改日期</a></li>
<li role="presentation"><a role="menuitem" tabindex="-1"
href="#">标题</a></li>
<li role="presentation" class="divider"></li>
<li role="presentation"><a role="menuitem" tabindex="-1"
href="#">Separated </a></li>
</ul>
-->
</div>
</div> </div>
</div> </div>
<!-- 搜索 -->
<form class="navbar-form form-inline" id="searchNote">
<input class="form-control" placeholder="Search" type="text" id="searchNoteInput">
</form>
<!-- 笔记列表 --> <!-- 笔记列表 -->
<!-- wrap 为了slimScroll --> <!-- wrap 为了slimScroll -->
<div id="noteItemListWrap"> <div id="noteItemListWrap">
@@ -423,10 +360,13 @@ function log(o) {
<ul class="pull-right" id="editorTool"> <ul class="pull-right" id="editorTool">
<!--
<li><a class="ios7-a " id="saveBtn" title="Save ctrl+s" <li><a class="ios7-a " id="saveBtn" title="Save ctrl+s"
data-toggle="dropdown"> data-toggle="dropdown">
<span class="fa fa-save"></span> <span class="fa fa-save"></span>
</a></li> </a>
</li>
-->
<li class="dropdown" id="attachDropdown"> <li class="dropdown" id="attachDropdown">
<a class="ios7-a dropdown-toggle" data-toggle="dropdown" id="showAttach" title="Attachments"> <a class="ios7-a dropdown-toggle" data-toggle="dropdown" id="showAttach" title="Attachments">
@@ -435,7 +375,6 @@ function log(o) {
</a> </a>
<div class="dropdown-menu" id="attachMenu"> <div class="dropdown-menu" id="attachMenu">
<ul id="attachList"> <ul id="attachList">
</ul> </ul>
<form id="uploadAttach" method="post" action="/attach/UploadAttach" enctype="multipart/form-data"> <form id="uploadAttach" method="post" action="/attach/UploadAttach" enctype="multipart/form-data">
<div id="dropAttach" class="dropzone"> <div id="dropAttach" class="dropzone">
@@ -461,14 +400,23 @@ function log(o) {
</div> </div>
</li> </li>
<!--
<li><a class="ios7-a " id="tipsBtn" <li><a class="ios7-a " id="tipsBtn"
data-toggle="dropdown" title="Tips"> data-toggle="dropdown" title="Tips">
<span class="fa fa-question"></span> <span class="fa fa-question"></span>
</a></li> </a>
</li>
-->
<li><a class="ios7-a " id="contentHistory" <li><a class="ios7-a " id="contentHistory"
data-toggle="dropdown" title="Histories"> data-toggle="dropdown" title="Histories">
<span class="fa fa-history"></span> <span class="fa fa-history"></span>
</a></li> </a></li>
<li><a class="ios7-a " id="expand"
data-toggle="dropdown" title="Expand">
<span class="fa fa-expand"></span>
</a></li>
</ul> </ul>
</div> </div>

View File

@@ -4,7 +4,7 @@
"version": "0.1", "version": "0.1",
"main": "index.html", "main": "index.html",
"window": { "window": {
"toolbar": true, "toolbar": false,
"frame": true, "frame": true,
"min_width": 400, "min_width": 400,
"min_height": 200, "min_height": 200,

View File

@@ -209,6 +209,7 @@ h1, h2, h3 {
overflow-x: hidden; overflow-x: hidden;
overflow-y: hidden; overflow-y: hidden;
*/ */
background: #fcfcfc;
} }
// 笔记列表与editor的遮罩 // 笔记列表与editor的遮罩
#noteAndEditorMask { #noteAndEditorMask {
@@ -453,9 +454,10 @@ h1, h2, h3 {
#myTag .folderBody { #myTag .folderBody {
padding: 0 3px; padding: 0 3px;
padding-bottom: 3px; padding-bottom: 3px;
padding-left: 5px;
} }
#myTag .folderBody li { #myTag .folderBody li {
float: left; // float: left;
padding: 3px; padding: 3px;
line-height: normal; line-height: normal;
} }
@@ -727,7 +729,8 @@ h1, h2, h3 {
} }
#noteItemListWrap { #noteItemListWrap {
position: absolute; left: 0; right: 0; position: absolute; left: 0; right: 0;
top: 36px; bottom: 3px; top: 69px;
bottom: 3px;
} }
// ------------------- // -------------------
@@ -1185,3 +1188,64 @@ top: 4px;
.close:focus { .close:focus {
outline: none; outline: none;
} }
//
.sync-icon {
padding: 0 3px;
}
#newMyNote {
position: absolute;
right: 3px;
top: 0;
bottom: 0;
line-height: 30px;
width: 50px;
* {
font-size: 14px;
}
.new-split {
// font-size: 12px;
color: #ccc;
display: none;
}
#newNoteBtn {
display: inline-block;
border: 1px solid #eee;
border-radius: 5px;
text-align: center;
height: 25px;
width: 20px;
line-height: initial;
}
#newNoteMarkdownBtn {
display: inline-block;
border: 1px solid #eee;
border-radius: 5px;
/* width: 100px; */
margin-left: 1px;
padding: 0 1px;
height: 25px;
line-height: initial;
text-align: center;
}
}
#myNotebookNavForListNav {
position: absolute;
line-height: 30px;
left: 55px;
right: 55px;
text-align: center;
font-style: 16px;
text-overflow:ellipsis; white-space:nowrap; overflow:hidden;
}
#searchNote {
margin-top: 2px;
}
#sortType {
position: absolute;
left: 4px;
line-height: 36px;
color: #ccc;
}

View File

@@ -202,6 +202,7 @@ h3 {
overflow-x: hidden; overflow-x: hidden;
overflow-y: hidden; overflow-y: hidden;
*/ */
background: #fcfcfc;
} }
#noteAndEditorMask { #noteAndEditorMask {
position: absolute; position: absolute;
@@ -415,9 +416,9 @@ h3 {
#myTag .folderBody { #myTag .folderBody {
padding: 0 3px; padding: 0 3px;
padding-bottom: 3px; padding-bottom: 3px;
padding-left: 5px;
} }
#myTag .folderBody li { #myTag .folderBody li {
float: left;
padding: 3px; padding: 3px;
line-height: normal; line-height: normal;
} }
@@ -675,7 +676,7 @@ h3 {
position: absolute; position: absolute;
left: 0; left: 0;
right: 0; right: 0;
top: 36px; top: 69px;
bottom: 3px; bottom: 3px;
} }
#mdEditorPreview { #mdEditorPreview {
@@ -1077,6 +1078,64 @@ h3 {
.close:focus { .close:focus {
outline: none; outline: none;
} }
.sync-icon {
padding: 0 3px;
}
#newMyNote {
position: absolute;
right: 3px;
top: 0;
bottom: 0;
line-height: 30px;
width: 50px;
}
#newMyNote * {
font-size: 14px;
}
#newMyNote .new-split {
color: #ccc;
display: none;
}
#newMyNote #newNoteBtn {
display: inline-block;
border: 1px solid #eee;
border-radius: 5px;
text-align: center;
height: 25px;
width: 20px;
line-height: initial;
}
#newMyNote #newNoteMarkdownBtn {
display: inline-block;
border: 1px solid #eee;
border-radius: 5px;
/* width: 100px; */
margin-left: 1px;
padding: 0 1px;
height: 25px;
line-height: initial;
text-align: center;
}
#myNotebookNavForListNav {
position: absolute;
line-height: 30px;
left: 55px;
right: 55px;
text-align: center;
font-style: 16px;
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
}
#searchNote {
margin-top: 2px;
}
#sortType {
position: absolute;
left: 4px;
line-height: 36px;
color: #ccc;
}
::selection { ::selection {
background: #000000; background: #000000;
color: #ffffff; color: #ffffff;
@@ -1234,7 +1293,7 @@ a.raw:hover {
} }
#mainContainer { #mainContainer {
position: absolute; position: absolute;
top: 59px; top: 0;
left: 0; left: 0;
right: 0; right: 0;
bottom: 0; bottom: 0;

View File

@@ -188,7 +188,7 @@ a.raw:hover {
} }
#mainContainer { #mainContainer {
position: absolute; position: absolute;
top: @headerHeightNoBorder; top: 0;
left: 0; left: 0;
right: 0; right: 0;
bottom: 0; bottom: 0;

View File

@@ -202,6 +202,7 @@ h3 {
overflow-x: hidden; overflow-x: hidden;
overflow-y: hidden; overflow-y: hidden;
*/ */
background: #fcfcfc;
} }
#noteAndEditorMask { #noteAndEditorMask {
position: absolute; position: absolute;
@@ -415,9 +416,9 @@ h3 {
#myTag .folderBody { #myTag .folderBody {
padding: 0 3px; padding: 0 3px;
padding-bottom: 3px; padding-bottom: 3px;
padding-left: 5px;
} }
#myTag .folderBody li { #myTag .folderBody li {
float: left;
padding: 3px; padding: 3px;
line-height: normal; line-height: normal;
} }
@@ -675,7 +676,7 @@ h3 {
position: absolute; position: absolute;
left: 0; left: 0;
right: 0; right: 0;
top: 36px; top: 69px;
bottom: 3px; bottom: 3px;
} }
#mdEditorPreview { #mdEditorPreview {
@@ -1077,6 +1078,64 @@ h3 {
.close:focus { .close:focus {
outline: none; outline: none;
} }
.sync-icon {
padding: 0 3px;
}
#newMyNote {
position: absolute;
right: 3px;
top: 0;
bottom: 0;
line-height: 30px;
width: 50px;
}
#newMyNote * {
font-size: 14px;
}
#newMyNote .new-split {
color: #ccc;
display: none;
}
#newMyNote #newNoteBtn {
display: inline-block;
border: 1px solid #eee;
border-radius: 5px;
text-align: center;
height: 25px;
width: 20px;
line-height: initial;
}
#newMyNote #newNoteMarkdownBtn {
display: inline-block;
border: 1px solid #eee;
border-radius: 5px;
/* width: 100px; */
margin-left: 1px;
padding: 0 1px;
height: 25px;
line-height: initial;
text-align: center;
}
#myNotebookNavForListNav {
position: absolute;
line-height: 30px;
left: 55px;
right: 55px;
text-align: center;
font-style: 16px;
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
}
#searchNote {
margin-top: 2px;
}
#sortType {
position: absolute;
left: 4px;
line-height: 36px;
color: #ccc;
}
::selection { ::selection {
background: #000000; background: #000000;
color: #ffffff; color: #ffffff;
@@ -1161,22 +1220,27 @@ a.raw:hover {
color: #0fb264; color: #0fb264;
} }
#searchNote { #searchNote {
padding-left: 0; padding: 0 10px;
line-height: 60px; line-height: 30px;
width: 100%;
margin: 0; margin: 0;
margin-top: 2px;
} }
#searchNote input { #searchNote input {
background-size: 18px 13px; background-size: 18px 13px;
border-color: #ebeff2; border-color: #ebeff2;
padding-left: 14px; padding-left: 10px;
height: 30px; height: 30px;
width: 250px;
line-height: 20px; line-height: 20px;
box-shadow: none; box-shadow: none;
display: block;
width: 93%;
margin: 0 auto;
outline: none;
} }
#searchNote input:focus { #searchNote input:focus,
#searchNote input:active {
outline: none !important; outline: none !important;
border-color: #0fb264;
box-shadow: none; box-shadow: none;
} }
#header ul { #header ul {
@@ -1210,31 +1274,6 @@ a.raw:hover {
background-color: #ebeff2; background-color: #ebeff2;
} }
/*********************/ /*********************/
#page {
overflow: auto;
position: absolute;
top: 0;
left: 0;
bottom: 0;
right: 0;
}
#pageInner {
position: absolute;
top: 0;
left: 0;
height: 100%;
width: 100%;
overflow: hidden;
}
#mainContainer {
position: absolute;
top: 60px;
left: 0;
right: 0;
bottom: 0;
overflow: auto;
zoom: 1;
}
#mainMask { #mainMask {
position: absolute; position: absolute;
left: 0; left: 0;
@@ -1263,11 +1302,11 @@ a.raw:hover {
#notebookMin { #notebookMin {
position: absolute; position: absolute;
left: 0; left: 0;
bottom: 0; bottom: 30px;
top: 0; top: 0;
right: 0; right: 0;
/*border: 1px solid #ccc;*/ /*border: 1px solid #ccc;*/
background-color: #ffffff; background-color: #f5f6f7;
overflow-y: auto; overflow-y: auto;
overflow-x: auto; overflow-x: auto;
z-index: 2; z-index: 2;
@@ -1325,12 +1364,9 @@ a.raw:hover {
line-height: 30px; line-height: 30px;
text-align: right; text-align: right;
padding-right: 5px; padding-right: 5px;
background-color: #eee; background-color: #f5f6f7;
} border-top: 1px solid transparent;
#notebookBottom #leftSwitcher { border-color: rgba(0, 0, 0, 0.05);
border: 1px solid #ccc;
padding: 3px 8px;
cursor: pointer;
} }
#noteAndEditor { #noteAndEditor {
position: absolute; position: absolute;
@@ -1501,11 +1537,6 @@ a.raw:hover {
background-color: #ffffff; background-color: #ffffff;
border-bottom: 1px solid #ebeff2; border-bottom: 1px solid #ebeff2;
} }
#sortType {
/* position: absolute;
right:0;*/
float: right;
}
/* editor */ /* editor */
#editorTool { #editorTool {
margin: 0; margin: 0;
@@ -1624,7 +1655,7 @@ a.raw:hover {
background-color: #5cb85c; background-color: #5cb85c;
} }
.label { .label {
border-radius: 0; border-radius: 3px;
font-weight: normal; font-weight: normal;
} }
.label i { .label i {

View File

@@ -99,21 +99,29 @@ a.raw:hover {
} }
} }
#searchNote { #searchNote {
padding-left: 0; // padding-left: 0;
line-height: 60px; // padding-right: 0;
padding: 0 10px;
line-height: 30px;
width: 100%;
margin:0; margin:0;
margin-top: 2px;
input { input {
background-size: 18px 13px; background-size: 18px 13px;
border-color: @borderColor; border-color: @borderColor;
padding-left: 14px; padding-left: 10px;
height: 30px; height: 30px;
width: 250px; // width: 250px;
line-height: 20px; line-height: 20px;
box-shadow: none; box-shadow: none;
&:focus { display: block;
width: 93%;
margin: 0 auto;
outline: none;
&:focus, &:active {
outline: none !important; outline: none !important;
border-color: @hColor; // border-color: @hColor;
box-shadow: none; box-shadow: none;
} }
} }
@@ -160,31 +168,7 @@ a.raw:hover {
} }
/*********************/ /*********************/
#page {
overflow: auto;
position: absolute;
top: 0;
left: 0;
bottom: 0;
right: 0;
}
#pageInner {
position: absolute;
top: 0;
left: 0;
height: 100%;
width: 100%;
overflow: hidden;
}
#mainContainer {
position: absolute;
top: @headerHeight;
left: 0;
right: 0;
bottom: 0;
overflow: auto;
zoom: 1;
}
#mainMask { #mainMask {
position: absolute; position: absolute;
left: 0; left: 0;
@@ -214,12 +198,12 @@ a.raw:hover {
#notebook, #notebookMin { #notebook, #notebookMin {
position: absolute; position: absolute;
left: 0; left: 0;
// bottom: 30px; 为了给bottom bottom: 30px; // 为了给bottom
bottom: 0; // bottom: 0;
top: 0; top: 0;
right: 0; right: 0;
/*border: 1px solid #ccc;*/ /*border: 1px solid #ccc;*/
background-color: @bgColor; background-color: #f5f6f7;
overflow-y: auto; overflow-y: auto;
overflow-x: auto; overflow-x: auto;
z-index: 2; z-index: 2;
@@ -282,12 +266,10 @@ a.raw:hover {
line-height: 30px; line-height: 30px;
text-align: right; text-align: right;
padding-right: 5px; padding-right: 5px;
background-color: #eee; background-color: #f5f6f7;
#leftSwitcher { border-top: 1px solid transparent;
border: 1px solid #ccc; border-color: rgba(0, 0, 0, 0.05);
padding: 3px 8px;
cursor: pointer;
}
} }
#noteAndEditor { #noteAndEditor {
@@ -470,11 +452,7 @@ a.raw:hover {
background-color: @bgColor; background-color: @bgColor;
border-bottom: 1px solid @borderColor; border-bottom: 1px solid @borderColor;
} }
#sortType {
/* position: absolute;
right:0;*/
float: right;
}
/* editor */ /* editor */
#editorTool { #editorTool {
@@ -612,7 +590,7 @@ a.raw:hover {
background-color: #5cb85c; background-color: #5cb85c;
} }
.label { .label {
border-radius: 0; border-radius: 3px;
font-weight: normal; font-weight: normal;
} }
.label i { .label i {
@@ -847,3 +825,4 @@ background-position:-1px -670px
} }
@import "mobile.less"; @import "mobile.less";

View File

@@ -202,6 +202,7 @@ h3 {
overflow-x: hidden; overflow-x: hidden;
overflow-y: hidden; overflow-y: hidden;
*/ */
background: #fcfcfc;
} }
#noteAndEditorMask { #noteAndEditorMask {
position: absolute; position: absolute;
@@ -415,9 +416,9 @@ h3 {
#myTag .folderBody { #myTag .folderBody {
padding: 0 3px; padding: 0 3px;
padding-bottom: 3px; padding-bottom: 3px;
padding-left: 5px;
} }
#myTag .folderBody li { #myTag .folderBody li {
float: left;
padding: 3px; padding: 3px;
line-height: normal; line-height: normal;
} }
@@ -675,7 +676,7 @@ h3 {
position: absolute; position: absolute;
left: 0; left: 0;
right: 0; right: 0;
top: 36px; top: 69px;
bottom: 3px; bottom: 3px;
} }
#mdEditorPreview { #mdEditorPreview {
@@ -1077,6 +1078,64 @@ h3 {
.close:focus { .close:focus {
outline: none; outline: none;
} }
.sync-icon {
padding: 0 3px;
}
#newMyNote {
position: absolute;
right: 3px;
top: 0;
bottom: 0;
line-height: 30px;
width: 50px;
}
#newMyNote * {
font-size: 14px;
}
#newMyNote .new-split {
color: #ccc;
display: none;
}
#newMyNote #newNoteBtn {
display: inline-block;
border: 1px solid #eee;
border-radius: 5px;
text-align: center;
height: 25px;
width: 20px;
line-height: initial;
}
#newMyNote #newNoteMarkdownBtn {
display: inline-block;
border: 1px solid #eee;
border-radius: 5px;
/* width: 100px; */
margin-left: 1px;
padding: 0 1px;
height: 25px;
line-height: initial;
text-align: center;
}
#myNotebookNavForListNav {
position: absolute;
line-height: 30px;
left: 55px;
right: 55px;
text-align: center;
font-style: 16px;
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
}
#searchNote {
margin-top: 2px;
}
#sortType {
position: absolute;
left: 4px;
line-height: 36px;
color: #ccc;
}
@font-face { @font-face {
font-family: 'Open Sans'; font-family: 'Open Sans';
font-style: normal; font-style: normal;

View File

@@ -202,6 +202,7 @@ h3 {
overflow-x: hidden; overflow-x: hidden;
overflow-y: hidden; overflow-y: hidden;
*/ */
background: #fcfcfc;
} }
#noteAndEditorMask { #noteAndEditorMask {
position: absolute; position: absolute;
@@ -415,9 +416,9 @@ h3 {
#myTag .folderBody { #myTag .folderBody {
padding: 0 3px; padding: 0 3px;
padding-bottom: 3px; padding-bottom: 3px;
padding-left: 5px;
} }
#myTag .folderBody li { #myTag .folderBody li {
float: left;
padding: 3px; padding: 3px;
line-height: normal; line-height: normal;
} }
@@ -675,7 +676,7 @@ h3 {
position: absolute; position: absolute;
left: 0; left: 0;
right: 0; right: 0;
top: 36px; top: 69px;
bottom: 3px; bottom: 3px;
} }
#mdEditorPreview { #mdEditorPreview {
@@ -1077,6 +1078,64 @@ h3 {
.close:focus { .close:focus {
outline: none; outline: none;
} }
.sync-icon {
padding: 0 3px;
}
#newMyNote {
position: absolute;
right: 3px;
top: 0;
bottom: 0;
line-height: 30px;
width: 50px;
}
#newMyNote * {
font-size: 14px;
}
#newMyNote .new-split {
color: #ccc;
display: none;
}
#newMyNote #newNoteBtn {
display: inline-block;
border: 1px solid #eee;
border-radius: 5px;
text-align: center;
height: 25px;
width: 20px;
line-height: initial;
}
#newMyNote #newNoteMarkdownBtn {
display: inline-block;
border: 1px solid #eee;
border-radius: 5px;
/* width: 100px; */
margin-left: 1px;
padding: 0 1px;
height: 25px;
line-height: initial;
text-align: center;
}
#myNotebookNavForListNav {
position: absolute;
line-height: 30px;
left: 55px;
right: 55px;
text-align: center;
font-style: 16px;
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
}
#searchNote {
margin-top: 2px;
}
#sortType {
position: absolute;
left: 4px;
line-height: 36px;
color: #ccc;
}
@font-face { @font-face {
font-family: 'Open Sans'; font-family: 'Open Sans';
font-style: normal; font-style: normal;

View File

@@ -96,7 +96,7 @@ editorMode.prototype.normalMode = function() {
this.resizeEditor(); this.resizeEditor();
$("#noteList").width(UserInfo.NoteListWidth); $("#noteList").width(UserInfo.NoteListWidth);
$("#note").css("left", UserInfo.NoteListWidth); $("#note").css("left", UserInfo.NoteListWidth + 2);
} }
editorMode.prototype.writtingMode = function() { editorMode.prototype.writtingMode = function() {
// $("#pageInner").removeClass("animated fadeInUp"); // $("#pageInner").removeClass("animated fadeInUp");
@@ -259,7 +259,7 @@ var Resize = {
self.noteAndEditor.css("left", notebookWidth); self.noteAndEditor.css("left", notebookWidth);
self.noteList.width(noteListWidth); self.noteList.width(noteListWidth);
self.noteSplitter.css("left", noteListWidth); self.noteSplitter.css("left", noteListWidth);
self.note.css("left", noteListWidth); self.note.css("left", noteListWidth + 2);
UserInfo.NotebookWidth = notebookWidth; UserInfo.NotebookWidth = notebookWidth;
UserInfo.NoteListWidth = noteListWidth; UserInfo.NoteListWidth = noteListWidth;
@@ -1314,7 +1314,7 @@ function incrSync() {
// 实始化页面 // 实始化页面
// 判断是否登录 // 判断是否登录
function initPage() { function initPage() {
// 注入前端变量 // 注入前端变量#
WebService.set(Notebook, Note, Tag); WebService.set(Notebook, Note, Tag);
function _init() { function _init() {