Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FOUR-20281: [WINTER] Remove fades on tab switching #7824

Open
wants to merge 4 commits into
base: release-2025-winter
Choose a base branch
from
Open

FOUR-20281: [WINTER] Remove fades on tab switching #7824

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8573753
FOUR-20281 : S2: Remove fades
hjonathan Nov 25, 2024
7658dea
Merge remote-tracking branch 'origin/release-2024-fall' into feature/…
pmPaulis Dec 4, 2024
9688ae5
Merge pull request #7763 from ProcessMaker/feature/FOUR-20281
pmPaulis Dec 13, 2024
416e506
Merge remote-tracking branch 'origin/release-2025-winter' into epic/F…
pmPaulis Jan 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions resources/views/admin/users/index.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,13 @@

<div>
<div class="tab-content">
<div class="tab-pane fade show active" id="nav-users" role="tabpanel" aria-labelledby="nav-users-tab">
<div class="tab-pane show active" id="nav-users" role="tabpanel" aria-labelledby="nav-users-tab">
<div class="card card-body p-3 border-top-0">
@include('admin.users.list')
</div>
</div>

<div class="tab-pane fade show" id="nav-deleted-users" role="tabpanel" aria-labelledby="nav-deleted-users-tab">
<div class="tab-pane show" id="nav-deleted-users" role="tabpanel" aria-labelledby="nav-deleted-users-tab">
<div class="card card-body p-3 border-top-0">
@include('admin.users.deletedUsers')
</div>
Expand Down
12 changes: 6 additions & 6 deletions resources/views/components/categorized_resource.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div class="px-3 page-content" id="categorizedList" style="display:none">
@php
$firstTab = $secondTab = 'nav-item nav-link';
$firstContent = $secondContent = 'tab-pane fade show';
$firstContent = $secondContent = 'tab-pane show';

$catListWebRoute = str_replace('.edit', '.index', $catConfig->routes->editCategoryWeb);
$showCategoriesTab = $catListWebRoute === \Request::route()->getName() || $listConfig->countCategories === 0
Expand Down Expand Up @@ -127,7 +127,7 @@ class="nav-item nav-link"
</div>
@if(isset($templatesList))
@can('view-process-templates')
<div class="tab-pane fade" id="nav-templates" role="tabpanel" aria-labelledby="nav-templates-tab">
<div class="tab-pane" id="nav-templates" role="tabpanel" aria-labelledby="nav-templates-tab">
<div class="card card-body p-3 border-top-0">
{{ $templatesList }}
</div>
Expand All @@ -139,7 +139,7 @@ class="nav-item nav-link"
</div>
</div>
@isset($tabs[3])
<div class="tab-pane fade" id="nav-archived" role="tabpanel" aria-labelledby="nav-archived-tab">
<div class="tab-pane" id="nav-archived" role="tabpanel" aria-labelledby="nav-archived-tab">
<div class="card card-body p-3 border-top-0">
{{ $archivedList }}
</div>
Expand All @@ -156,13 +156,13 @@ class="{{$secondContent}}"
{{ $categoryList }}
</div>
</div>
<div class="tab-pane fade" id="nav-myTemplates" role="tabpanel" aria-labelledby="nav-myTemplates-tab">
<div class="tab-pane" id="nav-myTemplates" role="tabpanel" aria-labelledby="nav-myTemplates-tab">
<div class="card card-body p-3 border-top-0">
{{ $myTemplatesList }}
</div>
</div>
<div
class="tab-pane fade"
class="tab-pane"
id="nav-publicTemplates"
role="tabpanel"
aria-labelledby="nav-publicTemplates-tab"
Expand All @@ -178,7 +178,7 @@ class="tab-pane fade"
</div>
</div>
@isset($tabs[2])
<div class="tab-pane fade" id="nav-archived" role="tabpanel" aria-labelledby="nav-archived-tab">
<div class="tab-pane" id="nav-archived" role="tabpanel" aria-labelledby="nav-archived-tab">
<div class="card card-body p-3 border-top-0">
{{ $archivedList }}
</div>
Expand Down
6 changes: 3 additions & 3 deletions resources/views/processes/edit.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@

