markdown editor prettify add linenums

public/css/theme/basic.less

@@ -104,6 +104,7 @@ h1, h2, h3 {
 @fontFamily: 'Open Sans', Helvetica, Tahoma, Arial, Hiragino Sans GB, "Microsoft YaHei", "微软雅黑", "Micro Hei", SimSun, "宋体", Heiti, "黑体", sans-serif;
 // @fontFamily: Helvetica, Tahoma, Arial, Hiragino Sans GB, "Microsoft YaHei", "微软雅黑", "Micro Hei", SimSun, "宋体", Heiti, "黑体", sans-serif;
 @aceFontFamily: 'Monaco', 'Menlo', 'Ubuntu Mono', 'Consolas', 'source-code-pro', Hiragino Sans GB, "Microsoft YaHei", "微软雅黑";
+// @fontFamily: PingFang SC,Hiragino Sans GB,Helvetica Neue,Microsoft Yahei,WenQuanYi Micro Hei,sans-serif;
 
 // header
 @headerTextColor: #fff;

public/css/theme/includes/common.less

@@ -3,7 +3,7 @@
  */
 
 // 字体
-/*
+
 @font-face {
   font-family: 'Open Sans';
   font-style: normal;
@@ -28,21 +28,6 @@
   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-weight: normal;
-    font-style: normal;
-}
-*/
 
 @font-face {
   font-family: 'leanote';
@@ -55,7 +40,6 @@
   font-style: normal;
 }
 
-
 .close:focus {
   outline: none;
 }
@@ -78,7 +62,6 @@
 }
 
 
-
 //-----------------
 // 下拉菜单
 .dropdown-submenu {
@@ -190,10 +173,10 @@
   border-radius: 3px;
   margin:0;
   // border: 1px solid @hColor;
-  border: 1px solid #e6eaed;
+  // border: 1px solid #e6eaed;
   /*overflow-x: hidden; */
   /*overflow-y: scroll;*/
-  box-shadow: rgba(0, 0, 0, 0.172549) 0px 6px 12px 0px;
+  // box-shadow: rgba(0, 0, 0, 0.172549) 0px 6px 12px 0px;
   
   &:before {
     content: "";

public/css/theme/includes/header.less

@@ -271,3 +271,24 @@ a:hover {
   vertical-align: middle;
   visibility: hidden;
 }
+
+#inviteFriends {
+  position: relative;
+  .dot {
+    display: inline-block;
+    position: absolute;
+    right: -8px;
+    top: -8px;
+    width: 8px;
+    height: 8px;
+    border-radius: 50%;
+    background: #FF9263;
+  }
+}
+
+#inviteUrl {
+  width: 400px;
+  padding: 3px;
+  border-radius: 3px;
+  border: 1px solid #eee;
+}

public/css/theme/includes/markdown.less

@@ -163,6 +163,8 @@ textarea#wmd-input {
   font-family:  @aceFontFamily;
 }
 
