fix: CSidebar: give precedens to overlaid prop over fixed prop

woothu · woothu · commit e1f9ee92adc7 · 2019-12-10T16:53:53.000+01:00
diff --git a/src/components/sidebar/CSidebar.vue b/src/components/sidebar/CSidebar.vue
@@ -99,7 +99,7 @@ export default {
         {
           'c-sidebar-show': this.open === true,
           [`c-sidebar-${this.breakpoint}-show`]: haveResponsiveClass,
-          'c-sidebar-fixed': this.fixed,
+          'c-sidebar-fixed': this.fixed && !this.overlaid,
           'c-sidebar-right': this.aside,
           'c-sidebar-minimized': this.minimize && !this.unfoldable,
           'c-sidebar-unfoldable': this.minimize && this.unfoldable,

Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ export default {`
`99`	`99`	`{`
`100`	`100`	`'c-sidebar-show': this.open === true,`
`101`	`101`	[`c-sidebar-${this.breakpoint}-show`]: haveResponsiveClass,
`102`		`- 'c-sidebar-fixed': this.fixed,`
	`102`	`+ 'c-sidebar-fixed': this.fixed && !this.overlaid,`
`103`	`103`	`'c-sidebar-right': this.aside,`
`104`	`104`	`'c-sidebar-minimized': this.minimize && !this.unfoldable,`
`105`	`105`	`'c-sidebar-unfoldable': this.minimize && this.unfoldable,`