Merge branch 'dev' into scss-advanced-import

tmorehouse · web-flow · commit 6341d2981706 · 2019-10-06T18:05:59.000-03:00
diff --git a/src/components/navbar/package.json b/src/components/navbar/package.json
@@ -19,7 +19,7 @@
           },
           {
             "prop": "toggleable",
-            "description": "Ste to 'true' for an always collapsed navbar, or to a specific breakpoint at which point the navbar will be expanded: 'sn', 'ms', 'lg' or 'xl'"
+            "description": "Set to 'true' for an always collapsed navbar, or to a specific breakpoint at which point the navbar will be expanded: 'sm', 'md', 'lg' or 'xl'"
           },
           {
             "prop": "fixed",

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`},`
`20`	`20`	`{`
`21`	`21`	`"prop": "toggleable",`
`22`		`- "description": "Ste to 'true' for an always collapsed navbar, or to a specific breakpoint at which point the navbar will be expanded: 'sn', 'ms', 'lg' or 'xl'"`
	`22`	`+ "description": "Set to 'true' for an always collapsed navbar, or to a specific breakpoint at which point the navbar will be expanded: 'sm', 'md', 'lg' or 'xl'"`
`23`	`23`	`},`
`24`	`24`	`{`
`25`	`25`	`"prop": "fixed",`