国际化, #21, #26,

This commit is contained in:
life
2014-12-09 23:17:36 +08:00
parent e2e90f8618
commit 17718732cc
525 changed files with 3631 additions and 381 deletions

View File

@ -0,0 +1,15 @@
html {
border: none;
}
body {
background-color: #fbfcf7;
}
* {
font-size: 16px;
}
pre {
font-size: 14px;
}
img {
max-width: 100% !important;
}

27
public/css/css/editor.css Normal file
View File

@ -0,0 +1,27 @@
html {
margin-top: 3px;
padding: 3px;
border: 1px solid #ebeff2;
border-radius: 5px;
-webkit-border-radius: 5px;
border-width: 1px;
box-shadow: none;
}
* {
font-family: 'Open Sans', 'Helvetica Neue', Arial, 'Hiragino Sans GB', 'Microsoft YaHei', 'WenQuanYi Micro Hei', sans-serif;
}
.mce-item-table,
.mce-item-table td,
.mce-item-table th,
.mce-item-table caption {
border: 1px solid #9B9898;
border-collapse: collapse;
}
img {
max-width: 100% !important;
}
@media screen and (max-width: 500px) {
* {
font-size: 16px;
}
}

File diff suppressed because it is too large Load Diff

View File

@ -149,6 +149,20 @@
overflow-y: hidden;
*/
}
// 笔记列表与editor的遮罩
#noteAndEditorMask {
position: absolute;
left: 0;
right: 0;
top: 0;
bottom: 0;
background: #fff;
text-align: center;
padding-top: 60px;
opacity: .3;
z-index: 20;
display: none;
}
//-----------------
// 下拉菜单
@ -625,7 +639,7 @@
max-width: 30px;
overflow: hidden;
// border: 1px solid #ccc;
border-radius: 50%;
border-radius: 50%;
}
#tool {
position: relative;
@ -940,4 +954,17 @@ top: 4px;
.dropdown-menu .divider {
margin: 3px 0;
}
// ace 重置css, 必须
.ace_eidtor, .ace_editor * {
font: 12px/normal 'Monaco', 'Menlo', 'Ubuntu Mono', 'Consolas', 'source-code-pro', monospace;
}
#editorContent {
border: 1px solid #ccc;
border-radius: 5px;
padding: 5px;
outline: none;
margin-top: 5px;
}

View File

@ -139,6 +139,19 @@
overflow-y: hidden;
*/
}
#noteAndEditorMask {
position: absolute;
left: 0;
right: 0;
top: 0;
bottom: 0;
background: #fff;
text-align: center;
padding-top: 60px;
opacity: .3;
z-index: 20;
display: none;
}
.dropdown-submenu {
position: relative;
}
@ -869,6 +882,17 @@
.dropdown-menu .divider {
margin: 3px 0;
}
.ace_eidtor,
.ace_editor * {
font: 12px / normal 'Monaco', 'Menlo', 'Ubuntu Mono', 'Consolas', 'source-code-pro', monospace;
}
#editorContent {
border: 1px solid #ccc;
border-radius: 5px;
padding: 5px;
outline: none;
margin-top: 5px;
}
::selection {
background: #000000;
color: #ffffff;
@ -2012,8 +2036,8 @@ background-position:-1px -670px
#noteReadContent,
#attachList,
#tags {
overflow: scroll !important;
-webkit-overflow-scrolling: touch !important;
overflow: auto !important;
}
#attachMenu {
width: 320px;
@ -2053,7 +2077,7 @@ background-position:-1px -670px
opacity: 0.8;
}
}
@media screen and (max-device-width: 1024px) and (orientation: landscape) {
@media screen and (max-width: 1024px) {
#noteItemList,
#notebook,
#leftNotebook,
@ -2067,12 +2091,12 @@ background-position:-1px -670px
#noteReadContent,
#attachList,
#tags {
overflow: scroll !important;
overflow: auto !important;
-webkit-overflow-scrolling: touch !important;
}
#tag {
position: absolute;
right: 140px;
right: 310px;
left: 0;
top: 0;
bottom: 0;
@ -2121,7 +2145,7 @@ background-position:-1px -670px
#noteReadContent,
#attachList,
#tags {
overflow: scroll !important;
overflow: auto !important;
-webkit-overflow-scrolling: touch !important;
}
#lea,

View File

