merge editor.css and editor_mode.css

_server/css/editor.css

@@ -1,3 +1,4 @@
+/** editor **/
 
 html, body, div, img {
     margin: 0;
@@ -477,3 +478,214 @@ table.row {
     /* display: none; */
     box-sizing: border-box;
 }
+
+/** editor_mode **/
+
+.leftTab {
+    border-radius: 2px;
+    box-sizing: border-box;
+    overflow: auto;
+    position: absolute;
+    bottom: 0;
+}
+
+.leftTab > * {
+    margin: 2.5px 5px;
+}
+
+.leftTab > :first-child {
+    margin-top: 5px;
+}
+
+.leftTab > :last-child {
+    margin-bottom: 5px;
+}
+
+.leftTab {
+    left: 5px;
+    top: 10px;
+    width: 435px;
+}
+
+.leftTab .leftTabHeader {
+    position: fixed;
+    top: 15px;
+    left: 15px;
+    z-index: 20;
+}
+
+.leftTab .leftTabContent {
+    padding-top: 50px;
+}
+
+#appendPicSelection span {
+    position: absolute;
+    font-size: 11px;
+    }
+
+#left6 {
+    left: 5px;
+    top: 5px;
+    z-index: 200;
+    position: fixed;
+    width: 100%;
+    height: 100%;
+    overflow: hidden;
+}
+
+#left6 #blocklyArea {
+    float: left;
+    width: 60%;
+    height: 95%;
+}
+
+#left6 #blocklyDiv {
+    position: relative;
+}
+
+#left6 .CodeMirror {
+    float: left;
+    height: 95%;
+    width: 35%;
+}
+
+#left6 #codeArea {
+    width: 99.5%;
+    height: 15.4em;
+    overflow: y; /* resize:none; */
+}
+
+#left7 {
+    /* height: 440px; width: 375px;float:left; */
+    left: 5px;
+    top: 5px;
+    z-index: 200;
+    position: fixed;
+    width: 100%;
+    height: 100%;
+}
+
+#left7 .CodeMirror {
+    /* border-top: 1px solid black;
+    border-bottom: 1px solid black; */
+    font-size: 14px;
+    height: 95%;
+    width: 95%;
+}
+
+.etable table, .etable table td {
+    cursor: auto;
+}
+
+/* copy from github-css https://github.com/sindresorhus/github-markdown-css  */
+.etable table {
+    border-spacing: 0;
+    border-collapse: collapse;
+}
+
+.etable table {
+    margin-top: 0;
+    margin-bottom: 16px;
+}
+
+.etable table {
+    display: block;
+    width: 100%;
+    overflow: auto;
+    word-break: break-all;
+}
+
+.etable table th {
+    font-weight: 600;
+}
+
+.etable table th,
+.etable table td {
+    padding: 5px;
+}
+
+/* copy end ---------------------------------------------  */
+
+.etable tr {
+    width: 100%
+}
+
+.etable tr > :nth-child(1) {
+    width: 20%
+}
+
+.etable tr > :nth-child(2) {
+    width: 20%
+}
+
+.etable tr > :nth-child(3) {
+    width: 35%;
+}
+
+.etable tr > :nth-child(4) {
+    width: 25%;
+    padding: 0;
+}
+
+.etable table {
+    overflow: visible;
+}
+
+.etable tr:not(:first-child) > :nth-child(3) {
+    margin: 0;
+    padding: 0;
+    height: 100%;
+    position: relative;
+}
+
+.etable tr > :nth-child(4) {
+    text-align: center;
+}
+
+div.etableInputDiv {
+    position: absolute;
+    padding: 5px 0 0 5px;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    right: 0;
+}
+
+div.checkboxSet {
+    position: relative !important;
+    max-height: 250px;
+    overflow: auto;
+}
+
+.etableInputDiv > * {
+    margin: 0;
+    padding: 0;
+    height: 100%;
+    width: 100%;
+    border: none;
+    background: transparent;
+}
+
+.etableInputDiv .checkbox {
+    width: 16px;
+    height: 16px;
+    position: absolute;
+    left: 50%;
+    top: 50%;
+    margin-left: -8px;
+    margin-top: -8px;
+}
+
+.etableInputDiv .checkboxSetMember {
+    width: 16px;
+    height: 16px;
+    display: inline-block;
+}
+
+.etableInputDiv textarea {
+    resize: none;
+}
+
+.etableInputDiv textarea:hover {
+    margin: -5px;
+}

_server/css/editor_mobile.css

@@ -1,3 +1,5 @@
+/** editor **/
+
 html{
     font-size: 4vw;
 }
@@ -483,3 +485,223 @@ table.row,div.row .rowtext {
     /* display: none; */
     box-sizing: border-box;
 }
