Merge branch '3.4' into 4.2

javiereguiluz · javiereguiluz · commit 816fa586059a · 2019-04-23T09:09:22.000+02:00
* 3.4:
  Frontend: fix class name when using Vue/JSX/Styles
diff --git a/frontend/encore/vuejs.rst b/frontend/encore/vuejs.rst
@@ -129,7 +129,7 @@ a workaround, you can use `CSS Modules`_ by suffixing import paths with
         color: red
     }
 
-The output will be something like ``<h1 class="h1_a3dKp">Hello World</h1>``.
+The output will be something like ``<h1 class="title_a3dKp">Hello World</h1>``.
 
 Using images
 ~~~~~~~~~~~~

Original file line number	Diff line number	Diff line change
@@ -129,7 +129,7 @@ a workaround, you can use `CSS Modules`_ by suffixing import paths with
`129`	`129`	`color: red`
`130`	`130`	`}`
`131`	`131`
`132`		-The output will be something like ``<h1 class="h1_a3dKp">Hello World</h1>``.
	`132`	+The output will be something like ``<h1 class="title_a3dKp">Hello World</h1>``.
`133`	`133`
`134`	`134`	`Using images`
`135`	`135`	`~~~~~~~~~~~~`