shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'akaunting:master' into sentry

Browse Source
This commit is contained in:
Burak Civan
2022-11-21 16:57:16 +03:00
committed by GitHub
parent d45ad10641 8581e5d3e8
commit 3a7410f0fe
19 changed files with 273 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/assets/js/components/AkauntingSelect.vue
View File

@ -105,7 +105,7 @@
<component v-bind:is="add_new_html" @submit="onSubmit" @cancel="onCancel"></component>
<span slot="infoBlock" class="absolute right-8 top-3 bg-green text-white px-2 py-1 rounded-md text-xs" v-if="new_options[selected] || (sorted_options[sorted_options.length - 1].mark_new && sorted_options[sorted_options.length - 1].key == selected)">{{ addNew.new_text }}</span>
<span slot="infoBlock" class="absolute right-8 top-3 bg-green text-white px-2 py-1 rounded-md text-xs" v-if="new_options[selected] || (sorted_options.length && sorted_options[sorted_options.length - 1].mark_new && sorted_options[sorted_options.length - 1].key == selected)">{{ addNew.new_text }}</span>
<select :name="name" :id="name" class="hidden">
<option v-for="option in sortedOptions" :key="option.key" :value="option.key">{{ option.value }}</option>

4
resources/assets/js/components/AkauntingSelectRemote.vue
View File

@ -102,7 +102,7 @@
<component v-bind:is="add_new_html" @submit="onSubmit" @cancel="onCancel"></component>
<span slot="infoBlock" class="absolute right-8 top-3 bg-green text-white px-2 py-1 rounded-md text-xs" v-if="new_options[selected] || (sorted_options[sorted_options.length - 1].mark_new && sorted_options[sorted_options.length - 1].key == selected)">{{ addNew.new_text }}</span>
<span slot="infoBlock" class="absolute right-8 top-3 bg-green text-white px-2 py-1 rounded-md text-xs" v-if="new_options[selected] || (sorted_options.length && sorted_options[sorted_options.length - 1].mark_new && sorted_options[sorted_options.length - 1].key == selected)">{{ addNew.new_text }}</span>
<select :name="name" :id="name" class="hidden">
<option v-for="option in sortedOptions" :key="option.key" :value="option.key">{{ option.value }}</option>
@ -202,7 +202,7 @@
<component v-bind:is="add_new_html" @submit="onSubmit" @cancel="onCancel"></component>
<span slot="infoBlock" class="absolute right-8 top-3 bg-green text-white px-2 py-1 rounded-md text-xs" v-if="new_options[selected] || (sorted_options[sorted_options.length - 1].mark_new && sorted_options[sorted_options.length - 1].key == selected)">{{ addNew.new_text }}</span>
<span slot="infoBlock" class="absolute right-8 top-3 bg-green text-white px-2 py-1 rounded-md text-xs" v-if="new_options[selected] || (sorted_options.length && sorted_options[sorted_options.length - 1].mark_new && sorted_options[sorted_options.length - 1].key == selected)">{{ addNew.new_text }}</span>
<select :name="name" :id="name" v-model="selected" class="d-none">
<option v-for="option in sortedOptions" :key="option.key" :value="option.key">{{ option.value }}</option>

6
resources/assets/js/views/wizard/Company.vue
View File

@ -1,15 +1,15 @@
<template>
<div>
<div class="relative bg-body z-10 rounded-lg shadow-2xl p-10" style="height:675px;">
<div class="relative bg-body z-10 rounded-lg shadow-2xl p-5 sm:p-10 full-height-mobile" style="height:675px;">
<WizardSteps :active_state="active"></WizardSteps>
<form ref="form" class="w-full">
<div class="relative">
<div v-if="pageLoad" class="absolute left-0 right-0 top-0 bottom-0 w-full h-full bg-white rounded-lg flex items-center justify-center z-50">
<span class="material-icons form-spin text-lg animate-spin text-9xl">data_usage</span>
<span class="material-icons form-spin animate-spin text-9xl">data_usage</span>
</div>
<div class="flex flex-col justify-between">
<div class="flex flex-col justify-between -mt-5 sm:mt-0">
<div class="grid sm:grid-cols-6 gap-x-8 gap-y-6 my-3.5 menu-scroll gap-10">
<div class="sm:col-span-6">
<base-input

4
resources/assets/js/views/wizard/Currencies.vue
View File

@ -1,8 +1,8 @@
<template>
<div class="relative bg-body z-10 rounded-lg shadow-2xl p-10" style="height:675px;">
<div class="relative bg-body z-10 rounded-lg shadow-2xl p-5 sm:p-10 full-height-mobile" style="height:675px;">
<WizardSteps :active_state="active"></WizardSteps>
<div class="flex flex-col justify-between overflow-y-auto" style="height: calc(100% - 53px)">
<div class="flex flex-col justify-between -mt-5 sm:mt-0 overflow-y-auto" style="height: calc(100% - 53px)">
<div v-if="pageLoad" class="absolute left-0 right-0 top-0 bottom-0 w-full h-full bg-white rounded-lg flex items-center justify-center z-50">
<span class="material-icons form-spin animate-spin text-9xl">data_usage</span>
</div>

4
resources/assets/js/views/wizard/Finish.vue
View File

@ -1,10 +1,10 @@
<template>
<div class="relative bg-body z-10 rounded-lg shadow-2xl py-10 ltr:pl-10 rtl:pr-10 overflow-hidden">
<div class="relative bg-body z-10 rounded-lg shadow-2xl p-5 sm:py-10 sm:ltr:pl-10 sm:rtl:pr-10 overflow-hidden">
<div class="pr-10">
<WizardSteps :active_state="active"></WizardSteps>
</div>
<div modal-container class="flex flex-col justify-between" style="height:565px;">
<div modal-container class="flex flex-col justify-between -mt-5 sm:mt-0" style="height:565px;">
<div v-if="pageLoad" class="absolute left-0 right-0 top-0 bottom-0 w-full h-full bg-white rounded-lg flex items-center justify-center z-50">
<span class="material-icons form-spin text-lg animate-spin text-9xl">data_usage</span>
</div>

6
resources/assets/js/views/wizard/Steps.vue
View File

@ -2,7 +2,7 @@
<div>
<nav aria-label="Progress">
<ol role="list" class="flex mb-10">
<li class="w-1/4">
<li class="w-1/3">
<span class="pr-6 flex flex-col">
<span
:class="[{'bg-purple': active_state > 0}, {'bg-purple': active_state == 0}]"
@ -15,7 +15,7 @@
</span>
</li>
<li class="w-1/4">
<li class="w-1/3">
<span class="px-3 flex flex-col">
<span
:class="[{'bg-purple': active_state > 1}, {'bg-purple': active_state == 1}]"
@ -28,7 +28,7 @@
</span>
</li>
<li class="w-1/4">
<li class="w-1/3">
<span class="pl-6 flex flex-col">
<span
:class="[{'bg-purple': active_state == 3}]"

14
resources/assets/sass/app.css vendored
View File

@ -308,6 +308,16 @@
padding-right: 8px !important;
}
.el-select-dropdown__item .new-badge {
width: 45px !important;
margin-left: 8px;
z-index: 99;
}
.el-select-dropdown__item .new-badge:hover {
background-color: #6ea152;
}
.el-select-dropdown__item .material-icons {
padding-right: 0 !important;
padding-left: 0 !important;
@ -595,6 +605,10 @@ html[dir="rtl"] .lines-radius-border thead td:last-child {
.full-width-mobile {
width: 100% !important;
}
.full-height-mobile {
height: 100% !important;
}
}
/* full-width for mobile. Some component use inline styling for width */