Merge branch 'develop'

styled-components · Sep 5, 2018 · 83cccff · 83cccff
2 parents 38b22ba + f5a058f
commit 83cccff
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/after/syntax/javascript.vim b/after/syntax/javascript.vim
@@ -149,7 +149,7 @@ syn match cssError contained "{@<>"
 
 " extend javascript matches to trigger styledDefinition highlighting
 syn match jsTaggedTemplate extend
-      \ "\<css\>\|\<keyframes\>\|\<injectGlobal\>\|\<fontFace\>"
+      \ "\<css\>\|\<keyframes\>\|\<injectGlobal\>\|\<fontFace\>\|\<createGlobalStyle\>"
       \ nextgroup=styledDefinition
 syn match jsFuncCall "\<styled\>\s*(.\+)" transparent
       \ nextgroup=styledDefinition

diff --git a/examples/apis.js b/examples/apis.js
@@ -9,7 +9,7 @@ const genericTemplateString = `
  * Note: As glamor and emotion use similar APIs, only the extraneous APIs are
  *       mentioned later on.
  */
-import styled, { css, keyframes, injectGlobal } from 'styled-components';
+import styled, { css, keyframes, createGlobalStyle } from 'styled-components';
 
 // match of styled.method api
 // - unmatched cssTagName (note the double typoes and missing highlighting)
@@ -109,6 +109,17 @@ injectGlobal`
     margin: 0;
   }
 `;
+// - createGlobalStyle
+createGlobalStyle`
+  @font-face {
+    font-family: 'Operator Mono';
+    src: url('../fonts/Operator-Mono.ttf');
+  }
+
+  body {
+    margin: 0;
+  }
+`;
 
 // class based stylings
 class Container {