defuj/apkt-eis
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev-bagus' of https://github.com/defuj/eis into development

Browse Source
This commit is contained in:
Dede Fuji Abdul
2023-10-27 15:44:36 +07:00
parent 07a19cb520 dfcd95ba8a
commit 9544ee2500
1 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/assets/css/style.css
View File

@ -1889,8 +1889,13 @@ select {
--tw-bg-opacity: 0.8; --tw-bg-opacity: 0.8;
} }
<<<<<<<<< Temporary merge branch 1
.bg-opacity-100 {
--tw-bg-opacity: 1;
=========
.bg-none { .bg-none {
background-image: none; background-image: none;
>>>>>>>>> Temporary merge branch 2
} }
.fill-gray-500 { .fill-gray-500 {
@ -3457,6 +3462,24 @@ select {
padding-right: 2rem; padding-right: 2rem;
} }
<<<<<<<<< Temporary merge branch 1
.lg\:px-6 {
padding-left: 1.5rem;
padding-right: 1.5rem;
}
.lg\:py-6 {
padding-top: 1.5rem;
padding-bottom: 1.5rem;
}
.lg\:text-3xl {
font-size: 1.875rem;
line-height: 2.25rem;
}
=========
>>>>>>>>> Temporary merge branch 2
.lg\:text-xs { .lg\:text-xs {
font-size: 0.75rem; font-size: 0.75rem;
line-height: 1rem; line-height: 1rem;