+/*
+
 // markdown editor ace
 @mdAceTextColor: #2C3E50; // #04294E; // #384654;
 @mdAceHeadingColor: #000; // 1a2026
@@ -295,8 +297,152 @@ textarea#wmd-input {
     background-color: rgb(101, 189, 119, 0.9);
   }
 }
+*/
 
 // markdown todo list
 .m-todo-item {
     list-style: none;
+}
+
+
+// markdown editor ace
+@mdAceTextColor: #333333; // #04294E; // #384654;
+@mdAceHeadingColor: #1d3e81; // 1a2026
+@mdAceBlockquoteColor: #003873;
+@mdAceCursorColor: #243342;
+
+@mdAceTextColor: #000;
+@mdAceTagColor: #1d3e81; // rgba(87, 108, 130, 0.6);
+
+textarea#wmd-input {
+  color: #000 !important;
+}
+
+#wmd-input {
+  .ace_cjk {
+    color: inherit;
+  }
+  .ace_searchbtn_close {
+      margin: 0px;
+  }
+  .ace_content {
+    padding-top: 5px;
+  }
+  &.ace_editor {
+    color: @mdAceTextColor;
+  }
+  &.ace-tm {
+    background-color: #ffffff;
+  }
+  &.ace-tm .ace_text-input {
+    box-sizing: initial;
+  }
+  &.ace-tm .ace_marker-layer .ace_active-line {
+    background-color: rgba(89, 128, 166, 0.05);
+  }
+  &.ace-tm .ace_cursor {
+    color: @mdAceCursorColor;
+  }
+  // 左侧的线
+  &.ace-tm .ace_print-margin {
+    background: none;
+    // background-color: rgba(89, 128, 166, 0.05);
+  }
+  &.ace-tm .ace_markup.ace_heading {
+    color: @mdAceTextColor;
+    font-weight: bold;
+    &.ace_1,&.ace_2,&.ace_3,&.ace_4,&.ace_5 {
+      color: @mdAceTagColor;
+    }
+  }
+  &.ace-tm .ace_markup.ace_list {
+    color: @mdAceTextColor;
+  }
+  &.ace-tm .ace_constant.ace_language {
+    color: @mdAceTagColor;
+    font-weight: normal;
+  }
+  &.ace-tm .ace_meta.ace_tag {
+    color: #384654;
+    font-style: italic;
+    font-weight: bold;
+    // background-color: rgba(0, 0, 0, 0.04);
+  }
+  &.ace-tm .ace_keyword.ace_operator {
+    color: #384654;
+    background-color: transparent;
+  }
+  &.ace-tm .ace_storage,
+  &.ace-tm .ace_keyword {
+    color: #384654;
+    // background-color: rgba(0, 0, 0, 0.04);
+    font-weight: bold;
+  }
+  &.ace-tm .ace_entity.ace_name.ace_function {
+    color: #1a2026;
+    font-weight: bold;
+  }
+  &.ace-tm .ace_string {
+    color: #384654;
+    font-style: italic;
+    // background-color: rgba(0, 0, 0, 0.04);
+  }
+  &.ace-tm .ace_invalid {
+    color: inherit;
+    background: inherit;
+  }
+  &.ace-tm .ace_strong {
+    color: @mdAceTextColor;
+    font-weight: bold;
+  }
+  &.ace-tm .ace_emphasis {
+    color: @mdAceTextColor;
+    font-style: italic;
+  }
+  &.ace-tm .ace_blockquote {
+    color: @mdAceTextColor;
+  }
+  &.ace-tm .ace_code {
+    color: #1a2026;
+    // background-color: rgba(0, 0, 0, 0.04);
+  }
+  &.ace-tm .ace_code_block {
+    color: #1a2026;
+  }
+  &.ace-tm .ace_link {
+    color: @mdAceTextColor;
+    background-color: transparent;
+    text-decoration: underline;
+  }
+  .ace_underline {
+    color: @mdAceHeadingColor;
+    text-decoration: none;
+
+  }
+  &.ace-tm .ace_description {
+    color: #576c82;
+  }
+  &.ace-tm .ace_constant {
+    color: #384654;
+  }
+  &.ace-tm .ace_comment {
+    color: rgba(87, 108, 130, 0.6);
+    font-style: italic;
+  }
+  &.ace-tm .ace_marker-layer .misspelled {
+    position: absolute;
+    z-index: -2;
+    border-bottom: 1px dotted red;
+    margin-bottom: -1px;
+  }
+
+  // vim cursor
+  &.normal-mode .ace_cursor {
+      // background-color: #003A92;
+  }
+  // emacs cursor
+  &.emacs-mode .ace_cursor {
+    border: 2px rgba(101, 189, 119, 0.8) solid !important;
+    background-color: rgb(101, 189, 119, 0.9);
+  }
 }