diff --git a/src/components/mdInputContainer/mdInputContainer.theme b/src/components/mdInputContainer/mdInputContainer.theme index bc544e1..3b89b54 100644 --- a/src/components/mdInputContainer/mdInputContainer.theme +++ b/src/components/mdInputContainer/mdInputContainer.theme @@ -57,9 +57,5 @@ color: #{'BACKGROUND-CONTRAST-0.38'}; } } - - .md-icon:not(.md-icon-delete):after { - background: #{'BACKGROUND-COLOR'}; - } } } diff --git a/src/components/mdTable/mdTableHead.vue b/src/components/mdTable/mdTableHead.vue index edb084f..20fc782 100644 --- a/src/components/mdTable/mdTableHead.vue +++ b/src/components/mdTable/mdTableHead.vue @@ -68,7 +68,7 @@ initSort() { if (this.hasMatchSort()) { this.sorted = true; - this.sortType = this.parentTable.sortType; + this.sortType = this.parentTable.sortType || 'asc'; } } }, diff --git a/src/components/mdTabs/mdTab.vue b/src/components/mdTabs/mdTab.vue index 45325c8..6d29253 100644 --- a/src/components/mdTabs/mdTab.vue +++ b/src/components/mdTabs/mdTab.vue @@ -14,6 +14,7 @@ id: [String, Number], mdLabel: [String, Number], mdIcon: String, + mdIconset: String, mdActive: Boolean, mdDisabled: Boolean, mdOptions: { @@ -47,6 +48,9 @@ mdIcon() { this.updateTabData(); }, + mdIconset() { + this.updateTabData(); + }, mdOptions: { deep: true, handler() { @@ -80,6 +84,7 @@ id: this.tabId, label: this.mdLabel, icon: this.mdIcon, + iconset: this.mdIconset, options: this.mdOptions, active: this.mdActive, disabled: this.mdDisabled, diff --git a/src/components/mdTabs/mdTabs.vue b/src/components/mdTabs/mdTabs.vue index d1333df..08c7d93 100644 --- a/src/components/mdTabs/mdTabs.vue +++ b/src/components/mdTabs/mdTabs.vue @@ -13,9 +13,13 @@ @click="setActiveTab(header)" ref="tabHeader"> +
{{ header.icon }} + {{ header.icon }} + {{ header.label }} + {{ header.tooltip }}
@@ -23,9 +27,11 @@ + + @@ -251,7 +257,7 @@ this.hasNavigationScroll = scrollWidth > clientWidth; }, setActiveTab(tabData) { - this.hasIcons = !!tabData.icon; + this.hasIcons = !!tabData.icon || !!tabData.iconset; this.hasLabel = !!tabData.label; this.activeTab = tabData.id; this.activeTabNumber = this.getTabIndex(this.activeTab);