-
+
{{ route.name === "ViewWidget" ? "" : appStore.pageTitle || pageName }}
{{ t("timeTips") }}
background-color: #fafbfc;
border-bottom: 1px solid #dfe4e8;
color: #222;
- font-size: 12px;
+ font-size: $font-size-smaller;
}
.nav-bar.dark {
@@ -170,7 +161,7 @@ limitations under the License. -->
}
.title {
- font-size: 14px;
+ font-size: $font-size-normal;
font-weight: 500;
height: 28px;
line-height: 28px;
diff --git a/src/layout/components/SideBar.vue b/src/layout/components/SideBar.vue
index 0ad4655a..9eca2fc5 100644
--- a/src/layout/components/SideBar.vue
+++ b/src/layout/components/SideBar.vue
@@ -36,14 +36,16 @@ limitations under the License. -->
- {{ t(menu.meta.title) }}
+ {{ te(menu.meta.i18nKey) ? t(menu.meta.i18nKey) : menu.meta.title }}
- {{ m.meta && t(m.meta.title) }}
+
+ {{ m.meta && (te(m.meta.i18nKey) ? t(m.meta.i18nKey) : m.meta.title) }}
+
@@ -56,7 +58,9 @@ limitations under the License. -->
@@ -67,7 +71,7 @@ limitations under the License. -->
diff --git a/src/views/Event.vue b/src/views/Event.vue
index a101e868..fade863e 100644
--- a/src/views/Event.vue
+++ b/src/views/Event.vue
@@ -26,6 +26,6 @@ limitations under the License. -->
.event {
flex-grow: 1;
height: 100%;
- font-size: 12px;
+ font-size: $font-size-smaller;
}
diff --git a/src/views/Marketplace.vue b/src/views/Marketplace.vue
new file mode 100644
index 00000000..556ae7b6
--- /dev/null
+++ b/src/views/Marketplace.vue
@@ -0,0 +1,132 @@
+
+
+
+
+
+
diff --git a/src/views/Settings.vue b/src/views/Settings.vue
index 4abd5f6c..86d71a5f 100644
--- a/src/views/Settings.vue
+++ b/src/views/Settings.vue
@@ -145,7 +145,7 @@ limitations under the License. -->
.auto-select {
border-radius: 3px;
- background-color: #fff;
+ background-color: $theme-background;
padding: 1px;
input {
@@ -168,7 +168,7 @@ limitations under the License. -->
outline: 0;
width: 50px;
border-radius: 3px;
- border: 1px solid #ccc;
+ border: 1px solid $disabled-color;
text-align: center;
height: 25px;
}
diff --git a/src/views/alarm/Content.vue b/src/views/alarm/Content.vue
index a107a399..90bf50ee 100644
--- a/src/views/alarm/Content.vue
+++ b/src/views/alarm/Content.vue
@@ -142,12 +142,12 @@ limitations under the License. -->
}
diff --git a/src/views/alarm/Header.vue b/src/views/alarm/Header.vue
index 8c006914..0ac0f3dd 100644
--- a/src/views/alarm/Header.vue
+++ b/src/views/alarm/Header.vue
@@ -32,8 +32,8 @@ limitations under the License. -->