TheCloneArmy/crater
1
0
Fork 1
mirror of https://github.com/crater-invoice/crater.git synced 2026-02-09 20:32:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix conflicts

Browse Source
This commit is contained in:
yogesh_gohil
2019-11-14 15:51:48 +05:30
parent 4839e57791
commit 2dda0baa3f
51 changed files with 576 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
resources/assets/sass/pages/customers.scss vendored
View File

@@ -27,8 +27,6 @@
.same-address-checkbox-container {
display: flex;
justify-content: flex-end;
padding-left: 12px;
margin-bottom: 1.5rem;
align-items: center;
justify-content: flex-end;
@@ -97,7 +95,6 @@
.same-address-checkbox-container {
display: flex;
justify-content: flex-start;
padding-left: 15px;
margin-bottom: 0rem;
}

19
resources/assets/sass/pages/dashboard.scss vendored
View File

@@ -1,6 +1,23 @@
// Dashboard
// -------------------------
.dashboard {
.dashboard-table
.table-component {
.dashboard-recent-invoice-options {
.dropdown-container {
margin: 10px 5px 0 -75px;
}
}
}
}
.dashbox {
background-color: $white;
box-shadow: $shadow;
@@ -364,5 +381,7 @@
justify-content: center;
}
}
}
}

4
resources/assets/sass/pages/estimates/index.scss vendored
View File

@@ -38,7 +38,7 @@
}
.filter-date {
flex: 1;
flex: 2;
display: flex;
margin-right: 40px;
align-items: center;
@@ -60,7 +60,7 @@
margin-top: 28px;
}
@media(max-width: $medium-breakpoint ) {
@media(max-width: $large-breakpoint ) {
.filter-container {
flex-direction: column;
}

3
resources/assets/sass/pages/invoices/create.scss vendored
View File

@@ -490,7 +490,7 @@
font-weight: 300;
font-size: 12px;
padding-top: 2px;
padding-left: 10px;
// padding-left: 10px;
textarea {
@@ -504,6 +504,7 @@
border: none;
resize: none;
width: 100%;
padding-left: 11px;
color: $ls-color-gray--very-dark;
}
}

4
resources/assets/sass/pages/invoices/index.scss vendored
View File

@@ -33,7 +33,7 @@
}
.filter-date {
flex: 1;
flex: 2;
display: flex;
margin-right: 40px;
align-items: center;
@@ -55,7 +55,7 @@
margin-top: 28px;
}
@media(max-width: $medium-breakpoint ) {
@media(max-width: $large-breakpoint ) {
.filter-container {
flex-direction: column;
}

3
resources/assets/sass/pages/wizard.scss vendored
View File

@@ -98,6 +98,9 @@
border-radius: 50%;
height: 21px;
width: 21px;
display: flex;
align-items: center;
justify-content: center;
.icon-check {
font-style: normal;