Support note list view and sorter

This commit is contained in:
lealife
2017-02-18 20:01:43 +08:00
parent ae29119664
commit d5d853ffd3
21 changed files with 1533 additions and 261 deletions

File diff suppressed because one or more lines are too long

View File

@ -16,16 +16,16 @@
@green: #65bd77;
@gray: #ccc;
/* leanote */
@font-face {
font-family: 'leanote';
src:url('../../fonts/leanote-font2/leanote.eot?-vcf23i');
src:url('../../fonts/leanote-font2/leanote.eot?#iefix-vcf23i') format('embedded-opentype'),
url('../../fonts/leanote-font2/leanote.ttf?-vcf23i') format('truetype'),
url('../../fonts/leanote-font2/leanote.woff?-vcf23i') format('woff'),
url('../../fonts/leanote-font2/leanote.svg?-vcf23i#leanote') format('svg');
font-weight: normal;
font-style: normal;
@import "../theme/includes/icon.less";
#logo {
font-size: 24px;
&:before {
line-height: 40px;
}
}
#subTitle {
padding: 0 0 0 5px;
}
@selectionBg: @aBlackColor;
@ -65,22 +65,6 @@ a:hover {
float: left;
}
}
#logo {
font-family: 'leanote';
speak: none;
font-style: normal;
font-weight: normal;
font-variant: normal;
text-transform: none;
/* Better Font Rendering =========== */
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
font-size: 24px;
}
#logo:before {
content: "\e601";
}
#navbar {
width: @pwidth;

View File

View File

