Merge branch '1.3-dev' of github.com:akaunting/akaunting into 1.3-dev

This commit is contained in:
denisdulici
2018-10-27 18:01:38 +03:00
73 changed files with 3176 additions and 22 deletions

67
public/css/app.css vendored
View File

@ -750,13 +750,14 @@ input[type="number"] {
}
#items .select2-container--default .select2-selection--multiple .select2-selection__choice {
background-color: #6da252;
border: 1px solid #6da252;
background-color: #f4f4f4;
color: #444;
border: 1px solid #ddd;
margin-bottom: 5px;
}
#items .select2-container--default .select2-selection--multiple .select2-selection__choice__remove {
color: #fffdfd;
color: #444;
}
#items span.select2.select2-container.select2-container--default .select2-selection.select2-selection--multiple {
@ -775,4 +776,62 @@ input[type="number"] {
#items .select2-search__field {
padding-left: 15px;
}
}
.stepwizard-step p {
margin-top: 5px;
font-size: 16px;
color:#666;
}
.stepwizard-row {
display: table-row;
}
.stepwizard {
display: table;
width: 100%;
position: relative;
margin-top: 20px;
}
.stepwizard-step button[disabled] {
/*opacity: 1 !important;
filter: alpha(opacity=100) !important;*/
}
.stepwizard .btn.disabled, .stepwizard .btn[disabled], .stepwizard fieldset[disabled] .btn {
opacity:1 !important;
color:#bbb;
}
.stepwizard-row:before {
top: 26px;
bottom: 0;
position: absolute;
content:" ";
width: 100%;
height: 1px;
background-color: #ccc;
z-index: 0;
}
.stepwizard-step {
display: table-cell;
text-align: center;
position: relative;
}
.btn-circle.btn-success {
color: #fff;
}
.btn-circle {
width: 50px;
height: 50px;
text-align: center;
padding: 1px 0;
font-size: 30px;
line-height: 1.428571;
border-radius: 30px;
}