+
+/** editor_mode **/
+
+.leftTab {
+    width: 100vw;
+    height: 100vw;
+}
+
+.leftTab {
+    overflow: auto;
+    position: absolute;
+    height: 100vw;
+}
+
+.leftTab > * {
+    margin: 2.5px 5px;
+}
+
+.leftTab > :first-child {
+    margin-top: 5px;
+}
+
+.leftTab > :last-child {
+    margin-bottom: 5px;
+}
+
+.leftTab {
+    left: 0;
+    top: 0;
+    width: 100vw;
+}
+
+.leftTab .leftTabHeader {
+    position: fixed;
+    top: 15px;
+    left: 15px;
+}
+
+.leftTab .leftTabContent {
+    padding-top: 50px;
+}
+
+#appendPicSelection span {
+    position: absolute;
+    font-size: 11px;
+}
+
+#left6 {
+    left: 0;
+    top: 0;
+    z-index: 200;
+    position: fixed;
+    width: 100%;
+    height: 100%;
+    overflow: hidden;
+}
+#left6 h3{
+    font-size: 6vw;
+    margin: 1.77vw 0;
+    
+}
+
+#left6 #blocklyArea {
+
+    width: 100vw;
+    height: 100vw;
+}
+
+#left6 #blocklyDiv {
+    position: relative;
+}
+
+#left6 .CodeMirror {
+    height: 38vw;
+    width: 100%;
+}
+
+#left6 #codeArea {
+    width: 99.5%;
+    height: 15.4em;
+    overflow: y; /* resize:none; */
+}
+
+#left6 #blocklyDiv .blocklyToolboxDiv{
+    width:6vw;
+}
+#left6 #blocklyDiv .blocklyTreeLabel{
+    margin-left:-4vw;
+}
+
+#left7 {
+    /* height: 440px; width: 375px;float:left; */
+    left: 0;
+    top: 0;
+    z-index: 200;
+    position: fixed;
+    width: 100%;
+    height: 100%;
+}
+
+#left7 .CodeMirror {
+    font-size: 14px;
+    height: 95%;
+    width: 95%;
+}
+
+.etable table,
+.etable table td {
+    cursor: auto;
+}
+
+/* copy from github-css https://github.com/sindresorhus/github-markdown-css  */
+.etable table {
+    border-spacing: 0;
+    border-collapse: collapse;
+}
+
+.etable table {
+    margin-top: 0;
+    margin-bottom: 16px;
+}
+
+.etable table {
+    display: block;
+    width: 100%;
+    overflow: auto;
+    word-break: break-all;
+}
+
+.etable table th {
+    font-weight: 600;
+}
+
+.etable table th,
+.etable table td {
+    padding: 5px;
+}
+
+/* copy end ---------------------------------------------  */
+
+.etable tr {
+    width: 100%
+}
+
+.etable tr > :nth-child(1) {
+    width: 20%
+}
+
+.etable tr > :nth-child(2) {
+    width: 20%
+}
+
+.etable tr > :nth-child(3) {
+    width: 38%;
+}
+
+.etable tr > :nth-child(4) {
+    width: 22%;
+    text-align: center;
+}
+
+.etable table {
+    overflow: visible;
+}
+
+.etable tr:not(:first-child) > :nth-child(3) {
+    margin: 0;
+    padding: 0;
+    height: 100%;
+    position: relative;
+}
+
+div.etableInputDiv {
+    position: absolute;
+    padding: 5px 0 0 5px;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    right: 0;
+}
+
+div.checkboxSet {
+    position: relative !important;
+    max-height: 250px;
+    overflow: auto;
+}
+
+.etableInputDiv > * {
+    margin: 0;
+    padding: 0;
+    height: 100%;
+    width: 100%;
+    border: none;
+    background: transparent;
+}
+
+.etableInputDiv .checkbox {
+    width: 16px;
+    height: 16px;
+    position: absolute;
+    left: 50%;
+    top: 50%;
+    margin-left: -8px;
+    margin-top: -8px;
+}
+
+.etableInputDiv .checkboxSetMember {
+    width: 16px;
+    height: 16px;
+    display: inline-block;
+}
+
+.etableInputDiv textarea {
+    resize: none;
+}
+
+.etableInputDiv textarea:hover {
+    margin: -5px;
+}
+

_server/css/editor_mode.css

