Skip to content

Commit e8bbed7

Browse files
authored
Merge pull request #20 from ltv/fix/PT-59
fix(frontend)::bug: fix grid
2 parents 7ec2b18 + 1d9b9e1 commit e8bbed7

File tree

11 files changed

+745
-727
lines changed

11 files changed

+745
-727
lines changed

components.d.ts

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
// generated by unplugin-vue-components
2+
// We suggest you to commit this file into source control
3+
// Read more: https://github.com/vuejs/vue-next/pull/3399
4+
5+
declare module 'vue' {
6+
export interface GlobalComponents {
7+
ElAlert: typeof import('element-plus/es')['ElAlert']
8+
ElAvatar: typeof import('element-plus/es')['ElAvatar']
9+
ElButton: typeof import('element-plus/es')['ElButton']
10+
ElButtonGroup: typeof import('element-plus/es')['ElButtonGroup']
11+
ElCard: typeof import('element-plus/es')['ElCard']
12+
ElCol: typeof import('element-plus/es')['ElCol']
13+
ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
14+
ElContainer: typeof import('element-plus/es')['ElContainer']
15+
ElDivider: typeof import('element-plus/es')['ElDivider']
16+
ElDropdown: typeof import('element-plus/es')['ElDropdown']
17+
ElDropdownItem: typeof import('element-plus/es')['ElDropdownItem']
18+
ElDropdownMenu: typeof import('element-plus/es')['ElDropdownMenu']
19+
ElIcon: typeof import('element-plus/es')['ElIcon']
20+
ElInput: typeof import('element-plus/es')['ElInput']
21+
ElLink: typeof import('element-plus/es')['ElLink']
22+
ElRow: typeof import('element-plus/es')['ElRow']
23+
ElSkeleton: typeof import('element-plus/es')['ElSkeleton']
24+
ElSkeletonItem: typeof import('element-plus/es')['ElSkeletonItem']
25+
ElTable: typeof import('element-plus/es')['ElTable']
26+
ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
27+
ElTag: typeof import('element-plus/es')['ElTag']
28+
Grid: typeof import('./src/components/Grid/index.vue')['default']
29+
Main: typeof import('./src/components/Main/index.vue')['default']
30+
Navigation: typeof import('./src/components/Navigation/index.vue')['default']
31+
Sidebar: typeof import('./src/components/Sidebar/index.vue')['default']
32+
Table: typeof import('./src/components/Table/index.vue')['default']
33+
}
34+
}
35+
36+
export { }

src/assets/css/el-button.scss

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,14 @@ body {
1414
--el-button-hover-border-color: var(--button-hover-border-color) !important;
1515
--el-button-active-border-color: var(--button-active-border-color) !important;
1616
background-color: var(--el-button-bg-color, var(--el-color-white));
17-
@apply hover:pt-1.5 hover:shadow-sm active:bg-[#6cffff];
17+
18+
@apply hover:shadow-sm active:bg-[#6cffff];
19+
20+
&:hover {
21+
i, span {
22+
@apply -translate-y-0.25;
23+
}
24+
}
1825
}
1926

2027
@each $type in $types {

src/assets/css/el-divider.scss

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
.el-divider.el-divider--horizontal {
2+
@apply mt-2 mb-4;
3+
}

src/assets/css/el-table.css

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
}
88

99
.el-table {
10-
@apply border-collapse mt-4 !important;
10+
@apply border-collapse mt-4 rounded !important;
1111
}
1212

1313
.el-table--border::after,
@@ -51,10 +51,14 @@
5151
@apply hover:bg-gray-200 !important;
5252
}
5353

54-
.el-table__body .el-table_1_column_1 {
54+
.el-table__body tr td:first-child {
5555
@apply bg-white border-transparent !important;
5656
}
5757

58-
.el-table__body .el-table_1_column_2 {
58+
.el-table__body tr td:nth-child(2) {
5959
@apply rounded-l-lg !important;
60+
}
61+
62+
.green-col {
63+
@apply text-[#86CC60];
6064
}

src/components/element-plus.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import 'assets/css/el-dropdown.scss'
77
import 'assets/css/el-alert.scss'
88
import 'assets/css/el-checkbox.scss'
99
import 'assets/css/el-link.scss'
10+
import 'assets/css/el-divider.scss'
1011

1112
import 'assets/css/el-message.css'
1213
import 'assets/css/typography.scss'

0 commit comments

Comments
 (0)