界面优化

2015-09-05 23:30:24 +08:00
parent b3c771a87f
commit 7440218974
86 changed files with 3159 additions and 17934 deletions
--- a/public/css/theme/basic.less
+++ b/public/css/theme/basic.less
@ -1,4 +1,5 @@
 // font
+/*
@font-face {
  font-family: 'Open Sans';
  font-style: normal;
@ -23,8 +24,9 @@
  font-weight: 400;
  src: local('Open Sans Italic'), local('OpenSans-Italic'), url('../../fonts/open-sans2/xjAJXh38I15wypJXxuGMBobN6UDyHWBl620a-IRfuBk.woff') format('woff');
 }
-
+*/
 /* leanote */
+/*
@font-face {
    font-family: 'leanoteregular';
    src: url('../../fonts/leanote/leanote-regular-webfont.eot');
@ -35,6 +37,83 @@
    font-weight: normal;
    font-style: normal;
 }
+*/
+
+@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;
+}
+
+// 字体
+
+#logo,
+#switcher span,
+.mce-i-mind,
+.mce-i-ace-pre,
+.lea-icon
+{
+	font-family: 'leanote' !important;
+	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;
+}
+.icon-markdown:before {
+	content: "\e604";
+}
+.mce-i-mind:before {
+	content: "\e602";
+}
+.mce-i-ace-pre:before {
+	content: "\e603";
+}
+#logo:before {
+	content: "\e600";
+	line-height: 1;
+ 	margin-top: 5px;
+  	display: inline-block;
+  	vertical-align: top;
+}
+#switcher span:before {
+	content: "\e601";
+}
+
+// 新建
+.new-split {
+	display: none;
+}
+.new-note {
+  background-color: #000;
+  border-radius: 3px;
+  padding: 3px 5px;
+  border: 1px solid #080303;
+	&, a {
+		color: #fff;
+	}
+	&:hover {
+		background: #3D3B3B;
+		border-color: transparent;
+		&, a {
+			color: #fff;
+		}
+	}
+}
+.new-markdown {
+	margin-left: 3px;
+	margin-right: 3px;
+}
+
 html,body {
 }
 *,.h1,
@ -47,12 +126,20 @@ html,body {
 }
 body {
  font-family: @fontFamily;
-  font-weight: 300;
+  font-weight: normal; // 400
  font-size: @fontSize;
 }
+
+// retina频幕则font-weight: 300
+@media
+only screen and (-webkit-min-device-pixel-ratio : 2),
+only screen and (min-device-pixel-ratio : 2) {
+    body { font-weight: 300;}
+}
+
 h1, h2, h3 {
  font-family: @fontFamily;
-  font-weight: 300 !important;
+  font-weight: normal !important;
 }
 /*"HelveticaNeue-Light","Helvetica Neue Light","Helvetica Neue", Helvetica, "Microsoft Yahei", Verdana, Simsun, "Segoe UI", "Segoe UI Web Regular", "Segoe UI Symbol",  "BBAlpha Sans", "S60 Sans", Arial, sans-serif;*/

@ -121,14 +208,10 @@ h1, h2, h3 {
 }

 #logo {
-	font-family: "leanoteregular";
 	font-size: 36px;
 }
-#logo:before {
-	content: "a";
-}
+
 #switcher span {
-	font-family: "leanoteregular";
 	border-radius: 5px;
 	display: inline-block;
 	cursor: pointer;
@ -138,9 +221,8 @@ h1, h2, h3 {
 	margin-top: 8px;
 	padding: 0 5px;
 }
-#switcher span:before {
-	content: "b";
-}
+
+
 .noteSplit {
  position: absolute;
  top: 0;
@ -1287,6 +1369,10 @@ top: 4px;
 		padding-right: 10px;
 	}
 }
+.invisible {
+	visibility: hidden;
+}
+
 #editorContent {
 	-webkit-user-select: text;
 }
--- a/public/css/theme/default.css
+++ b/public/css/theme/default.css
--- a/public/css/theme/default.less
+++ b/public/css/theme/default.less
@ -2,7 +2,8 @@

