From 5f735ce0912b356bf8ae74ee2bf9f37544663d8f Mon Sep 17 00:00:00 2001
From: ManjaroOne666 <git@gabbaell.co.uk>
Date: Wed, 17 Oct 2018 12:07:10 +0100
Subject: [PATCH] update

---
 vim/UltiSnips/css.snippets  |  33 +++++++++++++++++++++++++--------
 vim/after/ftplugin/sass.vim |   2 ++
 vim/after/syntax/vue.vim    |  11 ++++++++---
 vim/ftplugin/vue.vim        |   2 ++
 vim/spell/en.utf-8.add      |  20 ++++++++++++++++++++
 vim/spell/en.utf-8.add.spl  | Bin 0 -> 340 bytes
 6 files changed, 57 insertions(+), 11 deletions(-)
 create mode 100644 vim/after/ftplugin/sass.vim
 create mode 100644 vim/ftplugin/vue.vim
 create mode 100644 vim/spell/en.utf-8.add
 create mode 100644 vim/spell/en.utf-8.add.spl

diff --git a/vim/UltiSnips/css.snippets b/vim/UltiSnips/css.snippets
index 38eeeb8..ffed063 100644
--- a/vim/UltiSnips/css.snippets
+++ b/vim/UltiSnips/css.snippets
@@ -1,5 +1,5 @@
 snippet @m "@media ..."
