Skip to content

Commit 2857010

Browse files
pmPaulispmPaulis
authored
Merge pull request #7953 from ProcessMaker/feature/FOUR-20628
FOUR-20628: Update the size font and color
2 parents d490380 + df546ec commit 2857010

10 files changed

Lines changed: 25 additions & 34 deletions

File tree

‎resources/jscomposition/base/table/BaseTable.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
:class="{
88
'tw-table-fixed':getDefaultConfig(config).tableFixed
99
}">
10-
<thead class="tw-border-b tw-sticky tw-top-0 tw-z-[9] tw-bg-gray-50">
10+
<thead class="tw-border-b tw-sticky tw-top-0 tw-z-[9] tw-bg-gray-50 tw-text-[#5C6066] tw-border-[#EBEDEF]">
1111
<tr>
1212
<THeader
1313
v-for="(column, index) in columns"

‎resources/jscomposition/base/table/TRow.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<template>
22
<tr
3-
class="tw-border-b tw-relative"
3+
class="tw-border-b tw-relative tw-border-[#EBEDEF]"
44
@mouseover="menu = true"
55
@mouseleave="menu = false">
66
<slot :name="`cell`" />

‎resources/jscomposition/cases/casesMain/CasesDataSection.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
ref="table"
2121
:columns="columnsConfig"
2222
:data="data"
23-
class="tw-text-gray-600"
23+
class="tw-text-[#4F5154]"
2424
:placeholder="showPlaceholder"
2525
@changeFilter="onChangeFilter"
2626
@resetFilters="onChangeFilter">

‎resources/jscomposition/system/table/cell/CaseTitleCell.vue‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
<div class="tw-text-nowrap tw-whitespace-nowrap tw-p-3">
33
<a
44
v-if="href !== null"
5-
class="hover:tw-text-blue-400 tw-text-gray-500"
5+
class="hover:tw-text-blue-400 tw-text-inherit tw-no-underline"
66
:href="href(row)">
77
<case-title
88
:title="row.case_title_formatted"
99
:default-value="getValue()" />
1010
</a>
1111
<span
1212
v-else
13-
class="hover:tw-text-blue-400 tw-text-gray-500 hover:tw-cursor-pointer"
13+
class="hover:tw-text-blue-400 text-inherit no-underline hover:tw-cursor-pointer"
1414
@click.prevent="onClick">
1515
<case-title
1616
:title="row.case_title_formatted"

‎resources/jscomposition/system/table/cell/CollapseFormCell.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<button
44
v-if="show(row, column, columns)"
55
type="button"
6-
class="tw-rounded-lg tw-bg-white tw-px-2.5 tw-py-1 tw-text-sm tw-font-semibold tw-text-gray-900
6+
class="tw-rounded-lg tw-bg-white tw-px-2.5 tw-py-1 tw-text-sm tw-font-semibold
77
tw-shadow-sm tw-ring-1 tw-ring-inset tw-ring-gray-300 hover:tw-bg-gray-50"
88
@click="showScreen">
99
<i

‎resources/jscomposition/system/table/cell/LinkCell.vue‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
class="tw-text-nowrap tw-whitespace-nowrap tw-overflow-hidden tw-text-ellipsis tw-p-3">
44
<a
55
v-if="href !== null"
6-
class="hover:tw-text-blue-400 tw-text-gray-600"
6+
class="hover:tw-text-blue-400 tw-text-inherit tw-no-underline"
77
:href="href(row)">
88
{{ getValue() }}
99
</a>
1010
<span
1111
v-else
12-
class="hover:tw-text-blue-400 tw-text-gray-600 hover:tw-cursor-pointer"
12+
class="hover:tw-text-blue-400 tw-text-inherit tw-no-underline hover:tw-cursor-pointer"
1313
@click.prevent="onClick">
1414
{{ getValue() }}
1515
</span>

‎resources/jscomposition/system/table/cell/ParticipantCell.vue‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
position="bottom"
55
:hover="true">
66
<AppAvatar
7-
:class="`tw-bg-gray-500`"
87
:initials="initials(row, column, columns) || ''"
98
:src="src(row, column, columns)"
109
class="tw-cursor-pointer"

‎resources/jscomposition/system/table/cell/ParticipantsCell.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<template>
2-
<div class="tw-overflow-hidden tw-flex -tw-space-x-1 tw-items-center tw-justify-left tw-px-1 tw-text-gray-500">
2+
<div class="tw-overflow-hidden tw-flex -tw-space-x-1 tw-items-center tw-justify-left tw-px-1">
33
<div
44
v-for="(participant, index) in participants"
55
:key="index"