{{-- Configuration --}}
<div
class="tab-pane fade show"
class="tab-pane show"
:class="{'active': activeTab === '' || activeTab === 'nav-config'}"
id="nav-config"
role="tabpanel"
Expand Down Expand Up @@ -375,7 +375,7 @@ class="invalid-feedback"
</div>

{{-- Notifications --}}
<div class="tab-pane fade show p-3" id="nav-notifications" role="tabpanel"
<div class="tab-pane show p-3" id="nav-notifications" role="tabpanel"
aria-labelledby="nav-notifications-tab">
<div class="form-group p-0">

Expand Down Expand Up @@ -530,7 +530,7 @@ class="custom-control-input">
{{-- Addons --}}
@isset($addons)
@foreach ($addons as $addon)
<div class="tab-pane fade show" id="{{$addon['id']}}" role="tabpanel"
<div class="tab-pane show" id="{{$addon['id']}}" role="tabpanel"
aria-labelledby="nav-notifications-tab">
{!! $addon['content'] !!}
</div>
Expand Down
4 changes: 2 additions & 2 deletions resources/views/processes/screens/edit.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@

<div class="card card-body card-body-nav-tabs">
<div class="tab-content" id="nav-tabContent">
<div class="tab-pane fade show active" id="nav-config" role="tabpanel" aria-labelledby="nav-config-tab">
<div class="tab-pane show active" id="nav-config" role="tabpanel" aria-labelledby="nav-config-tab">
<required></required>
<div class="form-group">
{!! Form::label('title', __('Name') . '<small class="ml-1">*</small>', [], false) !!}
Expand Down Expand Up @@ -76,7 +76,7 @@
</div>
@isset($addons)
@foreach ($addons as $addon)
<div class="tab-pane fade show" id="{{$addon['id']}}" role="tabpanel" aria-labelledby="'nav-tab-'+ {{$addon['id']}}">
<div class="tab-pane show" id="{{$addon['id']}}" role="tabpanel" aria-labelledby="'nav-tab-'+ {{$addon['id']}}">
{!! $addon['content'] !!}
</div>
@endforeach
Expand Down
4 changes: 2 additions & 2 deletions resources/views/processes/scripts/edit.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@

<div class="card card-body card-body-nav-tabs">
<div class="tab-content" id="nav-tabContent">
<div class="tab-pane fade show active" id="nav-config" role="tabpanel" aria-labelledby="nav-config-tab">
<div class="tab-pane show active" id="nav-config" role="tabpanel" aria-labelledby="nav-config-tab">
<required></required>
<div class="form-group">
{!! Form::label('title', __('Name') . '<small class="ml-1">*</small>', [], false) !!}
Expand Down Expand Up @@ -130,7 +130,7 @@
</div>
@isset($addons)
@foreach ($addons as $addon)
<div class="tab-pane fade show" id="{{$addon['id']}}" role="tabpanel" aria-labelledby="'nav-tab-'+ {{$addon['id']}}">
<div class="tab-pane show" id="{{$addon['id']}}" role="tabpanel" aria-labelledby="'nav-tab-'+ {{$addon['id']}}">
{!! $addon['content'] !!}
</div>
@endforeach
Expand Down
4 changes: 2 additions & 2 deletions resources/views/processes/signals/edit.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@

<div class="tab-content" id="nav-tabContent">