-@media ($(1{min}-width: $2${3:em}) {
+@media (${1:min}-${2:width}: $3) {
   $0
 }
 endsnippet
@@ -22,33 +22,46 @@ endsnippet
 
 snippet w "width: ;"
 width: ${1:100%};
-$0
 endsnippet
 
 snippet h "height: ;"
 height: ${1:100%};
-$0
+endsnippet
+
+snippet maxw "max-width: ;"
+max-width: ${1:100%};
+endsnippet
+
+snippet maxh "max-height: ;"
+max-height: ${1:100%};
+endsnippet
+
+snippet minw "min-width: ;"
+min-width: ${1:100%};
+endsnippet
+
+snippet minh "min-height: ;"
+min-height: ${1:100%};
 endsnippet
 
 snippet bgc "background-color: ;"
 background-color: ${1:transparent};
-$0
 endsnippet
 
 snippet t "top: ... ;"
-top: ${1:100%};
+top: ${1:0};
 endsnippet
 
 snippet b "bottom: ... ;"
-bottom: ${1:100%};
+bottom: ${1:0};
 endsnippet
 
 snippet l "left: ... ;"
-left: ${1:100%};
+left: ${1:0};
 endsnippet
 
 snippet r "right: ... ;"
-right: ${1:100%};
+right: ${1:0};
 endsnippet
 
 snippet m "margin: ... ;"
@@ -94,3 +107,7 @@ endsnippet
 snippet fs "font-size: ... ;"
 font-size: ${1:1}${2:rem};
 endsnippet
+
+snippet o "opacity: ... ;"
+opacity: ${1:0};
+endsnippet
diff --git a/vim/after/ftplugin/sass.vim b/vim/after/ftplugin/sass.vim
new file mode 100644
index 0000000..79981e1
--- /dev/null
+++ b/vim/after/ftplugin/sass.vim
@@ -0,0 +1,2 @@
+
+set includeexpr=substitute(substitute(substitute(v:fname,'\%(.*/\|^\)\zs','_',''),'^[\\~@]\/','./',''),'^[\\~@]','./node_modules/','')
diff --git a/vim/after/syntax/vue.vim b/vim/after/syntax/vue.vim
index 3f81178..97f7db9 100644
--- a/vim/after/syntax/vue.vim
+++ b/vim/after/syntax/vue.vim
@@ -6,7 +6,7 @@ syn match   vueDirective "\(^\|\s\)\zs[v:][-:.0-9_a-z]*"   containedin=htmlTag,v
 syn match   vueEvent        "\(^\|\s\)\zs[@][-:.0-9_a-z]*" containedin=htmlTag,vueTag,htmlTagN nextgroup=vueEventValue
 syn match   vueConditional  "\<v-else"                     containedin=htmlTag,vueTag,htmlTagN
 syn match   vueConditional  "\<v-if\|\<v-show"             containedin=htmlTag,vueTag,htmlTagN nextgroup=vueConditionalValue
-syn match   vueSlot         +\<slot=+he=e-1               containedin=htmlTag,vueTag,htmlTagN nextgroup=vueSlotValue
+syn match   vueSlot         +\<slot=+he=e-1               containedin=htmlTag,vueTag,htmlTagN nextgroup=vueSlotName
 syn match   vueFor          "\<v-for"                      containedin=htmlTag,vueTag,htmlTagN nextgroup=vueForValue
 syn match   vueRef          "\(^\|\s\)\zs:\?ref"           containedin=htmlTag,vueTag,htmlTagN nextgroup=vueRefValue
 
@@ -27,8 +27,8 @@ syn region vueForValue            contained start=+="+hs=s+2 end=+"+he=e-1
 syn region vueForValue            contained start=+='+hs=s+2 end=+'+he=e-1
 syn match vueRefValue             contained +="[-:.0-9_a-z]*"+hs=s+2,he=e-1
 syn match vueRefValue             contained +='[-:.0-9_a-z]*'+hs=s+2,he=e-1
-syn match vueSlotValue            contained +"[-:.0-9_a-z]*"+hs=s+1,he=e-1
-syn match vueSlotValue            contained +'[-:.0-9_a-z]*'+hs=s+1,he=e-1
+syn match vueSlotName            contained +"[-:.0-9_a-z]*"+hs=s+1,he=e-1
+syn match vueSlotName            contained +'[-:.0-9_a-z]*'+hs=s+1,he=e-1
 
 syn match vueComponentName contained "\(<\|</\)\zsvue-[0-9A-Za-z\-]\+\|\(<\|</\)\zs\u\+[0-9A-Za-z]\+\ze\(\s\|>\)" containedin=htmlTag,vueTag,htmlTagN
 syn region vueLink start="<router-link\>[^>]*" end="</router-link>"me=e-14 contains=@Spell,vueTag,htmlEndTag,htmlSpecialChar,htmlPreProc,htmlComment,htmlLeadingSpace,javaScript,@htmlPreproc,vueComponentName
@@ -37,10 +37,15 @@ syn match vueComponentName contained "router-link" containedin=vueTag,htmlEndTag
 hi! def link vueLink htmlLink
 
 syn match vueDynamicComponent contained "\<component\>\|\<keep-alive\>\|\<router-link\>" containedin=htmlTag,vueTag,htmlTagN
+
 syn match  vueTransitionComponent contained "\<transition\>" containedin=htmlTag,vueTag,htmlTagN nextgroup=vueTransitionName,vueTransitionMode
 syn region vueTransitionName contained start=+\sname="+hs=s+7 end=+"+he=e-1 containedin=htmlTag,vueTag,htmlTagN
 syn region vueTransitionMode contained start=+\smode="+hs=s+7 end=+"+he=e-1 containedin=htmlTag,vueTag,htmlTagN
 
+syn region vueSlotTag start="<slot\>[^>]*" end="</slot>"me=e-14 contains=@Spell,vueTag,htmlEndTag,htmlSpecialChar,htmlPreProc,htmlComment,htmlLeadingSpace,javaScript,@htmlPreproc,vueSlotTagName
+syn match vueSlotTagName contained "slot" containedin=vueTag,htmlEndTag nextgroup=vueSlotName
+syn region vueSlotName contained start=+\sname="+hs=s+7 end=+"+he=e-1 containedin=htmlTag,vueTag,htmlTagN
+
 syn keyword vueTagSpecial  contained template script style containedin=htmlTagN
 syn keyword htmlArg        contained scoped ts
 
diff --git a/vim/ftplugin/vue.vim b/vim/ftplugin/vue.vim
new file mode 100644
index 0000000..c3b50e2
--- /dev/null
+++ b/vim/ftplugin/vue.vim
@@ -0,0 +1,2 @@
+set includeexpr=substitute(substitute(v:fname,'^[\\~@]\/','./',''),'^[\\~@]','./node_modules/','')
+set suffixesadd=.js,.vue,.scss
diff --git a/vim/spell/en.utf-8.add b/vim/spell/en.utf-8.add
new file mode 100644
index 0000000..47995e1
--- /dev/null
+++ b/vim/spell/en.utf-8.add
@@ -0,0 +1,20 @@
+Giana
+WooCommerce
+MacFarley's
+Callum
+Connor
+MacFarleys
+Stantham
+LLP
+Pascutti
+Heerlen
+Lecadini
+#efretina
+Defretina's
+Lecadina
+Defretina/!
+Defretini
+Defretini's
+Aanajse
+Fotostudio
+EUR
diff --git a/vim/spell/en.utf-8.add.spl b/vim/spell/en.utf-8.add.spl
new file mode 100644
index 0000000000000000000000000000000000000000..1fa936e5f046c1456d2d862cf55b312086040a4b
GIT binary patch
literal 340
zcmZXQy^g{#5QIG|%B!w|9x2@wJi;L%Aw&zcl^7D_*b$ou(eWJjNcU1OYhA_3^7?1y
zo3(t{?sW(;uAa`h-w$6m;dE|eKj;k}iSq(QfQa~v$T0!VEqZDRx$LjhPp~?oLlWPK
zd{#wLa<qR}#IBGTiIG!TCp2_hR_1EGZ10&8XpO9PP7)$&%4SZMMGH$IcLRl*z5O3?
zmr4!$QOJY0N_Aqdv1D~zt<Q+o&P&giWI8f>4(nPMIPfdJWPdE-n}6YRg)8Lxotzu#
F+zVIHJyrk!

literal 0
HcmV?d00001