@ -808,10 +808,12 @@ a:hover {
vertical-align: middle;
visibility: hidden;
}
#inviteFriends {
#inviteFriends,
#upgradeAccount {
position: relative;
}
#inviteFriends .dot {
#inviteFriends .dot,
#upgradeAccount .dot {
display: inline-block;
position: absolute;
right: -8px;
@ -821,6 +823,12 @@ a:hover {
border-radius: 50%;
background: #FF9263;
}
#upgradeAccountModal .label {
font-size: 12px;
}
#upgradeAccountModal .a {
color: #428bca;
}
#inviteUrl {
width: 400px;
padding: 3px;
@ -1884,6 +1892,37 @@ textarea#wmd-input {
margin-top: 5px;
background-color: #fff;
}
#noteItemList.list .item {
height: 30px !important;
border: none;
border-radius: 0;
border-bottom: 1px solid #ebeff2;
margin: 0 -5px;
}
#noteItemList.list .item.item-b .item-blog {
display: none;
}
#noteItemList.list .item.item-b:hover .item-blog {
display: block;
}
#noteItemList.list .item-thumb {
display: none;
}
#noteItemList.list .item-blog {
display: none;
top: auto;
bottom: 5px;
right: 25px;
}
#noteItemList.list .item-setting {
bottom: 5px;
}
#noteItemList.list .item-title {
border: none;
}
#noteItemList.list .item-desc {
right: 0 !important;
}
#noteItemList .item:hover,
#noteItemList .contextmenu-hover {
background-color: #ddd !important;
@ -1979,6 +2018,10 @@ textarea#wmd-input {
}
#noteItemList .item-blog {
top: 1px;
display: none;
}
#noteItemList .item-b .item-blog {
display: block;
}
#noteItemList .item-setting {
bottom: 0;
@ -1987,6 +2030,20 @@ textarea#wmd-input {
#noteItemList .item:hover .item-setting {
display: block;
}
.sorter-style .fa-check:before,
.view-style .fa-check:before {
content: "";
}
.sorter-style.checked .fa-check:before,
.view-style.checked .fa-check:before {
content: "\f00c";
}
#sortType .dropdown-menu {
right: -1px !important;
}
#tagSearch {
line-height: 34px;
}
/**
* 工具栏
* 附件

View File

@ -268,7 +268,7 @@ a:hover {
visibility: hidden;
}
#inviteFriends {
#inviteFriends, #upgradeAccount {
position: relative;
.dot {
display: inline-block;
@ -281,6 +281,14 @@ a:hover {
background: #FF9263;
}
}
#upgradeAccountModal {
.label {
font-size: 12px;
}
.a {
color:#428bca;
}
}
#inviteUrl {
width: 400px;

View File

@ -75,15 +75,55 @@
overflow-y: hidden;
padding: 0 5px;
}
#noteItemList .item {
position: relative;
height: 110px;
overflow: hidden;
cursor: pointer;
#noteItemList {
.item {
position: relative;
height: 110px;
overflow: hidden;
cursor: pointer;
border: 1px solid @borderColor;
border-radius: 3px;
margin-top: 5px;
background-color: #fff;
margin-top: 5px;
background-color: #fff;
}
// 列表模式
&.list {
.item {
height: 30px !important;
border: none;
border-radius: 0;
border-bottom: 1px solid #ebeff2;
margin: 0 -5px;
&.item-b {
.item-blog {
display: none;
}
}
&.item-b:hover {
.item-blog {
display: block;
}
}
}
.item-thumb {
display: none;
}
.item-blog {
display: none;
top: auto;
bottom: 5px;
right: 25px;
}
.item-setting {
bottom: 5px;
}
.item-title {
border: none;
}
.item-desc {
right: 0 !important;
}
}
}
#noteItemList .item:hover,
@ -189,6 +229,13 @@ top: 4px;
.item-blog {
top: 1px;
display: none;
}
.item-b {
.item-blog {
display: block;
}
}
.item-setting {
@ -202,3 +249,25 @@ top: 4px;
display: block;
}
}
// 视图
.sorter-style, .view-style {
.fa-check:before {
content: "";
}
&.checked {
.fa-check:before {
content: "\f00c";
}
}
}
#sortType {
.dropdown-menu {
right: -1px !important;
}
}
#tagSearch {
line-height: 34px
}

View File

@ -170,4 +170,5 @@
// 不要, 标题下拉有问题
.mce-text {
vertical-align: middle;
}
}

View File

@ -808,10 +808,12 @@ a:hover {
vertical-align: middle;
visibility: hidden;
}
#inviteFriends {
#inviteFriends,
#upgradeAccount {
position: relative;
}
#inviteFriends .dot {
#inviteFriends .dot,
#upgradeAccount .dot {
display: inline-block;
position: absolute;
right: -8px;
@ -821,6 +823,12 @@ a:hover {
border-radius: 50%;
background: #FF9263;
}
#upgradeAccountModal .label {
font-size: 12px;
}
#upgradeAccountModal .a {
color: #428bca;
}
#inviteUrl {
width: 400px;
padding: 3px;
@ -1884,6 +1892,37 @@ textarea#wmd-input {
margin-top: 5px;
background-color: #fff;
}
#noteItemList.list .item {
height: 30px !important;
border: none;
border-radius: 0;
border-bottom: 1px solid #ebeff2;
margin: 0 -5px;
}
#noteItemList.list .item.item-b .item-blog {
display: none;
}
#noteItemList.list .item.item-b:hover .item-blog {
display: block;
}
#noteItemList.list .item-thumb {
display: none;
}
#noteItemList.list .item-blog {
display: none;
top: auto;
bottom: 5px;
right: 25px;
}
#noteItemList.list .item-setting {
bottom: 5px;
}
#noteItemList.list .item-title {
border: none;
}
#noteItemList.list .item-desc {
right: 0 !important;
}
#noteItemList .item:hover,
#noteItemList .contextmenu-hover {
background-color: #ddd !important;
@ -1979,6 +2018,10 @@ textarea#wmd-input {
}
#noteItemList .item-blog {
top: 1px;
display: none;
}
#noteItemList .item-b .item-blog {
display: block;
}
#noteItemList .item-setting {
bottom: 0;
@ -1987,6 +2030,20 @@ textarea#wmd-input {
#noteItemList .item:hover .item-setting {
display: block;
}
.sorter-style .fa-check:before,
.view-style .fa-check:before {
content: "";
}
.sorter-style.checked .fa-check:before,
.view-style.checked .fa-check:before {
content: "\f00c";
}
#sortType .dropdown-menu {
right: -1px !important;
}
#tagSearch {
line-height: 34px;
}
/**
* 工具栏
* 附件

View File

@ -808,10 +808,12 @@ a:hover {
vertical-align: middle;
visibility: hidden;
}
#inviteFriends {
#inviteFriends,
#upgradeAccount {
position: relative;
}
#inviteFriends .dot {
#inviteFriends .dot,
#upgradeAccount .dot {
display: inline-block;
position: absolute;
right: -8px;
@ -821,6 +823,12 @@ a:hover {
border-radius: 50%;
background: #FF9263;
}
#upgradeAccountModal .label {
font-size: 12px;
}
#upgradeAccountModal .a {
color: #428bca;
}
#inviteUrl {
width: 400px;
padding: 3px;
@ -1884,6 +1892,37 @@ textarea#wmd-input {
margin-top: 5px;
background-color: #fff;
}
#noteItemList.list .item {
height: 30px !important;
border: none;
border-radius: 0;
border-bottom: 1px solid #ebeff2;
margin: 0 -5px;
}
#noteItemList.list .item.item-b .item-blog {
display: none;
}
#noteItemList.list .item.item-b:hover .item-blog {
display: block;
}
#noteItemList.list .item-thumb {
display: none;
}
#noteItemList.list .item-blog {
display: none;
top: auto;
bottom: 5px;
right: 25px;
}
#noteItemList.list .item-setting {
bottom: 5px;
}
#noteItemList.list .item-title {
border: none;
}
#noteItemList.list .item-desc {
right: 0 !important;
}
#noteItemList .item:hover,
#noteItemList .contextmenu-hover {
background-color: #ddd !important;
@ -1979,6 +2018,10 @@ textarea#wmd-input {
}
#noteItemList .item-blog {
top: 1px;
display: none;
}
#noteItemList .item-b .item-blog {
display: block;
}
#noteItemList .item-setting {
bottom: 0;
@ -1987,6 +2030,20 @@ textarea#wmd-input {
#noteItemList .item:hover .item-setting {
display: block;
}
.sorter-style .fa-check:before,
.view-style .fa-check:before {
content: "";
}
.sorter-style.checked .fa-check:before,
.view-style.checked .fa-check:before {
content: "\f00c";
}
#sortType .dropdown-menu {
right: -1px !important;
}
#tagSearch {
line-height: 34px;
}
/**
* 工具栏
* 附件

View File

@ -808,10 +808,12 @@ a:hover {
vertical-align: middle;
visibility: hidden;
}
#inviteFriends {
#inviteFriends,
#upgradeAccount {
position: relative;
}
#inviteFriends .dot {
#inviteFriends .dot,
#upgradeAccount .dot {
display: inline-block;
position: absolute;
right: -8px;
@ -821,6 +823,12 @@ a:hover {
border-radius: 50%;
background: #FF9263;
}
#upgradeAccountModal .label {
font-size: 12px;
}
#upgradeAccountModal .a {
color: #428bca;
}
#inviteUrl {
width: 400px;
padding: 3px;
@ -1884,6 +1892,37 @@ textarea#wmd-input {
margin-top: 5px;
background-color: #fff;
}
#noteItemList.list .item {
height: 30px !important;
border: none;
border-radius: 0;
border-bottom: 1px solid #ebeff2;
margin: 0 -5px;
}
#noteItemList.list .item.item-b .item-blog {
display: none;
}
#noteItemList.list .item.item-b:hover .item-blog {
display: block;
}
#noteItemList.list .item-thumb {
display: none;
}
#noteItemList.list .item-blog {
display: none;
top: auto;
bottom: 5px;
right: 25px;
}
#noteItemList.list .item-setting {
bottom: 5px;
}
#noteItemList.list .item-title {
border: none;
}
#noteItemList.list .item-desc {
right: 0 !important;
}
#noteItemList .item:hover,
#noteItemList .contextmenu-hover {
background-color: #ddd !important;
@ -1979,6 +2018,10 @@ textarea#wmd-input {
}
#noteItemList .item-blog {
top: 1px;
display: none;
}
#noteItemList .item-b .item-blog {
display: block;
}
#noteItemList .item-setting {
bottom: 0;
@ -1987,6 +2030,20 @@ textarea#wmd-input {
#noteItemList .item:hover .item-setting {
display: block;
}
.sorter-style .fa-check:before,
.view-style .fa-check:before {
content: "";
}
.sorter-style.checked .fa-check:before,
.view-style.checked .fa-check:before {
content: "\f00c";
}
#sortType .dropdown-menu {
right: -1px !important;
}
#tagSearch {
line-height: 34px;
}
/**
* 工具栏
* 附件