diff --git a/frontend/assets/scss/abstract/variables/_variables.scss b/frontend/assets/scss/abstract/variables/_variables.scss index a78e79a37b..607a5733a5 100644 --- a/frontend/assets/scss/abstract/variables/_variables.scss +++ b/frontend/assets/scss/abstract/variables/_variables.scss @@ -157,6 +157,9 @@ $swift-linear-duration: 0.15s !default; $swift-linear-timing-function: linear !default; $swift-linear: all $swift-linear-duration $swift-linear-timing-function !default; +// topbar +$topbarHeight: 56px; + // sidebar $sidebarPanelWidth: 280px; $sidebarMenuWidth: 70px; diff --git a/frontend/components/base/BaseButton.vue b/frontend/components/base/BaseButton.vue index 5e33ea540c..cacccfebdd 100644 --- a/frontend/components/base/BaseButton.vue +++ b/frontend/components/base/BaseButton.vue @@ -92,12 +92,12 @@ export default { // buttons %button { position: relative; - min-width: auto; display: flex; - position: relative; + align-items: center; + gap: $base-space; + min-width: auto; overflow: hidden; user-select: none; - cursor: pointer; outline: 0; background: none; border: 0; @@ -108,13 +108,12 @@ export default { font-weight: 500; text-align: center; text-decoration: none; - vertical-align: middle; white-space: nowrap; - align-items: center; @include font-size(14px); line-height: 14px; padding: 12px 24px; transition: all 0.4s $cb-normal; + cursor: pointer; &:focus { outline: 0; } @@ -129,19 +128,11 @@ export default { } .button { @extend %button; - :deep(.svg-icon) { - margin-right: $base-space * 2; - margin-left: -$base-space * 2; - } } .small { @include font-size(13px); line-height: 13px; padding: 9px 18px; - :deep(.svg-icon) { - margin-right: $base-space; - margin-left: -$base-space; - } } .primary { background-color: $primary-color; @@ -177,6 +168,14 @@ export default { background: $black-4; } } + &.link { + background: none; + color: $primary-color; + &:hover { + text-decoration: underline; + background: none; + } + } } .secondary { diff --git a/frontend/components/base/BaseModal.vue b/frontend/components/base/BaseModal.vue index 7b75b61a0c..adea6bba1d 100644 --- a/frontend/components/base/BaseModal.vue +++ b/frontend/components/base/BaseModal.vue @@ -16,23 +16,25 @@ --> + + diff --git a/frontend/components/commons/header/dataset-options/DatasetOptions.vue b/frontend/components/commons/header/dataset-options/DatasetOptions.vue new file mode 100644 index 0000000000..bf10103317 --- /dev/null +++ b/frontend/components/commons/header/dataset-options/DatasetOptions.vue @@ -0,0 +1,41 @@ + + + + + diff --git a/frontend/components/commons/header/filters/FiltersList.vue b/frontend/components/commons/header/filters/FiltersList.vue index 4e886687fc..14689f8c83 100644 --- a/frontend/components/commons/header/filters/FiltersList.vue +++ b/frontend/components/commons/header/filters/FiltersList.vue @@ -264,7 +264,7 @@ export default { }, selectGroup(group) { if (this.initialVisibleGroup === group) { - this.initialVisibleGroup = null; + this.initialVisibleGroup = null; } else { this.initialVisibleGroup = group; } diff --git a/frontend/components/commons/header/filters/RecordsCounter.vue b/frontend/components/commons/header/filters/RecordsCounter.vue deleted file mode 100644 index dc950d0f6b..0000000000 --- a/frontend/components/commons/header/filters/RecordsCounter.vue +++ /dev/null @@ -1,27 +0,0 @@ - - - - - diff --git a/frontend/components/commons/results/ResultsList.vue b/frontend/components/commons/results/ResultsList.vue index d850b28101..d0fd94f95e 100644 --- a/frontend/components/commons/results/ResultsList.vue +++ b/frontend/components/commons/results/ResultsList.vue @@ -72,7 +72,6 @@ @@ -25,7 +25,6 @@ export default { }, tooltip: { type: String, - required: true, }, id: { type: String, @@ -35,27 +34,32 @@ export default { type: String, required: true, }, - type: { + buttonType: { type: String, - required: true, validator: (value) => { return ["Mode", "Metrics", "Refresh"].includes(value); }, }, }, + computed: { + isActive() { + return this.activeView.includes(this.id); + }, + sidebarButtonClass() { + return [this.buttonTypeClass, this.buttonStateClass]; + }, + buttonTypeClass() { + return this.buttonType?.toLowerCase(); + }, + buttonStateClass() { + return this.isActive ? "active" : null; + }, + }, }; diff --git a/frontend/components/text-classifier/header/TextClassificationHeader.vue b/frontend/components/text-classifier/header/TextClassificationHeader.vue index b850518dc8..5031dbc274 100644 --- a/frontend/components/text-classifier/header/TextClassificationHeader.vue +++ b/frontend/components/text-classifier/header/TextClassificationHeader.vue @@ -21,12 +21,8 @@ v-if="!dataset.viewSettings.visibleRulesList" :dataset="dataset" > - + - record.explanation); - }, isMultiLabel() { return this.dataset.isMultiLabel; }, diff --git a/frontend/components/text-classifier/header/TextClassificationHelpInfo.vue b/frontend/components/text-classifier/header/TextClassificationHelpInfo.vue new file mode 100644 index 0000000000..e764fb194a --- /dev/null +++ b/frontend/components/text-classifier/header/TextClassificationHelpInfo.vue @@ -0,0 +1,87 @@ + + + + + + + diff --git a/frontend/components/text-classifier/sidebar/TextClassificationSidebar.vue b/frontend/components/text-classifier/sidebar/TextClassificationSidebar.vue index 1eb5a08432..2b6d9d9e4c 100644 --- a/frontend/components/text-classifier/sidebar/TextClassificationSidebar.vue +++ b/frontend/components/text-classifier/sidebar/TextClassificationSidebar.vue @@ -95,6 +95,9 @@ export default { ], }; }, + beforeMount() { + this.$emit("set-sidebar-items", this.sidebarItems); + }, methods: { onChangeViewMode(value) { this.$emit("change-view-mode", value); diff --git a/frontend/components/text2text/header/Text2TextHeader.vue b/frontend/components/text2text/header/Text2TextHeader.vue index 2aefca7c96..747f702066 100644 --- a/frontend/components/text2text/header/Text2TextHeader.vue +++ b/frontend/components/text2text/header/Text2TextHeader.vue @@ -17,9 +17,7 @@