Merge branch 'new-syntax'

vimrc

@@ -339,6 +339,7 @@ augroup AutoSaveFolds
   autocmd BufWinEnter *.* silent loadview
 augroup END
 
+<<<<<<< HEAD
 " set custom syntax highlighting
 augroup syntaxhighlighting
   autocmd BufNewFile,BufRead *.html set syntax=html_custom
@@ -348,6 +349,8 @@ augroup syntaxhighlighting
   autocmd BufNewFile,BufRead *.js set syntax=pangloss_javascript_custom
 augroup END
 
+=======
+>>>>>>> new-syntax
 " fix higlight problems such as vertical-align etc
 augroup VimCSS3Syntax
   autocmd!
@@ -483,6 +486,11 @@ let g:taboo_modified_tab_flag = '+'
 " vue-vim
 " disable preprocessor checking for vue files - increases speed
 let g:vue_disable_pre_processors=1
+" set custom syntax highlighting
+augroup fixhighlighting
+  autocmd BufNewFile,BufRead *.vue syntax sync fromstart
+augroup END
+
 
 " ALE
 nnoremap <leader>ne :lnext<cr>