@@ -1,208 +0,0 @@
-.leftTab {
-    border-radius: 2px;
-    box-sizing: border-box;
-    overflow: auto;
-    position: absolute;
-    bottom: 0;
-}
-
-.leftTab > * {
-    margin: 2.5px 5px;
-}
-
-.leftTab > :first-child {
-    margin-top: 5px;
-}
-
-.leftTab > :last-child {
-    margin-bottom: 5px;
-}
-
-.leftTab {
-    left: 5px;
-    top: 10px;
-    width: 435px;
-}
-
-.leftTab .leftTabHeader {
-    position: fixed;
-    top: 15px;
-    left: 15px;
-    z-index: 20;
-}
-
-.leftTab .leftTabContent {
-    padding-top: 50px;
-}
-
-#appendPicSelection span {
-    position: absolute;
-    font-size: 11px;
-    }
-
-#left6 {
-    left: 5px;
-    top: 5px;
-    z-index: 200;
-    position: fixed;
-    width: 100%;
-    height: 100%;
-    overflow: hidden;
-}
-
-#left6 #blocklyArea {
-    float: left;
-    width: 60%;
-    height: 95%;
-}
-
-#left6 #blocklyDiv {
-    position: relative;
-}
-
-#left6 .CodeMirror {
-    float: left;
-    height: 95%;
-    width: 35%;
-}
-
-#left6 #codeArea {
-    width: 99.5%;
-    height: 15.4em;
-    overflow: y; /* resize:none; */
-}
-
-#left7 {
-    /* height: 440px; width: 375px;float:left; */
-    left: 5px;
-    top: 5px;
-    z-index: 200;
-    position: fixed;
-    width: 100%;
-    height: 100%;
-}
-
-#left7 .CodeMirror {
-    /* border-top: 1px solid black;
-    border-bottom: 1px solid black; */
-    font-size: 14px;
-    height: 95%;
-    width: 95%;
-}
-
-.etable table, .etable table td {
-    cursor: auto;
-}
-
-/* copy from github-css https://github.com/sindresorhus/github-markdown-css  */
-.etable table {
-    border-spacing: 0;
-    border-collapse: collapse;
-}
-
-.etable table {
-    margin-top: 0;
-    margin-bottom: 16px;
-}
-
-.etable table {
-    display: block;
-    width: 100%;
-    overflow: auto;
-    word-break: break-all;
-}
-
-.etable table th {
-    font-weight: 600;
-}
-
-.etable table th,
-.etable table td {
-    padding: 5px;
-}
-
-/* copy end ---------------------------------------------  */
-
-.etable tr {
-    width: 100%
-}
-
-.etable tr > :nth-child(1) {
-    width: 20%
-}
-
-.etable tr > :nth-child(2) {
-    width: 20%
-}
-
-.etable tr > :nth-child(3) {
-    width: 35%;
-}
-
-.etable tr > :nth-child(4) {
-    width: 25%;
-    padding: 0;
-}
-
-.etable table {
-    overflow: visible;
-}
-
-.etable tr:not(:first-child) > :nth-child(3) {
-    margin: 0;
-    padding: 0;
-    height: 100%;
-    position: relative;
-}
-
-.etable tr > :nth-child(4) {
-    text-align: center;
-}
-
-div.etableInputDiv {
-    position: absolute;
-    padding: 5px 0 0 5px;
-    top: 0;
-    bottom: 0;
-    left: 0;
-    right: 0;
-}
-
-div.checkboxSet {
-    position: relative !important;
-    max-height: 250px;
-    overflow: auto;
-}
-
-.etableInputDiv > * {
-    margin: 0;
-    padding: 0;
-    height: 100%;
-    width: 100%;
-    border: none;
-    background: transparent;
-}
-
-.etableInputDiv .checkbox {
-    width: 16px;
-    height: 16px;
-    position: absolute;
-    left: 50%;
-    top: 50%;
-    margin-left: -8px;
-    margin-top: -8px;
-}
-
-.etableInputDiv .checkboxSetMember {
-    width: 16px;
-    height: 16px;
-    display: inline-block;
-}
-
-.etableInputDiv textarea {
-    resize: none;
-}
-
-.etableInputDiv textarea:hover {
-    margin: -5px;
-}

_server/css/editor_mode_mobile.css