@bgColor: #fff;
@headerBgColor: #25313e;
-@fontFamily: 'Open Sans','Helvetica Neue',Arial,'Hiragino Sans GB','Microsoft YaHei','WenQuanYi Micro Hei',sans-serif;
+// @fontFamily: 'Open Sans','Helvetica Neue',Arial,'Hiragino Sans GB','Microsoft YaHei','WenQuanYi Micro Hei',sans-serif;
+@fontFamily: Helvetica, Tahoma, Arial, Hiragino Sans GB, "Microsoft YaHei", "微软雅黑", "Micro Hei", SimSun, "宋体", Heiti, "黑体", sans-serif;
@aWhiteColor: #fff;
@aBlackColor: #000;
@borderColor: #EBEFF2;
@ -601,8 +602,8 @@ a.raw:hover {
  padding: 5px 5px !important;
  line-height: 20px !important;
 }
-.mce-btn {
-  // background-color: @bgColor !important;
+.mce-foot .mce-btn {
+	border-radius: 3px;
 }
 .mce-menubtn.mce-btn-small span {
  line-height: 20px !important;
@ -615,7 +616,7 @@ a.raw:hover {
 }
 .mce-primary {
 	background-color: #47a447 !important;
-	border-color: #398439 !important;
+	border: none !important;
 }
 // 下拉
 .mce-menu-item:hover, .mce-menu-item.mce-selected, .mce-menu-item:focus {
--- a/public/css/theme/simple.css
+++ b/public/css/theme/simple.css
--- a/public/css/theme/simple.less
+++ b/public/css/theme/simple.less
@ -2,7 +2,8 @@

@bgColor: #fff;
@headerBgColor: #fff;
-@fontFamily: 'Open Sans','Helvetica Neue',Arial,'Hiragino Sans GB','Microsoft YaHei','WenQuanYi Micro Hei',sans-serif;
+// @fontFamily: 'Open Sans','Helvetica Neue',Arial,'Hiragino Sans GB','Microsoft YaHei','WenQuanYi Micro Hei',sans-serif;
+@fontFamily: Helvetica, Tahoma, Arial, Hiragino Sans GB, "Microsoft YaHei", "微软雅黑", "Micro Hei", SimSun, "宋体", Heiti, "黑体", sans-serif;
@aWhiteColor: #fff;
@aBlackColor: #000;
@borderColor: #EBEFF2;
@ -20,6 +21,20 @@
 ::-moz-selection { background:@selectionBg; color:@selectionColor; } 
 ::-webkit-selection { background:@selectionBg; color:@selectionColor; }

+.new-note {
+  background-color: #eee; // #50A361;
+  border: 1px solid transparent;
+	&, a {
+		color: #000;
+	}
+	&:hover {
+		background: #E0E0E0;
+		&, a {
+			color: #000;
+		}
+	}
+}
+
 a {
  color: @aBlackColor;
  cursor: pointer;
@ -558,8 +573,8 @@ a.raw:hover {
  padding: 5px 5px !important;
  line-height: 20px !important;
 }
-.mce-btn {
-  // background-color: @bgColor !important;
+.mce-foot .mce-btn {
+	border-radius: 3px;
 }
 .mce-menubtn.mce-btn-small span {
  line-height: 20px !important;
@ -572,7 +587,7 @@ a.raw:hover {
 }
 .mce-primary {
 	background-color: #47a447 !important;
-	border-color: #398439 !important;
+	border: none !important;
 }
 .mce-menu-item:hover, .mce-menu-item.mce-selected, .mce-menu-item:focus {
 	background-color: @borderColor;
--- a/public/css/theme/writting-overwrite.css
+++ b/public/css/theme/writting-overwrite.css
@ -1,3 +1,4 @@
+/*
@font-face {
  font-family: 'Open Sans';
  font-style: normal;
@ -22,14 +23,86 @@
  font-weight: 400;
  src: local('Open Sans Italic'), local('OpenSans-Italic'), url('../../fonts/open-sans2/xjAJXh38I15wypJXxuGMBobN6UDyHWBl620a-IRfuBk.woff') format('woff');
 }
+*/
 /* leanote */
+/*
@font-face {
-  font-family: 'leanoteregular';
-  src: url('../../fonts/leanote/leanote-regular-webfont.eot');
-  src: url('../../fonts/leanote/leanote-regular-webfont.eot?#iefix') format('embedded-opentype'), url('../../fonts/leanote/leanote-regular-webfont.woff') format('woff'), url('../../fonts/leanote/leanote-regular-webfont.ttf') format('truetype'), url('../../fonts/leanote/leanote-regular-webfont.svg#leanoteregular') format('svg');
+    font-family: 'leanoteregular';
+    src: url('../../fonts/leanote/leanote-regular-webfont.eot');
+    src: url('../../fonts/leanote/leanote-regular-webfont.eot?#iefix') format('embedded-opentype'),
+         url('../../fonts/leanote/leanote-regular-webfont.woff') format('woff'),
+         url('../../fonts/leanote/leanote-regular-webfont.ttf') format('truetype'),
+         url('../../fonts/leanote/leanote-regular-webfont.svg#leanoteregular') format('svg');
+    font-weight: normal;
+    font-style: normal;
+}
+*/
+@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;
 }
+#logo,
+#switcher span,
+.mce-i-mind,
+.mce-i-ace-pre,
+.lea-icon {
+  font-family: 'leanote' !important;
+  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;
+}
+.icon-markdown:before {
+  content: "\e604";
+}
+.mce-i-mind:before {
+  content: "\e602";
+}
+.mce-i-ace-pre:before {
+  content: "\e603";
+}
+#logo:before {
+  content: "\e600";
+  line-height: 1;
+  margin-top: 5px;
+  display: inline-block;
+  vertical-align: top;
+}
+#switcher span:before {
+  content: "\e601";
+}
+.new-split {
+  display: none;
+}
+.new-note {
+  background-color: #000;
+  border-radius: 3px;
+  padding: 3px 5px;
+  border: 1px solid #080303;
+}
+.new-note,
+.new-note a {
+  color: #fff;
+}
+.new-note:hover {
+  background: #3D3B3B;
+  border-color: transparent;
+}
+.new-note:hover,
+.new-note:hover a {
+  color: #fff;
+}
+.new-markdown {
+  margin-left: 3px;
+  margin-right: 3px;
+}
 *,
 .h1,
 .h2,
@ -41,14 +114,19 @@
 }
 body {
  font-family: 'Open Sans', 'Helvetica Neue', Arial, 'Hiragino Sans GB', 'Microsoft YaHei', 'WenQuanYi Micro Hei', sans-serif;
-  font-weight: 300;
+  font-weight: normal;
  font-size: 16px;
 }
+@media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min-device-pixel-ratio: 2) {
+  body {
+    font-weight: 300;
+  }
+}
 h1,
 h2,
 h3 {
  font-family: 'Open Sans', 'Helvetica Neue', Arial, 'Hiragino Sans GB', 'Microsoft YaHei', 'WenQuanYi Micro Hei', sans-serif;
-  font-weight: 300 !important;
+  font-weight: normal !important;
 }
 /*"HelveticaNeue-Light","Helvetica Neue Light","Helvetica Neue", Helvetica, "Microsoft Yahei", Verdana, Simsun, "Segoe UI", "Segoe UI Web Regular", "Segoe UI Symbol",  "BBAlpha Sans", "S60 Sans", Arial, sans-serif;*/
 #noteItemList,
@ -117,14 +195,9 @@ h3 {
  margin-bottom: 10px;
 }
 #logo {
-  font-family: "leanoteregular";
  font-size: 36px;
 }
-#logo:before {
-  content: "a";
-}
 #switcher span {
