Skip to content

Commit cae1051

Browse files
feat(Notifications): Check & Fix bugs | JIRA: PT-86 (#46)
Co-authored-by: Trung-Hieu-Dev <dangtrunghieusg.com>
1 parent ae5e443 commit cae1051

File tree

4 files changed

+52
-37
lines changed

4 files changed

+52
-37
lines changed

src/assets/css/form.scss

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
body {
2+
.el-form.el-form--default {
3+
@apply flex flex-col items-center;
4+
}
5+
6+
.el-form-item {
7+
@apply shadow rounded overflow-hidden;
8+
}
9+
10+
.form-icon {
11+
@apply bg-white w-15/100;
12+
}
13+
14+
// Input
15+
.el-form-item.el-form-item--default.form-input {
16+
@apply w-full;
17+
}
18+
.el-input.el-input--default .el-input__inner {
19+
@apply rounded-none bg-el-form-input p-0 focus:text-slate-400 focus:font-normal text-slate-400 font-normal focus:ring-0 focus:bg-white #{!important};
20+
}
21+
.el-input.el-input--default {
22+
@apply w-85/100;
23+
}
24+
.el-form-item.checkbox {
25+
@apply self-start shadow-none #{!important};
26+
}
27+
28+
// Checkbox
29+
.el-checkbox__inner {
30+
@apply rounded shadow h-4 w-4 #{!important};
31+
}
32+
.el-checkbox__label {
33+
@apply text-mess-box-text font-normal focus:border-transparent hover:border-transparent;
34+
}
35+
.el-checkbox.el-checkbox--default .el-checkbox__inner {
36+
@apply hover:border-transparent;
37+
}
38+
.el-checkbox__input.is-checked .el-checkbox__inner {
39+
@apply bg-primary-blue;
40+
}
41+
.el-checkbox__input.is-checked + .el-checkbox__label {
42+
@apply text-slate-400;
43+
}
44+
}

src/assets/css/notifications.scss

Lines changed: 4 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,9 @@ body {
164164
}
165165

166166
// Modals - Form
167+
.el-dialog__body .el-icon {
168+
@apply text-base #{!important};
169+
}
167170

168171
.open-form .el-dialog__header {
169172
@apply hidden;
@@ -197,43 +200,10 @@ body {
197200
.btn span {
198201
@apply font-semibold text-left-bar-indigo hover:text-black;
199202
}
200-
.el-form.el-form--default {
201-
@apply flex flex-col items-center;
202-
}
203-
.el-dialog__body .el-icon {
204-
@apply text-base #{!important};
205-
}
206-
.form-icon {
207-
@apply bg-white py-2.5 px-3 h-11 w-15/100;
208-
}
209-
.el-input .el-input__inner {
210-
@apply h-11 rounded-none w-full bg-el-form-input;
211-
}
212-
.el-input.el-input--default {
213-
@apply w-85/100;
214-
}
215-
.el-form-item__content {
216-
@apply rounded-md overflow-hidden;
217-
}
218-
.form-input {
219-
@apply rounded-md shadow;
220-
}
221-
.checkbox {
222-
@apply self-start;
223-
}
224-
.el-checkbox__inner {
225-
@apply rounded shadow h-4 w-4 outline-none #{!important};
226-
}
227-
.el-checkbox__label {
228-
@apply text-mess-box-text font-normal focus:border-transparent hover:border-transparent;
229-
}
230-
.el-form-item.el-form-item--default.form-input {
231-
@apply w-full;
232-
}
233203

234204
// Responsive
235205
.el-dialog {
236-
@apply w-97/100 sm:w-8/12 md:w-7/12 lg:w-6/12 xl:w-5/12 rounded-md;
206+
@apply w-97/100 sm:w-8/12 md:w-7/12 lg:w-6/12 xl:w-4/12 rounded-md;
237207
}
238208
.open-form {
239209
@apply rounded-md bg-mess-box-bg w-97/100 md:w-96 #{!important};

src/components/element-plus.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import 'assets/css/typography.scss'
44
import 'assets/css/el-popper.scss'
55
import 'assets/css/el-breadcrumb.scss'
66
import 'assets/css/notifications.scss'
7+
import 'assets/css/form.scss'
78

89
import 'assets/css/el-pagination.scss'
910
import 'assets/css/el-table.scss'

src/modules/notification/views/index.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<h3 class="text-md">Modals</h3>
1919
</div>
2020

21-
<div class="p-5 grid grid-cols-1 lg:grid-cols-3 lg:gap-6">
21+
<div class="p-5 grid grid-cols-1 md:grid-cols-3 md:gap-6 lg:grid-cols-3 lg:gap-6">
2222
<!-- Modals - Default -->
2323
<div class="w-full mb-4">
2424
<el-button type="primary" size="large" class="w-full" text @click="openDefault = true"
@@ -119,7 +119,7 @@
119119
<component :is="form.MailIcon" />
120120
</el-icon>
121121
</div>
122-
<el-input />
122+
<el-input v-model="form.email" />
123123
</el-form-item>
124124
<!-- Password -->
125125
<el-form-item class="form-input" prop="LockClosedIcon">
@@ -128,7 +128,7 @@
128128
<component :is="form.LockClosedIcon" />
129129
</el-icon>
130130
</div>
131-
<el-input />
131+
<el-input v-model="form.password" />
132132
</el-form-item>
133133
<!-- Checkbox -->
134134
<el-form-item class="checkbox">

0 commit comments

Comments
 (0)