@ -216,8 +216,8 @@ a:focus, a:hover, a:active {
#attachList,
#tags
{
overflow: scroll !important;
-webkit-overflow-scrolling: touch !important; // for iphone
overflow: auto !important;
}
#attachMenu {
@ -265,7 +265,8 @@ a:focus, a:hover, a:active {
}
// ipad
@media screen and (max-device-width: 1024px) and (orientation: landscape) {
// @media screen and (max-device-width: 1024px) and (orientation: landscape) {
@media screen and (max-width: 1024px) {
#noteItemList, #notebook, #leftNotebook,
.slimScrollDiv,
#editorContent_ifr,
@ -276,13 +277,13 @@ a:focus, a:hover, a:active {
#attachList,
#tags
{
overflow: scroll !important;
overflow: auto !important;
-webkit-overflow-scrolling: touch !important; // for iphone
}
#tag {
position: absolute;
right: 140px;
right: 310px;
left:0;
top:0;
bottom:0;
@ -332,7 +333,7 @@ a:focus, a:hover, a:active {
#attachList,
#tags
{
overflow: scroll !important;
overflow: auto !important;
-webkit-overflow-scrolling: touch !important; // for iphone
}

View File

@ -139,6 +139,19 @@
overflow-y: hidden;
*/
}
#noteAndEditorMask {
position: absolute;
left: 0;
right: 0;
top: 0;
bottom: 0;
background: #fff;
text-align: center;
padding-top: 60px;
opacity: .3;
z-index: 20;
display: none;
}
.dropdown-submenu {
position: relative;
}
@ -869,6 +882,17 @@
.dropdown-menu .divider {
margin: 3px 0;
}
.ace_eidtor,
.ace_editor * {
font: 12px / normal 'Monaco', 'Menlo', 'Ubuntu Mono', 'Consolas', 'source-code-pro', monospace;
}
#editorContent {
border: 1px solid #ccc;
border-radius: 5px;
padding: 5px;
outline: none;
margin-top: 5px;
}
::selection {
background: #000000;
color: #ffffff;
@ -1947,8 +1971,8 @@ background-position:-1px -670px
#noteReadContent,
#attachList,
#tags {
overflow: scroll !important;
-webkit-overflow-scrolling: touch !important;
overflow: auto !important;
}
#attachMenu {
width: 320px;
@ -1988,7 +2012,7 @@ background-position:-1px -670px
opacity: 0.8;
}
}
@media screen and (max-device-width: 1024px) and (orientation: landscape) {
@media screen and (max-width: 1024px) {
#noteItemList,
#notebook,
#leftNotebook,
@ -2002,12 +2026,12 @@ background-position:-1px -670px
#noteReadContent,
#attachList,
#tags {
overflow: scroll !important;
overflow: auto !important;
-webkit-overflow-scrolling: touch !important;
}
#tag {
position: absolute;
right: 140px;
right: 310px;
left: 0;
top: 0;
bottom: 0;
@ -2056,7 +2080,7 @@ background-position:-1px -670px
#noteReadContent,
#attachList,
#tags {
overflow: scroll !important;
overflow: auto !important;
-webkit-overflow-scrolling: touch !important;
}
#lea,

View File

@ -139,6 +139,19 @@
overflow-y: hidden;
*/
}
#noteAndEditorMask {
position: absolute;
left: 0;
right: 0;
top: 0;
bottom: 0;
background: #fff;
text-align: center;
padding-top: 60px;
opacity: .3;
z-index: 20;
display: none;
}
.dropdown-submenu {
position: relative;
}
@ -869,6 +882,17 @@
.dropdown-menu .divider {
margin: 3px 0;
}
.ace_eidtor,
.ace_editor * {
font: 12px / normal 'Monaco', 'Menlo', 'Ubuntu Mono', 'Consolas', 'source-code-pro', monospace;
}
#editorContent {
border: 1px solid #ccc;
border-radius: 5px;
padding: 5px;
outline: none;
margin-top: 5px;
}
@font-face {
font-family: 'Open Sans';
font-style: normal;

View File

@ -139,6 +139,19 @@
overflow-y: hidden;
*/
}
#noteAndEditorMask {
position: absolute;
left: 0;
right: 0;
top: 0;
bottom: 0;
background: #fff;
text-align: center;
padding-top: 60px;
opacity: .3;
z-index: 20;
display: none;
}
.dropdown-submenu {
position: relative;
}
@ -869,6 +882,17 @@
.dropdown-menu .divider {
margin: 3px 0;
}
.ace_eidtor,
.ace_editor * {
font: 12px / normal 'Monaco', 'Menlo', 'Ubuntu Mono', 'Consolas', 'source-code-pro', monospace;
}
#editorContent {
border: 1px solid #ccc;
border-radius: 5px;
padding: 5px;
outline: none;
margin-top: 5px;
}
@font-face {
font-family: 'Open Sans';
font-style: normal;