-  font-family: "leanoteregular";
  border-radius: 5px;
  display: inline-block;
  cursor: pointer;
@ -134,9 +207,6 @@ h3 {
  margin-top: 8px;
  padding: 0 5px;
 }
-#switcher span:before {
-  content: "b";
-}
 .noteSplit {
  position: absolute;
  top: 0;
@ -1159,6 +1229,9 @@ h3 {
  display: inline-block;
  padding-right: 10px;
 }
+.invisible {
+  visibility: hidden;
+}
 #editorContent {
  -webkit-user-select: text;
 }
--- a/public/css/theme/writting.css
+++ b/public/css/theme/writting.css
@ -1,3 +1,4 @@
+/*
@font-face {
  font-family: 'Open Sans';
  font-style: normal;
@ -22,14 +23,86 @@
  font-weight: 400;
  src: local('Open Sans Italic'), local('OpenSans-Italic'), url('../../fonts/open-sans2/xjAJXh38I15wypJXxuGMBobN6UDyHWBl620a-IRfuBk.woff') format('woff');
 }
+*/
 /* leanote */
+/*
@font-face {
-  font-family: 'leanoteregular';
-  src: url('../../fonts/leanote/leanote-regular-webfont.eot');
-  src: url('../../fonts/leanote/leanote-regular-webfont.eot?#iefix') format('embedded-opentype'), url('../../fonts/leanote/leanote-regular-webfont.woff') format('woff'), url('../../fonts/leanote/leanote-regular-webfont.ttf') format('truetype'), url('../../fonts/leanote/leanote-regular-webfont.svg#leanoteregular') format('svg');
+    font-family: 'leanoteregular';
+    src: url('../../fonts/leanote/leanote-regular-webfont.eot');
+    src: url('../../fonts/leanote/leanote-regular-webfont.eot?#iefix') format('embedded-opentype'),
+         url('../../fonts/leanote/leanote-regular-webfont.woff') format('woff'),
+         url('../../fonts/leanote/leanote-regular-webfont.ttf') format('truetype'),
+         url('../../fonts/leanote/leanote-regular-webfont.svg#leanoteregular') format('svg');
+    font-weight: normal;
+    font-style: normal;
+}
+*/
+@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;
 }
