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

Merge pull request #1103 from batuhawk/master

Browse Source 
Print template color picker alignment updated
This commit is contained in:
Batuhan Baş 2020-01-09 17:50:10 +03:00 committed by GitHub
commit e418ecfa7e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
public/css/element.css vendored
View File

@ -12246,6 +12246,7 @@
position: absolute; position: absolute;
z-index: 10; z-index: 10;
padding: 6px; padding: 6px;
left: 341px !important;
-webkit-box-sizing: content-box; -webkit-box-sizing: content-box;
box-sizing: content-box; box-sizing: content-box;
background-color: #FFF; background-color: #FFF;
@ -15316,17 +15317,14 @@
} }
/*--------Import Components--------*/ /*--------Import Components--------*/
.el-color-picker__icon .el-color-picker__icon
{ {
padding-left: 16px; padding-left: 16px;
padding-top: 5px; padding-top: 5px;
} }
.el-color-dropdown.el-color-picker__panel .template-color-picker {
{ left: 492px !important;
left: 341px !important;
} }
.el-color-picker__color .el-color-picker__color

2
resources/views/modals/settings/invoice_template.blade.php
View File

@ -49,7 +49,7 @@
<div class="input-group input-group-merge" id="invoice-color-picker"> <div class="input-group input-group-merge" id="invoice-color-picker">
<div class="input-group-prepend"> <div class="input-group-prepend">
<span class="input-group-text"> <span class="input-group-text">
<el-color-picker v-model="invoice_form.color" size="mini" :predefine="predefineColors" @change="onChangeColor"></el-color-picker> <el-color-picker popper-class="template-color-picker" v-model="invoice_form.color" size="mini" :predefine="predefineColors" @change="onChangeColor"></el-color-picker>
</span> </span>
</div> </div>
{!! Form::text('color', $setting['color'], ['v-model' => 'invoice_form.color', '@input' => 'onChangeColorInput', 'id' => 'color', 'class' => 'form-control color-hex', 'required' => 'required']) !!} {!! Form::text('color', $setting['color'], ['v-model' => 'invoice_form.color', '@input' => 'onChangeColorInput', 'id' => 'color', 'class' => 'form-control color-hex', 'required' => 'required']) !!}