diff --git a/src/renderer/assets/symbolIcon/index.js b/src/renderer/assets/symbolIcon/index.js index 831f5d89..2720b5e6 100644 --- a/src/renderer/assets/symbolIcon/index.js +++ b/src/renderer/assets/symbolIcon/index.js @@ -1 +1 @@ -(function(window){var svgSprite='';var script=function(){var scripts=document.getElementsByTagName("script");return scripts[scripts.length-1]}();var shouldInjectCss=script.getAttribute("data-injectcss");var ready=function(fn){if(document.addEventListener){if(~["complete","loaded","interactive"].indexOf(document.readyState)){setTimeout(fn,0)}else{var loadFn=function(){document.removeEventListener("DOMContentLoaded",loadFn,false);fn()};document.addEventListener("DOMContentLoaded",loadFn,false)}}else if(document.attachEvent){IEContentLoaded(window,fn)}function IEContentLoaded(w,fn){var d=w.document,done=false,init=function(){if(!done){done=true;fn()}};var polling=function(){try{d.documentElement.doScroll("left")}catch(e){setTimeout(polling,50);return}init()};polling();d.onreadystatechange=function(){if(d.readyState=="complete"){d.onreadystatechange=null;init()}}}};var before=function(el,target){target.parentNode.insertBefore(el,target)};var prepend=function(el,target){if(target.firstChild){before(el,target.firstChild)}else{target.appendChild(el)}};function appendSvg(){var div,svg;div=document.createElement("div");div.innerHTML=svgSprite;svgSprite=null;svg=div.getElementsByTagName("svg")[0];if(svg){svg.setAttribute("aria-hidden","true");svg.style.position="absolute";svg.style.width=0;svg.style.height=0;svg.style.overflow="hidden";prepend(svg,document.body)}}if(shouldInjectCss&&!window.__iconfont__svg__cssinject__){window.__iconfont__svg__cssinject__=true;try{document.write("")}catch(e){console&&console.log(e)}}ready(appendSvg)})(window) \ No newline at end of file +(function(window){var svgSprite='';var script=function(){var scripts=document.getElementsByTagName("script");return scripts[scripts.length-1]}();var shouldInjectCss=script.getAttribute("data-injectcss");var ready=function(fn){if(document.addEventListener){if(~["complete","loaded","interactive"].indexOf(document.readyState)){setTimeout(fn,0)}else{var loadFn=function(){document.removeEventListener("DOMContentLoaded",loadFn,false);fn()};document.addEventListener("DOMContentLoaded",loadFn,false)}}else if(document.attachEvent){IEContentLoaded(window,fn)}function IEContentLoaded(w,fn){var d=w.document,done=false,init=function(){if(!done){done=true;fn()}};var polling=function(){try{d.documentElement.doScroll("left")}catch(e){setTimeout(polling,50);return}init()};polling();d.onreadystatechange=function(){if(d.readyState=="complete"){d.onreadystatechange=null;init()}}}};var before=function(el,target){target.parentNode.insertBefore(el,target)};var prepend=function(el,target){if(target.firstChild){before(el,target.firstChild)}else{target.appendChild(el)}};function appendSvg(){var div,svg;div=document.createElement("div");div.innerHTML=svgSprite;svgSprite=null;svg=div.getElementsByTagName("svg")[0];if(svg){svg.setAttribute("aria-hidden","true");svg.style.position="absolute";svg.style.width=0;svg.style.height=0;svg.style.overflow="hidden";prepend(svg,document.body)}}if(shouldInjectCss&&!window.__iconfont__svg__cssinject__){window.__iconfont__svg__cssinject__=true;try{document.write("")}catch(e){console&&console.log(e)}}ready(appendSvg)})(window) \ No newline at end of file diff --git a/src/renderer/components/editorWithTabs/editor.vue b/src/renderer/components/editorWithTabs/editor.vue index 445630a8..36f8fa93 100644 --- a/src/renderer/components/editorWithTabs/editor.vue +++ b/src/renderer/components/editorWithTabs/editor.vue @@ -443,7 +443,8 @@ @import '../../../editor/index.css'; .editor-wrapper { position: relative; - height: calc(100vh - 22px); + overflow: auto; + flex: 1; } .editor-wrapper.source { position: absolute; diff --git a/src/renderer/components/editorWithTabs/index.vue b/src/renderer/components/editorWithTabs/index.vue index 307993f9..e2c694ab 100644 --- a/src/renderer/components/editorWithTabs/index.vue +++ b/src/renderer/components/editorWithTabs/index.vue @@ -56,5 +56,9 @@ diff --git a/src/renderer/components/editorWithTabs/tabs.vue b/src/renderer/components/editorWithTabs/tabs.vue index 8a997aef..8a289940 100644 --- a/src/renderer/components/editorWithTabs/tabs.vue +++ b/src/renderer/components/editorWithTabs/tabs.vue @@ -1,9 +1,12 @@ @@ -27,9 +37,15 @@ mixins: [tabsMixins], computed: { ...mapState({ + theme: state => state.preferences.theme, currentFile: state => state.editor.currentFile, tabs: state => state.editor.tabs }) + }, + methods: { + newFile () { + this.$store.dispatch('NEW_BLANK_FILE') + } } } @@ -47,16 +63,60 @@ padding: 0; display: flex; flex-direction: row; + overflow: auto; + &::-webkit-scrollbar:horizontal { + display: none; + } & > li { padding: 0 8px; color: var(--secondaryColor); font-size: 12px; line-height: 35px; + height: 35px; border-right: 1px solid #fff; background: var(--lightTabColor); + display: flex; + align-items: center; + & > svg { + opacity: 0; + } + &:hover > svg { + opacity: 1; + } + & > span { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + margin-right: 3px; + } } & > li.active { background: #fff; + & > svg { + opacity: 1; + } + } + + & > li.new-file { + width: 35px; + height: 35px; + border-right: none; + background: transparent; + display: flex; + align-items: center; + justify-content: space-around; + cursor: pointer; + } + } + .editor-tabs.dark { + background: var(--darkBgColor); + } + .editor-tabs.dark ul li { + background: var(--darkBgColor); + border-right-color: var(--darkHoverColor); + &.active { + background: var(--darkHoverColor); + color: var(--lightBorder); } } diff --git a/src/renderer/components/sideBar/folderContents.vue b/src/renderer/components/sideBar/folderContents.vue deleted file mode 100644 index 4860cbda..00000000 --- a/src/renderer/components/sideBar/folderContents.vue +++ /dev/null @@ -1,36 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/renderer/components/sideBar/openedFile.vue b/src/renderer/components/sideBar/openedFile.vue index f488e293..1e2b54d4 100644 --- a/src/renderer/components/sideBar/openedFile.vue +++ b/src/renderer/components/sideBar/openedFile.vue @@ -3,7 +3,7 @@ class="opened-file" :title="file.pathname" @click="selectFile(file)" - :class="[{'active': currentFile.pathname === file.pathname, 'unsaved': !file.isSaved }, theme]" + :class="[{'active': currentFile.id === file.id, 'unsaved': !file.isSaved }, theme]" >