Skip to content

Commit d7a0c9c

Browse files
benjpaddockbenjpaddock
authored
Merge pull request #1399 from shivendra-webkul/dark-mode
Fixed activity issue refactor css file
2 parents f419acb + ef5e30d commit d7a0c9c

File tree

7 files changed

+125
-181
lines changed

7 files changed

+125
-181
lines changed

‎packages/Webkul/Admin/src/Resources/assets/css/app.css‎

Lines changed: 77 additions & 133 deletions
Original file line numberDiff line numberDiff line change
@@ -373,11 +373,83 @@
373373
.tox.tox-silver-sink.tox-tinymce-aux {
374374
z-index: 99999;
375375
}
376-
}
377376

378-
/* -------------------------------- new css end -------------------------------- */
377+
.stage::after {
378+
content: '';
379+
position: absolute;
380+
top: 50%;
381+
right: -10px;
382+
width: 24px;
383+
height: 24px;
384+
z-index: 1;
385+
border-radius: 0 0 0 25px;
386+
transform: translateY(-50%) rotate(45deg);
387+
border-right: 4px solid #f3f4f6;
388+
border-top: 4px solid #f3f4f6;
389+
}
390+
391+
.dark .stage::after {
392+
content: '';
393+
position: absolute;
394+
top: 50%;
395+
right: -10px;
396+
width: 24px;
397+
height: 24px;
398+
z-index: 1;
399+
border-radius: 0 0 0 25px;
400+
transform: translateY(-50%) rotate(45deg);
401+
border-right: 4px solid #030712;
402+
border-top: 4px solid #030712;
403+
}
404+
405+
.shimmer {
406+
animation-duration: 2.2s;
407+
animation-fill-mode: forwards;
408+
animation-iteration-count: infinite;
409+
animation-name: skeleton;
410+
animation-timing-function: linear;
411+
background: linear-gradient(
412+
to right,
413+
#f6f6f6 8%,
414+
#f0f0f0 18%,
415+
#f6f6f6 33%
416+
);
417+
background-size: 1250px 100%;
418+
}
419+
420+
.light-shimmer-bg {
421+
background: linear-gradient(
422+
to right,
423+
#fafafa 8%,
424+
#f5f5f5 18%,
425+
#fafafa 33%
426+
);
427+
background-size: 1250px 100%;
428+
}
429+
430+
.dark .shimmer {
431+
background: linear-gradient(
432+
to right,
433+
#1f2937 8%,
434+
#1a2232 18%,
435+
#1f2937 33%
436+
);
437+
}
438+
439+
.primary-button {
440+
@apply bg-brandColor border border-brandColor cursor-pointer flex focus:opacity-[0.9] font-semibold gap-x-1 hover:opacity-[0.9] items-center place-content-center px-3 py-1.5 rounded-md text-gray-50 transition-all;
441+
}
442+
443+
.secondary-button {
444+
@apply flex cursor-pointer place-content-center items-center gap-x-1 whitespace-nowrap rounded-md border-2 border-brandColor bg-white px-3 py-1.5 font-semibold text-brandColor transition-all hover:bg-[#eff6ff61] focus:bg-[#eff6ff61] dark:border-gray-400 dark:bg-gray-800 dark:text-white dark:hover:opacity-80;
445+
}
446+
447+
.transparent-button {
448+
@apply flex cursor-pointer appearance-none place-content-center items-center gap-x-1 whitespace-nowrap rounded-md border-2 border-transparent px-3 py-1.5 font-semibold text-gray-600 transition-all marker:shadow hover:bg-gray-100 focus:bg-gray-100 dark:hover:bg-gray-950;
449+
}
450+
451+
/* -------------------------------- old css -------------------------------- */
379452

380-
@layer components {
381453
::-webkit-scrollbar {
382454
width: 12px;
383455
}
@@ -437,18 +509,6 @@
437509
@apply outline-none;
438510
}
439511

440-
.primary-button {
441-
@apply bg-brandColor border border-brandColor cursor-pointer flex focus:opacity-[0.9] font-semibold gap-x-1 hover:opacity-[0.9] items-center place-content-center px-3 py-1.5 rounded-md text-gray-50 transition-all;
442-
}
443-
444-
.secondary-button {
445-
@apply flex cursor-pointer place-content-center items-center gap-x-1 whitespace-nowrap rounded-md border-2 border-brandColor bg-white px-3 py-1.5 font-semibold text-brandColor transition-all hover:bg-[#eff6ff61] focus:bg-[#eff6ff61] dark:border-gray-400 dark:bg-gray-800 dark:text-white dark:hover:opacity-80;
446-
}
447-
448-
.transparent-button {
449-
@apply flex cursor-pointer appearance-none place-content-center items-center gap-x-1 whitespace-nowrap rounded-md border-2 border-transparent px-3 py-1.5 font-semibold text-gray-600 transition-all marker:shadow hover:bg-gray-100 focus:bg-gray-100 dark:hover:bg-gray-950;
450-
}
451-
452512
.journal-scroll::-webkit-scrollbar {
453513
width: 14px;
454514
cursor: pointer;
@@ -479,6 +539,7 @@
479539
background-position-x: calc(100% - 10px);
480540
background-position-y: 50%;
481541
}
542+
482543
.dark .custom-select{
483544
background-image: url("data:image/svg+xml;utf8,<svg fill='white' height='24' viewBox='0 0 24 24' width='24' xmlns='http://www.w3.org/2000/svg'><path d='M7 10l5 5 5-5z'/><path d='M0 0h24v24H0z' fill='none'/></svg>");
484545
}
@@ -487,93 +548,6 @@
487548
background-position-x: calc(100% - (100% - 10px));
488549
}
489550

490-
.label-pending,
491-
.label-processing,
492-
.label-closed,
493-
.label-canceled,
494-
.label-info,
495-
.label-fraud,
496-
.label-pending_payment,
497-
.label-completed,
498-
/* .label-active {
499-
@apply text-[12px] text-white font-semibold py-px px-1.5 max-w-max rounded-md;
500-
} */
501-
502-
.label-pending,
503-
.label-pending_payment {
504-
@apply bg-yellow-500;
505-
}
506-
507-
.label-processing{
508-
@apply bg-cyan-600;
509-
}
510-
511-
/* .label-completed,
512-
.label-active {
513-
@apply bg-emerald-200;
514-
} */
515-
516-
.label-closed {
517-
@apply bg-indigo-600;
518-
}
519-
520-
.label-canceled,
521-
.label-fraud {
522-
@apply bg-rose-600;
523-
}
524-
525-
.label-info {
526-
@apply bg-slate-400;
527-
}
528-
529-
/* status */
530-
.status-enable {
531-
@apply text-green-600;
532-
}
533-
534-
.status-disable {
535-
@apply text-red-600;
536-
}
537-
538-
.icon-star-fill:before {
539-
content: "\e938";
540-
color: #ffb600;
541-
}
542-
543-
.shimmer {
544-
animation-duration: 2.2s;
545-
animation-fill-mode: forwards;
546-
animation-iteration-count: infinite;
547-
animation-name: skeleton;
548-
animation-timing-function: linear;
549-
background: linear-gradient(
550-
to right,
551-
#f6f6f6 8%,
552-
#f0f0f0 18%,
553-
#f6f6f6 33%
554-
);
555-
background-size: 1250px 100%;
556-
}
557-
558-
.light-shimmer-bg {
559-
background: linear-gradient(
560-
to right,
561-
#fafafa 8%,
562-
#f5f5f5 18%,
563-
#fafafa 33%
564-
);
565-
background-size: 1250px 100%;
566-
}
567-
568-
.dark .shimmer {
569-
background: linear-gradient(
570-
to right,
571-
#1f2937 8%,
572-
#1a2232 18%,
573-
#1f2937 33%
574-
);
575-
}
576-
577551
.draggable-ghost {
578552
@apply border border-dashed !border-gray-300;
579553
}
@@ -592,37 +566,7 @@
592566
@apply content-['*'];
593567
}
594568