+#logo,
+#switcher span,
+.mce-i-mind,
+.mce-i-ace-pre,
+.lea-icon {
+  font-family: 'leanote' !important;
+  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;
+}
+.icon-markdown:before {
+  content: "\e604";
+}
+.mce-i-mind:before {
+  content: "\e602";
+}
+.mce-i-ace-pre:before {
+  content: "\e603";
+}
+#logo:before {
+  content: "\e600";
+  line-height: 1;
+  margin-top: 5px;
+  display: inline-block;
+  vertical-align: top;
+}
+#switcher span:before {
+  content: "\e601";
+}
+.new-split {
+  display: none;
+}
+.new-note {
+  background-color: #000;
+  border-radius: 3px;
+  padding: 3px 5px;
+  border: 1px solid #080303;
+}
+.new-note,
+.new-note a {
+  color: #fff;
+}
+.new-note:hover {
+  background: #3D3B3B;
+  border-color: transparent;
+}
+.new-note:hover,
+.new-note:hover a {
+  color: #fff;
+}
+.new-markdown {
+  margin-left: 3px;
+  margin-right: 3px;
+}
 *,
 .h1,
 .h2,
@ -41,14 +114,19 @@
 }
 body {
  font-family: 'Open Sans', 'Helvetica Neue', Arial, 'Hiragino Sans GB', 'Microsoft YaHei', 'WenQuanYi Micro Hei', sans-serif;
-  font-weight: 300;
+  font-weight: normal;
  font-size: 16px;
 }
+@media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min-device-pixel-ratio: 2) {
+  body {
+    font-weight: 300;
+  }
+}
 h1,
 h2,
 h3 {
  font-family: 'Open Sans', 'Helvetica Neue', Arial, 'Hiragino Sans GB', 'Microsoft YaHei', 'WenQuanYi Micro Hei', sans-serif;
-  font-weight: 300 !important;
+  font-weight: normal !important;
 }
 /*"HelveticaNeue-Light","Helvetica Neue Light","Helvetica Neue", Helvetica, "Microsoft Yahei", Verdana, Simsun, "Segoe UI", "Segoe UI Web Regular", "Segoe UI Symbol",  "BBAlpha Sans", "S60 Sans", Arial, sans-serif;*/
 #noteItemList,
@ -117,14 +195,9 @@ h3 {
  margin-bottom: 10px;
 }
 #logo {
-  font-family: "leanoteregular";
  font-size: 36px;
 }
-#logo:before {
-  content: "a";
-}
 #switcher span {
-  font-family: "leanoteregular";
  border-radius: 5px;
  display: inline-block;
  cursor: pointer;
@ -134,9 +207,6 @@ h3 {
  margin-top: 8px;
  padding: 0 5px;
 }
-#switcher span:before {
-  content: "b";
-}
 .noteSplit {
  position: absolute;
  top: 0;
@ -1159,6 +1229,9 @@ h3 {
  display: inline-block;
  padding-right: 10px;
 }
+.invisible {
+  visibility: hidden;
+}
 #editorContent {
  -webkit-user-select: text;
 }