Merge remote-tracking branch 'origin/master'

wayne

2021-11-12 505f666d3ecf3688778c079a8bbfb366d695cf22

 PAMapp/assets/scss/_mixin.scss

@@ -1,5 +1,5 @@
@mixin desktop() {
    @media (min-width: 1024px) {
    @media (min-width: $DESKTOP_BREAKPOINT) {
        @content;
    }
}