Merge pull request #2715 from brkcvn/master
Changed slider structure in slider for Portal / Signed / Preview pages.
This commit is contained in:
commit
072900e240
29
public/css/app.css
vendored
29
public/css/app.css
vendored
@ -1533,26 +1533,41 @@ button, input, optgroup, select, textarea{
|
|||||||
|
|
||||||
/* changelog modal styling for update center */
|
/* changelog modal styling for update center */
|
||||||
|
|
||||||
|
.change-log-modal .badge{
|
||||||
|
border-radius: 1.5rem;
|
||||||
|
--tw-bg-opacity: 1;
|
||||||
|
background-color: rgb(110 161 82 / var(--tw-bg-opacity));
|
||||||
|
padding-left: 0.75rem;
|
||||||
|
padding-right: 0.75rem;
|
||||||
|
padding-top: 0.5rem;
|
||||||
|
padding-bottom: 0.5rem;
|
||||||
|
font-size: 0.75rem;
|
||||||
|
line-height: 1rem;
|
||||||
|
font-weight: 500;
|
||||||
|
--tw-text-opacity: 1;
|
||||||
|
color: rgb(255 255 255 / var(--tw-text-opacity));
|
||||||
|
}
|
||||||
|
|
||||||
.change-log-modal h2{
|
.change-log-modal h2{
|
||||||
margin-bottom: 0.75rem;
|
margin-bottom: 0.5rem;
|
||||||
font-size: 1.375rem;
|
font-size: 1.375rem;
|
||||||
line-height: 1.5rem;
|
line-height: 1.5rem;
|
||||||
font-weight: 700;
|
font-weight: 700;
|
||||||
--tw-text-opacity: 1;
|
--tw-text-opacity: 1;
|
||||||
color: rgb(66 66 66 / var(--tw-text-opacity));
|
color: rgb(85 88 139 / var(--tw-text-opacity));
|
||||||
}
|
}
|
||||||
|
|
||||||
.change-log-modal h3{
|
.change-log-modal h3{
|
||||||
margin-bottom: 0.75rem;
|
margin-bottom: 0.5rem;
|
||||||
font-size: 1.125rem;
|
font-size: 1.125rem;
|
||||||
line-height: 1.75rem;
|
line-height: 1.75rem;
|
||||||
font-weight: 700;
|
font-weight: 700;
|
||||||
--tw-text-opacity: 1;
|
--tw-text-opacity: 1;
|
||||||
color: rgb(66 66 66 / var(--tw-text-opacity));
|
color: rgb(85 88 139 / var(--tw-text-opacity));
|
||||||
}
|
}
|
||||||
|
|
||||||
.change-log-modal ul{
|
.change-log-modal ul{
|
||||||
margin-bottom: 0.75rem;
|
margin-bottom: 0.5rem;
|
||||||
list-style-position: inside;
|
list-style-position: inside;
|
||||||
list-style-type: disc;
|
list-style-type: disc;
|
||||||
}
|
}
|
||||||
@ -1561,12 +1576,12 @@ button, input, optgroup, select, textarea{
|
|||||||
font-size: 1rem;
|
font-size: 1rem;
|
||||||
line-height: 1.5rem;
|
line-height: 1.5rem;
|
||||||
--tw-text-opacity: 1;
|
--tw-text-opacity: 1;
|
||||||
color: rgb(66 66 66 / var(--tw-text-opacity));
|
color: rgb(85 88 139 / var(--tw-text-opacity));
|
||||||
}
|
}
|
||||||
|
|
||||||
.change-log-modal a{
|
.change-log-modal a{
|
||||||
--tw-text-opacity: 1;
|
--tw-text-opacity: 1;
|
||||||
color: rgb(85 88 139 / var(--tw-text-opacity));
|
color: rgb(110 161 82 / var(--tw-text-opacity));
|
||||||
-webkit-text-decoration-line: underline;
|
-webkit-text-decoration-line: underline;
|
||||||
text-decoration-line: underline;
|
text-decoration-line: underline;
|
||||||
}
|
}
|
||||||
|
27
resources/assets/js/views/portal/apps.js
vendored
27
resources/assets/js/views/portal/apps.js
vendored
@ -66,6 +66,33 @@ const app = new Vue({
|
|||||||
if (typeof this.form.password !== 'undefined') {
|
if (typeof this.form.password !== 'undefined') {
|
||||||
this.form.password = '';
|
this.form.password = '';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
if (document.querySelector('[data-tabs-swiper]').childElementCount > 2) {
|
||||||
|
|
||||||
|
document.querySelectorAll('[data-tabs-slide]').forEach((item) => {
|
||||||
|
item.classList.add('swiper-slide');
|
||||||
|
});
|
||||||
|
|
||||||
|
document.querySelector('[data-tabs-swiper]').classList.add('swiper', 'swiper-links');
|
||||||
|
|
||||||
|
let html = `
|
||||||
|
<div class="swiper-wrapper">
|
||||||
|
${document.querySelector('[data-tabs-swiper]').innerHTML}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="swiper-button-next top-3 right-0">
|
||||||
|
<span class="material-icons">chevron_right</span>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="swiper-button-prev top-3 left-0">
|
||||||
|
<span class="material-icons">chevron_left</span>
|
||||||
|
</div>
|
||||||
|
`;
|
||||||
|
|
||||||
|
document.querySelector('[data-tabs-swiper]').innerHTML = html;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
new Swiper(".swiper-links", {
|
new Swiper(".swiper-links", {
|
||||||
loop: false,
|
loop: false,
|
||||||
|
14
resources/assets/sass/app.css
vendored
14
resources/assets/sass/app.css
vendored
@ -193,24 +193,28 @@
|
|||||||
/* after the upgrade tailwind 3.2.1, this tags font-weight changed. Added this block for now */
|
/* after the upgrade tailwind 3.2.1, this tags font-weight changed. Added this block for now */
|
||||||
|
|
||||||
/* changelog modal styling for update center */
|
/* changelog modal styling for update center */
|
||||||
|
.change-log-modal .badge {
|
||||||
|
@apply px-3 py-2 rounded-3xl text-xs font-medium bg-green text-white;
|
||||||
|
}
|
||||||
|
|
||||||
.change-log-modal h2 {
|
.change-log-modal h2 {
|
||||||
@apply text-2xl font-bold text-black mb-3;
|
@apply text-2xl font-bold text-purple mb-2;
|
||||||
}
|
}
|
||||||
|
|
||||||
.change-log-modal h3 {
|
.change-log-modal h3 {
|
||||||
@apply text-lg font-bold text-black mb-3;
|
@apply text-lg font-bold text-purple mb-2;
|
||||||
}
|
}
|
||||||
|
|
||||||
.change-log-modal ul {
|
.change-log-modal ul {
|
||||||
@apply list-disc list-inside mb-3;
|
@apply list-disc list-inside mb-2;
|
||||||
}
|
}
|
||||||
|
|
||||||
.change-log-modal li {
|
.change-log-modal li {
|
||||||
@apply text-base text-black;
|
@apply text-base text-purple;
|
||||||
}
|
}
|
||||||
|
|
||||||
.change-log-modal a {
|
.change-log-modal a {
|
||||||
@apply text-purple underline;
|
@apply text-green underline;
|
||||||
}
|
}
|
||||||
/* changelog modal styling for update center */
|
/* changelog modal styling for update center */
|
||||||
}
|
}
|
||||||
|
@ -30,7 +30,7 @@
|
|||||||
</x-table.td>
|
</x-table.td>
|
||||||
|
|
||||||
<x-table.td kind="right" class="w-6/12" kind="cursor-none">
|
<x-table.td kind="right" class="w-6/12" kind="cursor-none">
|
||||||
<x-slot name="first" class="text-right" override="class">
|
<x-slot name="first" class="flex justify-end" override="class">
|
||||||
<x-link href="{{ route('updates.run', ['alias' => 'core', 'version' => $core]) }}" class="px-3 py-1.5 rounded-xl text-sm font-medium leading-6 ltr:mr-2 rtl:ml-2 bg-green text-white hover:bg-green-700 disabled:bg-green-100" override="class">
|
<x-link href="{{ route('updates.run', ['alias' => 'core', 'version' => $core]) }}" class="px-3 py-1.5 rounded-xl text-sm font-medium leading-6 ltr:mr-2 rtl:ml-2 bg-green text-white hover:bg-green-700 disabled:bg-green-100" override="class">
|
||||||
{{ trans('updates.update', ['version' => $core]) }}
|
{{ trans('updates.update', ['version' => $core]) }}
|
||||||
</x-link>
|
</x-link>
|
||||||
|
@ -28,33 +28,23 @@
|
|||||||
@php $is_active = true; @endphp
|
@php $is_active = true; @endphp
|
||||||
|
|
||||||
<x-slot name="navs">
|
<x-slot name="navs">
|
||||||
<div class="swiper swiper-links w-full">
|
<div data-tabs-swiper class="w-full flex">
|
||||||
<div class="swiper-wrapper">
|
@foreach ($payment_methods as $key => $name)
|
||||||
@foreach ($payment_methods as $key => $name)
|
@stack('invoice_{{ $key }}_tab_start')
|
||||||
@stack('invoice_{{ $key }}_tab_start')
|
<div data-tabs-slide>
|
||||||
<div class="swiper-slide">
|
|
||||||
<x-tabs.nav
|
<x-tabs.nav
|
||||||
id="{{ $name }}"
|
id="{{ $name }}"
|
||||||
@click="onChangePaymentMethodSigned('{{ $key }}')"
|
@click="onChangePaymentMethodSigned('{{ $key }}')"
|
||||||
>
|
>
|
||||||
<div class="w-24 truncate">
|
<div>
|
||||||
{{ $name }}
|
{{ $name }}
|
||||||
</div>
|
</div>
|
||||||
</x-tabs.nav>
|
</x-tabs.nav>
|
||||||
</div>
|
</div>
|
||||||
@stack('invoice_{{ $key }}_tab_end')
|
@stack('invoice_{{ $key }}_tab_end')
|
||||||
|
|
||||||
@php $is_active = false; @endphp
|
@php $is_active = false; @endphp
|
||||||
@endforeach
|
@endforeach
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="swiper-button-next top-3 right-0">
|
|
||||||
<span class="material-icons">chevron_right</span>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="swiper-button-prev top-3 left-0">
|
|
||||||
<span class="material-icons">chevron_left</span>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</x-slot>
|
</x-slot>
|
||||||
</div>
|
</div>
|
||||||
|
@ -26,33 +26,23 @@
|
|||||||
@php $is_active = true; @endphp
|
@php $is_active = true; @endphp
|
||||||
|
|
||||||
<x-slot name="navs">
|
<x-slot name="navs">
|
||||||
<div class="swiper swiper-links w-full">
|
<div data-tabs-swiper class="w-full flex">
|
||||||
<div class="swiper-wrapper">
|
@foreach ($payment_methods as $key => $name)
|
||||||
@foreach ($payment_methods as $key => $name)
|
@stack('invoice_{{ $key }}_tab_start')
|
||||||
@stack('invoice_{{ $key }}_tab_start')
|
<div data-tabs-slide>
|
||||||
<div class="swiper-slide">
|
<x-tabs.nav
|
||||||
<x-tabs.nav
|
id="{{ $name }}"
|
||||||
id="{{ $name }}"
|
@click="onChangePaymentMethod('{{ $key }}')"
|
||||||
@click="onChangePaymentMethod('{{ $key }}')"
|
>
|
||||||
>
|
<div>
|
||||||
<div class="w-24 truncate">
|
{{ $name }}
|
||||||
{{ $name }}
|
</div>
|
||||||
</div>
|
</x-tabs.nav>
|
||||||
</x-tabs.nav>
|
</div>
|
||||||
</div>
|
@stack('invoice_{{ $key }}_tab_end')
|
||||||
@stack('invoice_{{ $key }}_tab_end')
|
|
||||||
|
|
||||||
@php $is_active = false; @endphp
|
@php $is_active = false; @endphp
|
||||||
@endforeach
|
@endforeach
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="swiper-button-next top-3 right-0">
|
|
||||||
<span class="material-icons">chevron_right</span>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="swiper-button-prev top-3 left-0">
|
|
||||||
<span class="material-icons">chevron_left</span>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</x-slot>
|
</x-slot>
|
||||||
</div>
|
</div>
|
||||||
|
@ -35,16 +35,15 @@
|
|||||||
@php $is_active = true; @endphp
|
@php $is_active = true; @endphp
|
||||||
|
|
||||||
<x-slot name="navs">
|
<x-slot name="navs">
|
||||||
<div class="swiper swiper-links w-full">
|
<div data-tabs-swiper class="w-full flex">
|
||||||
<div class="swiper-wrapper">
|
|
||||||
@foreach ($payment_methods as $key => $name)
|
@foreach ($payment_methods as $key => $name)
|
||||||
@stack('invoice_{{ $key }}_tab_start')
|
@stack('invoice_{{ $key }}_tab_start')
|
||||||
<div class="swiper-slide">
|
<div data-tabs-slide>
|
||||||
<x-tabs.nav
|
<x-tabs.nav
|
||||||
id="{{ $name }}"
|
id="{{ $name }}"
|
||||||
@click="onChangePaymentMethodSigned('{{ $key }}')"
|
@click="onChangePaymentMethodSigned('{{ $key }}')"
|
||||||
>
|
>
|
||||||
<div class="w-24 truncate">
|
<div>
|
||||||
{{ $name }}
|
{{ $name }}
|
||||||
</div>
|
</div>
|
||||||
</x-tabs.nav>
|
</x-tabs.nav>
|
||||||
@ -53,15 +52,6 @@
|
|||||||
|
|
||||||
@php $is_active = false; @endphp
|
@php $is_active = false; @endphp
|
||||||
@endforeach
|
@endforeach
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="swiper-button-next top-3 right-0">
|
|
||||||
<span class="material-icons">chevron_right</span>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="swiper-button-prev top-3 left-0">
|
|
||||||
<span class="material-icons">chevron_left</span>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</x-slot>
|
</x-slot>
|
||||||
</div>
|
</div>
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
<div class="overflow-x-visible my-8">
|
<div class="overflow-x-visible my-8">
|
||||||
<table class="w-full">
|
<table class="w-full rp-border-collapse">
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
<th class="{{ $class->column_name_width }} w-24 print-alignment"> </th>
|
<th class="{{ $class->column_name_width }} w-24 print-alignment"> </th>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user