‎resources/jscomposition/system/table/cell/TruncatedColumn.vue‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<template>
22
<div class="tw-flex tw-relative tw-text-nowrap tw-whitespace-nowrap tw-p-3">
33
<div class="tw-overflow-hidden tw-text-ellipsis ">
4-
<span class="tw-text-gray-500">
4+
<span>
55
{{ getValue() }}
66
</span>
77
</div>
@@ -21,7 +21,7 @@
2121

2222
<template #content>
2323
<ul
24-
class="tw-bg-white tw-list-none tw-text-gray-600
24+
class="tw-bg-white tw-list-none
2525
tw-overflow-hidden tw-rounded-lg tw-w-50 tw-text-sm tw-border tw-border-gray-300">
2626
<template v-for="(option, index) in optionsModel">
2727
<li

‎resources/jscomposition/system/table/cell/TruncatedOptionsCell.vue‎

Lines changed: 14 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,18 @@
22
<div class="tw-flex tw-relative tw-text-nowrap tw-whitespace-nowrap tw-p-3">
33
<div
44
v-if="optionsModel.length"
5-
class="tw-overflow-hidden tw-text-ellipsis"
6-
>
5+
class="tw-overflow-hidden tw-text-ellipsis">
76
<a
87
v-if="href !== null"
9-
class="hover:tw-text-blue-400 tw-text-gray-500"
10-
:href="href(optionsModel[0])"
11-
>
8+
class="hover:tw-text-blue-400 tw-text-inherit tw-no-underline"
9+
:href="href(optionsModel[0])">
1210
{{ getValueOption(optionsModel[0], 0) }}
1311
</a>
1412
<span
1513
v-else
16-
class="hover:tw-text-blue-400 tw-text-gray-500 hover:tw-cursor-pointer"
14+
class="hover:tw-text-blue-400 tw-text-inherit tw-no-underline hover:tw-cursor-pointer"
1715
href="#"
18-
@click.prevent.stop="onClickOption(optionsModel[0], 0)"
19-
>
16+
@click.prevent.stop="onClickOption(optionsModel[0], 0)">
2017
{{ getValueOption(optionsModel[0], 0) }}
2118
</span>
2219
</div>
@@ -25,37 +22,32 @@
2522
v-model="show"
2623
:hover="false"
2724
position="bottom"
28-
class="!tw-absolute tw-right-0 tw-top-0 tw-h-full tw-flex tw-items-center"
29-
>
25+
class="!tw-absolute tw-right-0 tw-top-0 tw-h-full tw-flex tw-items-center">
3026
<div
3127
class="tw-self-center tw-px-2 tw-rounded-md hover:tw-cursor-pointer hover:tw-bg-gray-200 tw-bg-white "
32-
@click.prevent="onClick"
33-
>
28+
@click.prevent="onClick">
3429
<i class="fas fa-ellipsis-v" />
3530
</div>
3631
<template #content>
3732
<ul
38-
class="tw-bg-white tw-list-none tw-text-gray-600
39-
tw-overflow-hidden tw-rounded-lg tw-w-50 tw-text-sm tw-border tw-border-gray-300"
40-
>
33+
class="tw-bg-white tw-list-none
34+
tw-overflow-hidden tw-rounded-lg tw-w-50 tw-text-sm tw-border tw-border-gray-300">
4135
<template v-for="(option, index) in optionsModel">
4236
<li
4337
v-if="index > 0"
4438
:key="index"
45-
class="hover:tw-bg-gray-100"
46-
>
39+
class="hover:tw-bg-gray-100">
4740
<a
4841
v-if="href !== null"
49-
class="tw-flex tw-py-2 tw-px-4 transition duration-300 tw-text-gray-500 hover:tw-bg-gray-200 hover:tw-text-blue-400"
50-
:href="href(option)"
51-
>
42+
class="tw-flex tw-py-2 tw-px-4 transition duration-300
43+
hover:tw-bg-gray-200 hover:tw-text-blue-400"
44+
:href="href(option)">
5245
{{ getValueOption(option, index) }}
5346
</a>
5447
<span
5548
v-else
5649
class="tw-flex tw-py-2 tw-px-4 transition duration-300 hover:tw-bg-gray-200 hover:tw-cursor-pointer"
57-
@click.prevent.stop="onClickOption(option, index)"
58-
>
50+
@click.prevent.stop="onClickOption(option, index)">
5951
{{ getValueOption(option, index) }}
6052
</span>
6153
</li>

0 commit comments

Comments
 (0)