@@ -1,216 +0,0 @@
-.leftTab {
-    width: 100vw;
-    height: 100vw;
-}
-
-.leftTab {
-    overflow: auto;
-    position: absolute;
-    height: 100vw;
-}
-
-.leftTab > * {
-    margin: 2.5px 5px;
-}
-
-.leftTab > :first-child {
-    margin-top: 5px;
-}
-
-.leftTab > :last-child {
-    margin-bottom: 5px;
-}
-
-.leftTab {
-    left: 0;
-    top: 0;
-    width: 100vw;
-}
-
-.leftTab .leftTabHeader {
-    position: fixed;
-    top: 15px;
-    left: 15px;
-}
-
-.leftTab .leftTabContent {
-    padding-top: 50px;
-}
-
-#appendPicSelection span {
-    position: absolute;
-    font-size: 11px;
-}
-
-#left6 {
-    left: 0;
-    top: 0;
-    z-index: 200;
-    position: fixed;
-    width: 100%;
-    height: 100%;
-    overflow: hidden;
-}
-#left6 h3{
-    font-size: 6vw;
-    margin: 1.77vw 0;
-    
-}
-
-#left6 #blocklyArea {
-
-    width: 100vw;
-    height: 100vw;
-}
-
-#left6 #blocklyDiv {
-    position: relative;
-}
-
-#left6 .CodeMirror {
-    height: 38vw;
-    width: 100%;
-}
-
-#left6 #codeArea {
-    width: 99.5%;
-    height: 15.4em;
-    overflow: y; /* resize:none; */
-}
-
-#left6 #blocklyDiv .blocklyToolboxDiv{
-    width:6vw;
-}
-#left6 #blocklyDiv .blocklyTreeLabel{
-    margin-left:-4vw;
-}
-
-#left7 {
-    /* height: 440px; width: 375px;float:left; */
-    left: 0;
-    top: 0;
-    z-index: 200;
-    position: fixed;
-    width: 100%;
-    height: 100%;
-}
-
-#left7 .CodeMirror {
-    font-size: 14px;
-    height: 95%;
-    width: 95%;
-}
-
-.etable table,
-.etable table td {
-    cursor: auto;
-}
-
-/* copy from github-css https://github.com/sindresorhus/github-markdown-css  */
-.etable table {
-    border-spacing: 0;
-    border-collapse: collapse;
-}
-
-.etable table {
-    margin-top: 0;
-    margin-bottom: 16px;
-}
-
-.etable table {
-    display: block;
-    width: 100%;
-    overflow: auto;
-    word-break: break-all;
-}
-
-.etable table th {
-    font-weight: 600;
-}
-
-.etable table th,
-.etable table td {
-    padding: 5px;
-}
-
-/* copy end ---------------------------------------------  */
-
-.etable tr {
-    width: 100%
-}
-
-.etable tr > :nth-child(1) {
-    width: 20%
-}
-
-.etable tr > :nth-child(2) {
-    width: 20%
-}
-
-.etable tr > :nth-child(3) {
-    width: 38%;
-}
-
-.etable tr > :nth-child(4) {
-    width: 22%;
-    text-align: center;
-}
-
-.etable table {
-    overflow: visible;
-}
-
-.etable tr:not(:first-child) > :nth-child(3) {
-    margin: 0;
-    padding: 0;
-    height: 100%;
-    position: relative;
-}
-
-div.etableInputDiv {
-    position: absolute;
-    padding: 5px 0 0 5px;
-    top: 0;
-    bottom: 0;
-    left: 0;
-    right: 0;
-}
-
-div.checkboxSet {
-    position: relative !important;
-    max-height: 250px;
-    overflow: auto;
-}
-
-.etableInputDiv > * {
-    margin: 0;
-    padding: 0;
-    height: 100%;
-    width: 100%;
-    border: none;
-    background: transparent;
-}
-
-.etableInputDiv .checkbox {
-    width: 16px;
-    height: 16px;
-    position: absolute;
-    left: 50%;
-    top: 50%;
-    margin-left: -8px;
-    margin-top: -8px;
-}
-
-.etableInputDiv .checkboxSetMember {
-    width: 16px;
-    height: 16px;
-    display: inline-block;
-}
-
-.etableInputDiv textarea {
-    resize: none;
-}
-
-.etableInputDiv textarea:hover {
-    margin: -5px;
-}

editor-mobile.html

@@ -6,7 +6,6 @@
     <link href="_server/css/editor_mobile.css" rel="stylesheet">
     <link href="_server/CodeMirror/codemirror.css" rel="stylesheet">
     <link href="_server/thirdparty/awesomplete.css" rel="stylesheet">
-    <link href="_server/css/editor_mode_mobile.css" rel="stylesheet">
     <link href="_server/css/editor_color.css" rel="stylesheet">
     <link rel="icon" href="data:;base64,iVBORw0KGgo=">
 </head>

editor.html

@@ -5,7 +5,6 @@
     <link href="_server/css/editor.css" rel="stylesheet">
     <link href="_server/CodeMirror/codemirror.css" rel="stylesheet">
     <link href="_server/thirdparty/awesomplete.css" rel="stylesheet">
-    <link href="_server/css/editor_mode.css" rel="stylesheet">
     <link href="_server/css/editor_color.css" rel="stylesheet">
     <link rel="icon" href="data:;base64,iVBORw0KGgo=">
 </head>