diff --git a/src/public/config.js b/src/public/config.js index 63777e52..6cc8b40b 100644 --- a/src/public/config.js +++ b/src/public/config.js @@ -20,5 +20,5 @@ var Config = { } ], "lang": "zh-hk", - "theme": "night" + "theme": "water" }; \ No newline at end of file diff --git a/src/public/themes/basic.less b/src/public/themes/basic.less index 425aa36c..082db849 100644 --- a/src/public/themes/basic.less +++ b/src/public/themes/basic.less @@ -845,11 +845,6 @@ h1, h2, h3 { #notesAndSort { height: 36px; } -#noteItemListWrap { - position: absolute; left: 0; right: 0; - top: 69px; - bottom: 3px; -} @@ -1818,6 +1813,12 @@ img::selection { z-index: 1030 !important; // 别把modal遮住了 } +// 没有颜色 +.mce-colorbtn-trans div { + line-height: 11px; + text-align: center; +} + /* #starNotes li a, .ztree li a, diff --git a/src/public/themes/default.css b/src/public/themes/default.css index 78a41970..76e7b7f3 100644 --- a/src/public/themes/default.css +++ b/src/public/themes/default.css @@ -784,13 +784,6 @@ h3 { #notesAndSort { height: 36px; } -#noteItemListWrap { - position: absolute; - left: 0; - right: 0; - top: 69px; - bottom: 3px; -} #mdEditorPreview { position: absolute; top: 35px; @@ -1610,6 +1603,10 @@ img::selection { #editorMask { z-index: 1030 !important; } +.mce-colorbtn-trans div { + line-height: 11px; + text-align: center; +} /* #starNotes li a, .ztree li a, @@ -1795,12 +1792,18 @@ a.raw:hover { #switcher span:hover { color: #0fb264; } +#noteList, +#notesAndSort, +#searchNote, +#noteItemListWrap { + background: #fafafa; +} #searchNote { - padding: 0 10px; + padding: 2px 10px; line-height: 30px; width: 100%; margin: 0; - margin-top: 2px; + /* margin-top: 2px; */ } #searchNote input { background-size: 18px 13px; @@ -1819,6 +1822,16 @@ a.raw:hover { outline: none !important; box-shadow: none; } +#noteItemListWrap { + position: absolute; + left: 0; + right: 0; + top: 75px; + bottom: 3px; +} +#noteItemList .item:first-child { + margin-top: 0; +} #header ul { margin: 0; padding: 0; @@ -2086,7 +2099,6 @@ a.raw:hover { outline-offset: -2px; } #notesAndSort { - background-color: #ffffff; border-bottom: 1px solid #ebeff2; } /* 包裹iframe */ diff --git a/src/public/themes/default.less b/src/public/themes/default.less index 2a03a319..c57150da 100644 --- a/src/public/themes/default.less +++ b/src/public/themes/default.less @@ -97,14 +97,20 @@ a.raw:hover { } } } + +// 中间的背景色 +@noteListBg: rgba(250,250,250,1); +#noteList, #notesAndSort, #searchNote,#noteItemListWrap { + background: @noteListBg; +} #searchNote { // padding-left: 0; // padding-right: 0; - padding: 0 10px; + padding: 2px 10px; line-height: 30px; width: 100%; - margin:0; - margin-top: 2px; + margin: 0; + /* margin-top: 2px; */ input { background-size: 18px 13px; @@ -126,6 +132,18 @@ a.raw:hover { } } +#noteItemListWrap { + position: absolute; left: 0; right: 0; + top: 75px; + bottom: 3px; +} +#noteItemList { + .item:first-child { + margin-top: 0; + } +} + + #header ul { margin:0; padding:0; @@ -424,7 +442,6 @@ a.raw:hover { } #notesAndSort { - background-color: @bgColor; border-bottom: 1px solid @borderColor; } diff --git a/src/public/themes/themes/night/theme.css b/src/public/themes/themes/night/theme.css index abb09bb7..a94c26d7 100644 --- a/src/public/themes/themes/night/theme.css +++ b/src/public/themes/themes/night/theme.css @@ -68,6 +68,12 @@ border: none; } #noteList, +#notesAndSort, +#searchNote, +#noteItemListWrap { + background: transparent; +} +#noteList, #notesAndSort { background: #444444; } diff --git a/src/public/themes/themes/night/theme.less b/src/public/themes/themes/night/theme.less index 16ccb148..2b5835df 100644 --- a/src/public/themes/themes/night/theme.less +++ b/src/public/themes/themes/night/theme.less @@ -88,6 +88,9 @@ #noteAndEditor { border: none; } +#noteList, #notesAndSort, #searchNote,#noteItemListWrap { + background: transparent; +} #noteList, #notesAndSort { background: @noteBgLess; } diff --git a/src/public/themes/themes/pebbles_night/theme.css b/src/public/themes/themes/pebbles_night/theme.css index c7278f3b..71d56f62 100644 --- a/src/public/themes/themes/pebbles_night/theme.css +++ b/src/public/themes/themes/pebbles_night/theme.css @@ -68,6 +68,12 @@ border: none; } #noteList, +#notesAndSort, +#searchNote, +#noteItemListWrap { + background: transparent; +} +#noteList, #notesAndSort { background: #444444; } diff --git a/src/public/themes/themes/volumn/theme.css b/src/public/themes/themes/volumn/theme.css index cc8496de..ee2c1ebc 100644 --- a/src/public/themes/themes/volumn/theme.css +++ b/src/public/themes/themes/volumn/theme.css @@ -68,6 +68,12 @@ border: none; } #noteList, +#notesAndSort, +#searchNote, +#noteItemListWrap { + background: transparent; +} +#noteList, #notesAndSort { background: #fdf6e3; } diff --git a/src/public/themes/themes/water_night/theme.css b/src/public/themes/themes/water_night/theme.css index c84a6b67..f65cfe6a 100644 --- a/src/public/themes/themes/water_night/theme.css +++ b/src/public/themes/themes/water_night/theme.css @@ -68,6 +68,12 @@ border: none; } #noteList, +#notesAndSort, +#searchNote, +#noteItemListWrap { + background: transparent; +} +#noteList, #notesAndSort { background: #444444; }