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

Merge pull request #1254 from batuhawk/master

Browse Source 
Pagination responsive updated
This commit is contained in:
Batuhan Baş 2020-02-13 11:37:33 +03:00 committed by GitHub
commit a78b68a22f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 40 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
public/css/akaunting-color.css vendored
View File

@ -663,29 +663,33 @@ button.bg-darker:focus
/*--Darker Color Finish--*/
/*--Green Color--*/
.bg-green {
.bg-green
{
background-color: #6da252 !important;
}
a.bg-green:hover,
a.bg-green:focus,
button.bg-green:hover,
button.bg-green:focus {
button.bg-green:focus
{
background-color: #3d7224 !important;
}
/*--Green Color Finish--*/
/*--Yellow Color--*/
.bg-yellow {
.bg-yellow
{
background-color: #efef32 !important;
}
}
a.bg-yellow:hover,
a.bg-yellow:focus,
button.bg-yellow:hover,
button.bg-yellow:focus {
background-color: #bcbf03 !important;
}
a.bg-yellow:hover,
a.bg-yellow:focus,
button.bg-yellow:hover,
button.bg-yellow:focus
{
background-color: #bcbf03 !important;
}
/*--Yellow Color Finish--*/
/*--------Background Colors Finish--------*/
@ -1848,7 +1852,6 @@ button.bg-green:focus {
}
/*--Danger Color Finish--*/
/*--Warning Color--*/
.bg-gradient-warning
{
@ -1946,10 +1949,11 @@ button.bg-green:focus {
background: unset;
}
.avatar-xs {
font-size: .875rem;
width: 30px;
height: 30px;
.menu-avatar
{
font-size: .875rem !important;
width: 30px !important;
height: 30px !important;
}
/*--Left Menu Icon Finish--*/
@ -2028,7 +2032,7 @@ div.required .form-control-label:not(span):after, td.required:after
color : #ef3232 !important;
}
/*--Error Message Color Finish--*/
/*--------Form Error Color--------*/
/*--------Form Error Color Finish--------*/
/*--------Navbar Colors--------*/
@ -2116,14 +2120,6 @@ div.required .form-control-label:not(span):after, td.required:after
/*--------Checkbox Color Finish--------*/
/*--------Bulk Action Card Header Color--------*/
.bg-bulkaction
{
background-image: linear-gradient(to right, #ffffff, #e5e5e5);
}
/*--------Bulk Action Card Header Color Finish--------*/
/*--------Form Input Colors--------*/
.form-control-label
{
@ -2218,22 +2214,6 @@ div.required .form-control-label:not(span):after, td.required:after
/*--------Item Index Image Color Finish--------*/
/*--------Wizard Steps Color--------*/
.wizard-steps-color
{
color: #adb5bd !important;
cursor:default;
}
.wizard-steps-color-active:hover
{
color: #ffffff !important;
background-color: #3c3f72 !important;
border-color: #3c3f72 !important;
}
/*--------Wizard Steps Color Finish--------*/
/*--------Pagination Active Color--------*/
.page-item.active .page-link
{
@ -2373,24 +2353,6 @@ option:focus
/*--------List Group Item Active Finish-------*/
/*--Create Category Button Color--*/
.category-add
{
height: 3.3em !important;
margin-left: -0.2em;
color: #adb5bd !important;
border-color: #dee2e6 !important;
background-color: #ffffff !important;
box-shadow: none;
}
.category-add:hover
{
box-shadow: none;
}
/*--Create Category Button Color Finish--*/
/*--Wizard Delete Button Text--*/
.action-delete
{

33
public/css/custom.css vendored
View File

@ -109,7 +109,7 @@ button:focus
{
outline: none !important;
}
/*--Button Element Focus Finisj--*/
/*--Button Element Focus Finish--*/
/*--Button Hover--*/
@ -147,12 +147,6 @@ button:focus
overflow: hidden;
}
/*--------Left Menu--------*/
.g-sidenav-hidden .navbar-vertical.navbar-expand-xs
{
overflow: hidden !important;
}
/*--------Left Menu Finish--------*/
/*--------Customer/Vendor Show--------*/
@ -207,7 +201,7 @@ button:focus
/*--------Index Page Tables Finish--------*/
/*--------Left Menu Dropdown--------*/
/*--------Left Menu--------*/
.menu-dropdown
{
position: absolute !important;
@ -218,7 +212,13 @@ button:focus
{
min-width: 13rem !important;
}
/*--------Left Menu Dropdown Finish--------*/
.g-sidenav-hidden .navbar-vertical.navbar-expand-xs
{
overflow: hidden !important;
}
/*--------Left Menu Finish--------*/
/*--------Max Width 100 Pixel--------*/
@ -276,14 +276,6 @@ button:focus
/*--------Table Body Row Margin Finish--------*/
/*--------Card Footer--------*/
.card-footer
{
margin: 0;
}
/*--------Card Footer Finish--------*/
/*--------Item Column Image--------*/
.item-img
{
@ -609,7 +601,6 @@ button:focus
}
/*--------Invoice and Bill Total Column Finish--------*/
/*--------Custom Table--------*/
.table thead th
{
@ -836,6 +827,12 @@ table .align-items-center td span.badge {
{
float: right;
}
.pagination-xs
{
padding-right: 0;
padding-top: 1.5rem;
}
}
/*--Xs Breakpoint Finish--*/

4
resources/views/partials/admin/menu.blade.php
View File

@ -5,12 +5,12 @@
<ul class="navbar-nav">
<li class="nav-item dropdown">
<a class="nav-link" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<span class="avatar avatar-xs background-unset">
<span class="avatar menu-avatar background-unset">
<img class="border-radius-none border-0 mr-3" alt="Akaunting" src="{{ asset('public/img/akaunting-logo-white.svg') }}">
</span>
<span class="nav-link-text long-texts pl-2 mwpx-100">{{ Str::limit(setting('company.name'), 22) }}</span>
@permission('read-common-companies')
<i class="fas fa-sort-down pl-2"></i>
<i class="fas fa-sort-down pl-2"></i>
@endpermission
</a>
@permission('read-common-companies')

4
resources/views/partials/admin/pagination.blade.php
View File

@ -1,6 +1,6 @@
@stack('pagination_start')
@if ($items->firstItem())
<div class="col-xs-12 col-sm-6 d-flex align-items-center">
<div class="col-xs-12 col-sm-5 d-flex align-items-center">
{!! Form::select('limit', $limits, request('limit', setting('default.list_limit', '25')), ['class' => 'form-control form-control-sm d-inline-block w-auto d-none d-md-block', '@change' => 'onChangePaginationLimit($event)']) !!}
<span class="table-text d-none d-lg-block ml-2">
{{ trans('pagination.page') }}
@ -8,7 +8,7 @@
</span>
</div>
<div class="col-xs-12 col-sm-6">
<div class="col-xs-12 col-sm-7 pagination-xs">
<nav class="float-right">
{!! $items->withPath(request()->url())->appends(request()->except('page'))->links() !!}
</nav>

2
resources/views/partials/portal/menu.blade.php
View File

@ -5,7 +5,7 @@
<ul class="navbar-nav">
<li class="nav-item">
<a class="nav-link" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<span class="avatar avatar-xs background-unset">
<span class="avatar menu-avatar background-unset">
<img class="border-radius-none border-0 mr-3" alt="Image placeholder" src="{{ setting('company.logo') ? Storage::url(setting('company.logo')) : asset('public/img/akaunting-logo-white.svg') }}">
</span>
<span class="nav-link-text long-texts pl-2 mwpx-100">{{ Str::limit(setting('company.name'), 22) }}</span>