595-
.CodeMirror {
596-
@apply !h-[calc(100vh-367px)];
597-
}
598-
599-
.stage::after {
600-
content: '';
601-
position: absolute;
602-
top: 50%;
603-
right: -10px;
604-
width: 24px;
605-
height: 24px;
606-
z-index: 1;
607-
border-radius: 0 0 0 25px;
608-
transform: translateY(-50%) rotate(45deg);
609-
border-right: 4px solid #f3f4f6;
610-
border-top: 4px solid #f3f4f6;
611-
}
612-
613-
.dark .stage::after {
614-
content: '';
615-
position: absolute;
616-
top: 50%;
617-
right: -10px;
618-
width: 24px;
619-
height: 24px;
620-
z-index: 1;
621-
border-radius: 0 0 0 25px;
622-
transform: translateY(-50%) rotate(45deg);
623-
border-right: 4px solid #030712;
624-
border-top: 4px solid #030712;
625-
}
569+
626570
}
627571

628572
.tox .tox-toolbar__group:last-child button {

‎packages/Webkul/Admin/src/Resources/views/components/activities/actions/activity.blade.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,18 +56,18 @@ class="flex h-[74px] w-[84px] flex-col items-center justify-center gap-1 rounded
5656
<x-slot:content>
5757
<!-- Activity Type -->
5858
<x-admin::form.control-group.control
59-
type="hidden"
59+
type="text"
6060
name="type"
61-
::value="selectedType.value"
61+
v-model="selectedType.value"
6262
/>
63-
63+
6464
<!-- Id -->
6565
<x-admin::form.control-group.control
6666
type="hidden"
6767
::name="entityControlName"
6868
::value="entity.id"
6969
/>
70-
70+
7171
<!-- Title -->
7272
<x-admin::form.control-group>
7373
<x-admin::form.control-group.label class="required">
@@ -202,7 +202,7 @@ class="primary-button"
202202
value: 'meeting'
203203
}, {
204204
label: "{{ trans('admin::app.components.activities.actions.activity.lunch') }}",
205-
value: 'task'
205+
value: 'lunch'
206206
},
207207
]
208208
}

