diff --git a/resources/assets/js/components/MDEditor/assets/css/index.less b/resources/assets/js/components/MDEditor/assets/css/index.less index 5eac12a4..143c1bf1 100644 --- a/resources/assets/js/components/MDEditor/assets/css/index.less +++ b/resources/assets/js/components/MDEditor/assets/css/index.less @@ -42,18 +42,16 @@ .markdown-toolbars { width: 100%; - display: flex; - align-items: center; + display: block; list-style: none; background: #fff; color: #6a6f7b; - height: 40px; cursor: pointer; - //box-shadow: 0 2px 3px #ddd; padding-left: 4px; border-bottom: 1px solid @border; > li { + float: left; position: relative; cursor: pointer; margin: 0; @@ -103,11 +101,17 @@ align-items: center; justify-content: center; } - } - .empty { - flex: 1; - width: 12px; + &.right { + float: right; + > ul { + list-style: none; + > li { + line-height: normal; + float: left; + } + } + } } span { diff --git a/resources/assets/js/components/MDEditor/components/pro/index.vue b/resources/assets/js/components/MDEditor/components/pro/index.vue index d154f4cf..02fa47ca 100644 --- a/resources/assets/js/components/MDEditor/components/pro/index.vue +++ b/resources/assets/js/components/MDEditor/components/pro/index.vue @@ -125,26 +125,29 @@
  • HTML2MD
  • -
  • -
  • +
  • +
  • diff --git a/resources/assets/sass/pages/components/file-content.scss b/resources/assets/sass/pages/components/file-content.scss index acb44ed3..04fa746a 100644 --- a/resources/assets/sass/pages/components/file-content.scss +++ b/resources/assets/sass/pages/components/file-content.scss @@ -250,7 +250,22 @@ overflow: auto; .edit-header, .content-body { - min-width: 900px; + min-width: 768px; + overflow-x: auto; + .tox { + .tox-toolbar--scrolling { + flex-wrap: wrap; + } + } + .teditor-loadedstyle { + .tox-menubar, + .tox-toolbar-overlord { + padding: 0; + } + .tox-sidebar-wrap { + margin: 0; + } + } } } }