Skip to content

Commit 82817c1

Browse files
style(button): standardize button styles and replace el-button (#789)
1 parent 33347b3 commit 82817c1

File tree

5 files changed

+26
-23
lines changed

5 files changed

+26
-23
lines changed

frontend/src/assets/stylesheets/element-plus/button.css

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -347,6 +347,7 @@
347347
.btn-link-color.btn-sm {
348348
padding: 8px 12px;
349349
font-size: 12px;
350+
line-height: 18px;
350351
font-weight: 400;
351352
transform: scale(1);
352353
-webkit-transform: scale(1);
@@ -368,7 +369,8 @@
368369
.btn-link-color.btn-md {
369370
/* 默认尺寸(可以认为是 md 尺寸) */
370371
padding: 10px 14px;
371-
font-size: var(--font-size-sm);
372+
font-size: 14px;
373+
line-height: 22px;
372374
font-weight: 400;
373375
transform: scale(1);
374376
-webkit-transform: scale(1);
@@ -389,7 +391,8 @@
389391
.btn-link-gray.btn-lg,
390392
.btn-link-color.btn-lg {
391393
padding: 10px 16px;
392-
font-size: var(--font-size-md);
394+
font-size: 16px;
395+
line-height: 24px;
393396
font-weight: 400;
394397
transform: scale(1);
395398
-webkit-transform: scale(1);
@@ -410,7 +413,8 @@
410413
.btn-link-gray.btn-xl,
411414
.btn-link-color.btn-xl {
412415
padding: 12px 18px;
413-
font-size: var(--font-size-md);
416+
font-size: 16px;
417+
line-height: 24px;
414418
font-weight: 400;
415419
transform: scale(1);
416420
-webkit-transform: scale(1);
@@ -431,7 +435,8 @@
431435
.btn-link-gray.btn-2xl,
432436
.btn-link-color.btn-2xl {
433437
padding: 16px 22px;
434-
font-size: var(--font-size-lg);
438+
font-size: 18px;
439+
line-height: 28px;
435440
font-weight: 400;
436441
transform: scale(1);
437442
-webkit-transform: scale(1);

frontend/src/components/organizations/InviteMember.vue

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
<button
55
v-if="role === 'admin'"
66
@click="dialogVisible = true"
7-
class="px-[12px] py-[8px] flex gap-[4px] items-center rounded-md border border-gray-300 text-sm"
7+
class="btn btn-secondary-gray btn-md"
88
>
9-
<SvgIcon name="invite_org_member" />
9+
<SvgIcon name="invite_org_member"/>
1010
<span>{{ $t('organization.invite.title') }}</span>
1111
</button>
1212
<!-- invite dialog -->
@@ -110,21 +110,18 @@
110110
</div>
111111
</div>
112112
<template #footer>
113-
<span class="flex justify-between">
114-
<el-button
115-
class="w-[50%]"
116-
size="large"
113+
<span class="flex justify-between px-4 gap-2">
114+
<button
115+
class="btn btn-secondary-gray btn-md flex-1"
117116
@click="dialogVisible = false"
118-
>{{ $t('all.cancel') }}</el-button
117+
>{{ $t('all.cancel') }}</button
119118
>
120-
<el-button
121-
class="w-[50%]"
122-
size="large"
123-
type="primary"
119+
<button
120+
class="btn btn-primary btn-md flex-1"
124121
@click="confirmInviteNewMember"
125122
>
126123
{{ $t('all.confirm') }}
127-
</el-button>
124+
</button>
128125
</span>
129126
</template>
130127
</el-dialog>

frontend/src/components/organizations/NewOrganization.vue

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,13 +87,14 @@
8787
</el-form-item>
8888

8989
<el-form-item>
90-
<el-button
91-
class="w-full !text-center !h-[48px] !text-md !text-white !bg-brand-600 !rounded-md !border-[1px] !border-brand-600"
90+
<button
91+
class="btn btn-primary btn-md"
92+
style="width: 100%;"
9293
@click="handleSubmit"
9394
:disabled="submitting"
9495
>
9596
{{ $t('organization.newOrganization.createOrg') }}
96-
</el-button>
97+
</button>
9798
</el-form-item>
9899
</el-form>
99100
</div>

frontend/src/components/organizations/OrganizationDetail.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,14 @@
1818
<div class="flex gap-[10px]">
1919
<el-popover placement="bottom-start" :width="300" trigger="click">
2020
<template #reference>
21-
<div v-if="role === 'admin' || role ==='write'" :href="`/organizations/${organizationData.name}/edit`" class="flex cursor-pointer gap-[10px] border border-gray-300 items-center rounded-md px-[12px] py-[8px]">
21+
<div v-if="role === 'admin' || role ==='write'" :href="`/organizations/${organizationData.name}/edit`" class="btn btn-secondary-gray btn-md">
2222
<SvgIcon name="create_org_repo"/>
2323
{{ $t('organization.create') }}
2424
</div>
2525
</template>
2626
<div>
2727
<a :href="`/models/new?orgName=${organizationData.name}`" class="hover:bg-gray-50 cursor-pointer flex gap-2 items-center py-[9px] px-[10px]">
28+
2829
<div class="px-2 py-2 bg-gray-50">
2930
<SvgIcon name="models" />
3031
</div>
@@ -62,8 +63,7 @@
6263
</a>
6364
</div>
6465
</el-popover>
65-
<a v-if="role === 'write' || role === 'admin'" :href="`/organizations/${organizationData.name}/edit`" class="flex gap-[10px] border border-gray-300 rounded-md px-[12px] py-[8px]">
66-
<SvgIcon name="invite_org_member" />
66+
<a v-if="role === 'write' || role === 'admin'" :href="`/organizations/${organizationData.name}/edit`" class="btn btn-secondary-gray btn-md">
6767
{{ $t('organization.orgSetting') }}
6868
</a>
6969
</div>

frontend/src/components/organizations/OrganizationEdit.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
</el-form-item>
7777

7878
<el-form-item>
79-
<el-button class="!text-center !h-[48px] !text-md !text-white !bg-brand-600 !rounded-md !border-[1px] !border-brand-600" @click="handleSubmit">{{ $t('all.saveSetting') }}</el-button>
79+
<button class="btn btn-primary btn-md" @click="handleSubmit">{{ $t('all.saveSetting') }}</button>
8080
</el-form-item>
8181
</el-form>
8282
</div>

0 commit comments

Comments
 (0)