‎packages/Webkul/Admin/src/Resources/views/components/layouts/sidebar/index.blade.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ class="duration-80 fixed top-14 z-[1000] h-full w-[190px] bg-white pt-4 transiti
44
@mouseover="handleMouseOver"
55
@mouseleave="handleMouseLeave"
66
>
7-
<div class="journal-scroll h-[calc(100vh-100px)] overflow-auto group-[.sidebar-collapsed]/container:overflow-visible">
7+
<div class="journal-scroll h-[calc(100vh-100px)] overflow-hidden group-[.sidebar-collapsed]/container:overflow-visible">
88
<nav class="sidebar-rounded grid w-full gap-2">
99
<!-- Navigation Menu -->
1010
@foreach (menu()->getItems('admin') as $menuItem)
@@ -37,7 +37,7 @@ class="absolute top-0 hidden w-[200px] flex-col bg-gray-100 ltr:left-[190px] rtl
3737
:class="[isMenuActive && (hoveringMenu == '{{$menuItem->getKey()}}') ? '!flex' : 'hidden']"
3838
>
3939
<div class="sidebar-rounded fixed top-14 z-[1000] h-full w-[140px] border bg-white pt-4 dark:border-gray-800 dark:bg-gray-900 max-lg:hidden">
40-
<div class="journal-scroll h-[calc(100vh-100px)] overflow-auto">
40+
<div class="journal-scroll h-[calc(100vh-100px)] overflow-hidden">
4141
<nav class="grid w-full gap-2">
4242
@foreach ($menuItem->getChildren() as $subMenuItem)
4343
<div class="px-4 group/item {{ $menuItem->isActive() ? 'active' : 'inactive' }}">

‎public/admin/build/assets/app-0d36d34a.css‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎public/admin/build/assets/app-65c23fd5.css‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)