Commit Graph

38 Commits

Author SHA1 Message Date
chenjinsong
e7273d0be0 NEZ-1072 fix: 主题调整 2021-11-04 19:11:44 +08:00
chenjinsong
543503c571 NEZ-1072 feat: 主题切换冲突解决 2021-11-02 14:05:16 +08:00
chenjinsong
ef664be5ef Merge remote-tracking branch 'origin/dev-3.1' into dev-3.1.1_theme
# Conflicts:
#	nezha-fronted/src/assets/css/common.scss
#	nezha-fronted/src/assets/css/common/tableCommon.scss
#	nezha-fronted/src/assets/stylus/main.scss
#	nezha-fronted/src/components/charts/chart-list.vue
#	nezha-fronted/src/components/charts/logs.vue
#	nezha-fronted/src/components/common/alert/alertLabel.vue
#	nezha-fronted/src/components/common/alert/alertRuleInfo.vue
#	nezha-fronted/src/components/common/bottomBox/bottomBox.vue
#	nezha-fronted/src/components/common/bottomBox/tabs/endpointQuery.vue
#	nezha-fronted/src/components/common/bottomBox/tabs/endpointQueryTab.vue
#	nezha-fronted/src/components/common/bottomBox/tabs/logBottomTab.vue
#	nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue
#	nezha-fronted/src/components/common/detailView/list/alertRule/alertRuleDetail.vue
#	nezha-fronted/src/components/common/detailView/list/asset/assetDetail.vue
#	nezha-fronted/src/components/common/detailView/list/dc/dcDetail.vue
#	nezha-fronted/src/components/common/detailView/list/endpoint/endpointDetail.vue
#	nezha-fronted/src/components/common/detailView/list/module/moduleDetail.vue
#	nezha-fronted/src/components/common/detailView/nzDetailView.vue
#	nezha-fronted/src/components/common/detailView/view/detailViewRight.vue
#	nezha-fronted/src/components/common/labelFilter/clickSearch.vue
#	nezha-fronted/src/components/common/multipleTime.vue
#	nezha-fronted/src/components/common/pickTime.vue
#	nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue
#	nezha-fronted/src/components/common/project/L5/topoTooltip.vue
#	nezha-fronted/src/components/common/project/popData/Info.vue
#	nezha-fronted/src/components/common/rightBox/alertRuleBox.vue
#	nezha-fronted/src/components/common/table/alert/alertRuleTable.vue
#	nezha-fronted/src/components/common/table/alert/alertSilenceTable.vue
#	nezha-fronted/src/components/common/table/settings/userTable.vue
#	nezha-fronted/src/components/layout/header.vue
#	nezha-fronted/src/components/page/alert/alertMessage.vue
#	nezha-fronted/src/components/page/alert/nzAlertTag.vue
#	nezha-fronted/src/components/page/asset/components/operation.vue
#	nezha-fronted/src/components/page/config/mibBrowser.vue
#	nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue
#	nezha-fronted/src/components/page/dashboard/explore/logTab.vue
#	nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue
#	nezha-fronted/src/components/page/dashboard/overview/overview2.vue
#	nezha-fronted/src/components/page/dashboard/panel.vue
2021-11-01 18:24:01 +08:00
chenjinsong
914c096463 NEZ-1072 feat: 主题切换 2021-11-01 17:23:01 +08:00
@changcode
d32811dc52 fix: 修复chartBox样式问题 2021-10-29 18:57:24 +08:00
@changcode
d89df0decd NEZ-1138 style: 修复Module页面样式问题 2021-10-29 18:31:52 +08:00
@changcode
47d1863111 style: 优化select公用样式,及类名 2021-10-29 12:02:34 +08:00
@changcode
8e2362a42a NEZ-1089 fix:建议Project页面元素对齐 2021-10-26 18:09:39 +08:00
@changcode
d2f6dee57d style: agent 下载弹框,下拉选择器样式调整 2021-10-11 15:16:13 +08:00
@changcode
2bf2ca0504 style: asset 批量修改样式调整 2021-09-27 17:11:08 +08:00
@changcode
c1ed41785a style: alert Rule 下拉框样式调整 2021-09-27 15:39:23 +08:00
@changcode
9a07b6e454 style: select 样式调整 2021-09-27 10:25:19 +08:00
@changcode
9542e1a63a style: Box 样式调整 2021-09-26 18:14:47 +08:00
@changcode
59d8caa804 style: elementSat 样式调整 2021-09-26 14:50:22 +08:00
@changcode
5879ca0c8a style:下拉选择器样式统一 2021-09-26 11:56:36 +08:00
@changcode
13c3d79162 Merge branch 'dev-2.0' of https://git.mesalab.cn/nezha/nezha-fronted into dev-2.0 2021-09-26 09:14:14 +08:00
@changcode
1e80a05033 style: 下拉样式调整 2021-09-26 09:14:07 +08:00
zhangyu
85c4dbf0ee style: asset Brand样式修改 2021-09-24 18:28:37 +08:00
@changcode
025ae13877 NEZ-1023 style: 下拉列表 样式调整 2021-09-24 17:07:16 +08:00
@changcode
efbd90796a style: 各页面可点击功能,补充鼠标手势 2021-09-18 17:59:43 +08:00
@changcode
7a4bbfee4a NEZ-992 fix: 修复 asset 批量修改 label 显示问题 2021-09-14 10:52:54 +08:00
@changcode
55a644c6ac fix: 调整 promlInput 组件 和 chaartBox Legend 样式 2021-09-03 17:23:41 +08:00
@changcode
022551b4bd fix: alertRuleBox expr input 组件类名调整 2021-09-03 11:44:38 +08:00
@changcode
bb5f8cfd0a fix: 样式调整 2021-09-02 15:37:01 +08:00
@changcode
78ff126164 fix: module 数字遮挡问题 2021-06-02 16:39:02 +08:00
@changcode
0591146fff fix: 解决desription 数字遮挡边框问题 2021-06-02 15:41:43 +08:00
@changcode
c3dace7cd5 fix: 数字遮挡边框问题 2021-06-02 14:23:07 +08:00
@changcode
1e63b525c2 fix: 修复 metric 数字遮挡边框 2021-06-02 14:21:09 +08:00
@changcode
d4e75f8a3d fix: expr metric 样式问题 2021-06-02 13:50:47 +08:00
@changcode
ab15f6499d NEZ-714 fix: alert rule 编辑页面 样式错误 2021-06-02 11:52:40 +08:00
@changcode
d710a29c1e fix: 多余样式去除 2021-05-31 16:09:27 +08:00
@changcode
f526c9d824 NEZ-697 fix: textarea类型的输入框,字数提示遮挡内容问题。icon图标更新 2021-05-31 15:10:04 +08:00
zhangyu
753f4d76d9 style:样式微调 2021-05-27 16:05:16 +08:00
@changcode
7bb2975867 NEZ-662 fix : 解决因全局css样式的影响 2021-05-25 17:58:38 +08:00
chenjinsong
ee9d15b230 NZ-584 feat: panel顶部工具栏改版 2021-04-27 16:26:22 +08:00
chenjinsong
2b3047b413 feat: asset功能、panel样式修复 2021-04-26 21:42:15 +08:00
zhangyu
d4374d89ed feat: 侧滑样式修改 添加chatTemp的列表 2021-04-23 11:47:38 +08:00
chenjinsong
978049999e feat: asset相关先提交一部分,公共样式 2021-04-22 12:25:23 +08:00