<div class="card card-body border-top-0 tab-pane p-3 fade show active" id="nav-detail" role="tabpanel" aria-labelledby="nav-detail-tab">
<div class="card card-body border-top-0 tab-pane p-3 show active" id="nav-detail" role="tabpanel" aria-labelledby="nav-detail-tab">
<div class="modal-body">
<required></required>
<div class="form-group">
Expand Down Expand Up @@ -68,7 +68,7 @@
</div>
@endif
</div>
<div class="card card-body border-top-0 tab-pane p-3 fade" id="nav-catch" role="tabpanel" aria-labelledby="nav-catch-tab">
<div class="card card-body border-top-0 tab-pane p-3" id="nav-catch" role="tabpanel" aria-labelledby="nav-catch-tab">
<catch-listing ref="catchList" :filter="filter" items="{{json_encode($signal['processes'])}}" />
</div>

Expand Down
2 changes: 1 addition & 1 deletion resources/views/requests/index.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ function() use ($title) { return [__($title), null]; }
</counter-card-group>

<div class="tab-content" id="requests-tabContent">
<div class="tab-pane fade show active" id="inbox" role="tabpanel" aria-labelledby="inbox-tab">
<div class="tab-pane show active" id="inbox" role="tabpanel" aria-labelledby="inbox-tab">

<div class="card card-body requests-list-body">
<div id="search-bar" class="search advanced-search mb-2">
Expand Down
18 changes: 9 additions & 9 deletions resources/views/requests/show.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@
role="tabpanel" aria-labelledby="errors-tab">
<request-errors :errors="errorLogs"></request-errors>
</div>
<div class="tab-pane fade show card card-body border-top-0 p-0" :class="{ active: activePending }"
<div class="tab-pane show card card-body border-top-0 p-0" :class="{ active: activePending }"
id="pending" role="tabpanel" aria-labelledby="pending-tab">
<request-detail ref="pending" :process-request-id="requestId" status="ACTIVE"
:is-process-manager="{{ $isProcessManager ? 'true' : 'false' }}"
Expand Down Expand Up @@ -187,20 +187,20 @@ class="tab-pane card card-body border-top-0 p-3">
</div>
@endcan
@endif
<div class="tab-pane fade card card-body border-top-0 p-0" id="completed" role="tabpanel"
<div class="tab-pane card card-body border-top-0 p-0" id="completed" role="tabpanel"
aria-labelledby="completed-tab">
<request-detail ref="completed" :process-request-id="requestId" status="CLOSED"
:is-admin="{{ Auth::user()->is_administrator ? 'true' : 'false' }}">
</request-detail>
</div>

<template v-for="{ tab, component } in packages">
<div class="tab-pane fade card card-body border-top-0 p-0" :id="tab.target" role="tabpanel">
<div class="tab-pane card card-body border-top-0 p-0" :id="tab.target" role="tabpanel">
<component :is="component" :process-request-id="requestId"></component>
</div>
</template>

<div class="tab-pane fade card card-body border-top-0 p-3" id="files" role="tabpanel"
<div class="tab-pane card card-body border-top-0 p-3" id="files" role="tabpanel"
aria-labelledby="files-tab">
<div class="card">
<div>
Expand Down Expand Up @@ -228,12 +228,12 @@ class="tab-pane card card-body border-top-0 p-3">
</div>
</div>
</div>
<div class="tab-pane fade card card-body border-top-0 p-0" id="forms" role="tabpanel"
<div class="tab-pane card card-body border-top-0 p-0" id="forms" role="tabpanel"
aria-labelledby="forms-tab" v-show="canViewPrint">
<request-screens :id="requestId" :information="dataSummary" ref="forms">
</request-screens>
</div>
<div v-if="activeTab === 'overview'" class="tab-pane fade p-0" id="overview" role="tabpanel"
<div v-if="activeTab === 'overview'" class="tab-pane p-0" id="overview" role="tabpanel"
aria-labelledby="overview-tab">
<div class="card" style="border-top: none !important;">
<div class="card-body">
Expand Down Expand Up @@ -267,7 +267,7 @@ class="tab-pane card card-body border-top-0 p-3">

