Merge branch 'master' of https://github.com/primefaces/primevue

primefaces · Aug 5, 2019 · ec2272a · ec2272a
2 parents f263c1a + 5e58313
commit ec2272a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/src/components/accordion/Accordion.vue b/src/components/accordion/Accordion.vue
@@ -47,7 +47,7 @@ export default {
                             <div key={tab.header||i} class="p-accordion-tab">
                                 <div class={['p-accordion-header', {'p-highlight': tab.d_active, 'p-disabled': tab.disabled}]}>
                                     <a role="tab" on-click={event => this.onTabClick(event, tab)} on-keydown={event => this.onTabKeydown(event, tab)} tabindex={tab.disabled ? null : '0'}>
-                                        <span class="p-accordion-toggle-icon pi pi-fw pi-caret-right"></span>
+                                        <span class={['p-accordion-toggle-icon pi pi-fw ',{'pi-caret-right': !tab.d_active, 'pi-caret-down': tab.d_active}]}></span>
                                         {tab.header && <span class="p-accordion-header-text">{tab.header}</span>}
                                         {tab.$slots.header}
                                     </a>

diff --git a/src/components/dialog/Dialog.vue b/src/components/dialog/Dialog.vue
@@ -3,7 +3,7 @@
         <div ref="container" :class="containerClass" v-if="visible">
             <div class="p-dialog-titlebar" v-if="showHeader">
                 <slot name="header">
-                    <span class="p-panel-title" v-if="header">{{header}}</span>
+                    <span class="p-dialog-title" v-if="header">{{header}}</span>
                 </slot>
                 <div class="p-dialog-titlebar-icons">
                     <button class="p-dialog-titlebar-icon p-dialog-titlebar-close p-link" @click="close" v-if="closable">

diff --git a/src/components/inputswitch/InputSwitch.vue b/src/components/inputswitch/InputSwitch.vue
@@ -45,6 +45,7 @@ export default {
                 'p-inputswitch p-component',
                 {
                     'p-inputswitch-checked': this.value,
+					'p-disabled': this.disabled,
                     'p-inputswitch-focus': this.focused
                 }
             ];