@isset($addons)
@foreach ($addons as $addon)
<div class="tab-pane fade show" id="{{ $addon['id'] }}" role="tabpanel"
<div class="tab-pane show" id="{{ $addon['id'] }}" role="tabpanel"
aria-labelledby="{{ $addon['id'] }}">
{!! $addon['content'] !!}
</div>
Expand Down Expand Up @@ -326,7 +326,7 @@ class="tab-pane card card-body border-top-0 p-3">
<div
v-if="showInfo"
id="details"
v-bind:class="{ 'tab-pane':true, fade: true, show: showInfo, active: showInfo }"
v-bind:class="{ 'tab-pane':true, show: showInfo, active: showInfo }"
role="tabpanel"
aria-labelledby="details-tab"
>
Expand Down Expand Up @@ -453,7 +453,7 @@ class="btn btn-outline-info btn-block"
<div
v-if="!showInfo"
id="comments"
v-bind:class="{ 'tab-pane':true, fade: true, show: !showInfo, active: !showInfo }"
v-bind:class="{ 'tab-pane':true, show: !showInfo, active: !showInfo }"
role="tabpanel"
aria-labelledby="comments-tab"
>
Expand Down
4 changes: 2 additions & 2 deletions resources/views/requests/showMobile.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ class="tab-content"
>
<div
id="tasks"
class="tab-pane fade show card card-body border-top-0 p-3 active"
class="tab-pane show card card-body border-top-0 p-3 active"
role="tabpanel"
aria-labelledby="tasks-tab"
>
Expand All @@ -110,7 +110,7 @@ class="tab-pane card card-body border-top-0 p-3"

<div
id="files"
class="tab-pane fade card card-body border-top-0 p-3"
class="tab-pane card card-body border-top-0 p-3"
role="tabpanel"
aria-labelledby="files-tab"
>
Expand Down
4 changes: 2 additions & 2 deletions resources/views/tasks/edit.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ class="card border-0"
<div
v-if="showInfo"
id="details"
v-bind:class="{ 'tab-pane':true, fade: true, show: showInfo, active: showInfo }"
v-bind:class="{ 'tab-pane':true, show: showInfo, active: showInfo }"
role="tabpanel"
aria-labelledby="details-tab">
<div class="ml-md-3 mt-3 mt-md-0">
Expand Down Expand Up @@ -313,7 +313,7 @@ class="d-inline-flex pull-left align-items-center"
<div
v-if="!showInfo"
id="comments"
v-bind:class="{ 'tab-pane':true, fade: true, show: !showInfo, active: !showInfo }"
v-bind:class="{ 'tab-pane':true, show: !showInfo, active: !showInfo }"
role="tabpanel"
aria-labelledby="comments-tab">
<div class="ml-md-3 mt-md-0 mt-3 collapse-content">
Expand Down
2 changes: 1 addition & 1 deletion resources/views/tasks/index.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ class="nav-link task-nav-link"
</ul>

<div class="tab-content" id="task-tabContent">
<div class="tab-pane fade show active" id="inbox" role="tabpanel" aria-labelledby="inbox-tab">
<div class="tab-pane show active" id="inbox" role="tabpanel" aria-labelledby="inbox-tab">
<div class="card card-body task-list-body">
<div id="search-bar" class="search advanced-search mb-2">
<div class="d-flex">
Expand Down
4 changes: 2 additions & 2 deletions resources/views/templates/configure.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
</nav>
<div class="card card-body card-body-nav-tabs">
<div class="tab-content" id="nav-tabContent">
<div class="tab-pane fade show active" id="nav-config" role="tabpanel"
<div class="tab-pane show active" id="nav-config" role="tabpanel"
aria-labelledby="nav-config-tab">
<required></required>
@if ($type === 'process')
Expand All @@ -59,7 +59,7 @@
</div>
@isset($addons)
@foreach ($addons as $addon)
<div class="tab-pane fade show" id="{{$addon['id']}}" role="tabpanel"
<div class="tab-pane show" id="{{$addon['id']}}" role="tabpanel"
aria-labelledby="nav-notifications-tab">
{!! $addon['content'] !!}
</div>
Expand Down
Loading