Merge branch 'master' of https://github.com/abouolia/Bigcapital

client/src/style/App.scss

@@ -92,11 +92,11 @@ body.hide-scrollbar .Pane2{
   }
 }
 
-
 .bp3-progress-bar.bp3-intent-primary .bp3-progress-meter{
   background-color: #0066ff;
 }
 
 .bp3-overlay-backdrop{
   background-color: rgba(0,10,30, .7);
-}
+}
+

client/src/style/components/DataTable/DataTableEditable.scss

@@ -161,7 +161,8 @@
       // .total,
       .quantity,
       .rate,
-      .discount{
+      .discount,
+      .total{
 
         &,
         input{
@@ -216,7 +217,6 @@
       border-top-color: #e9e9ef;
       border-top-style: solid;
       min-height: 40px;
-
       font-weight: 500;
 
 

client/src/style/containers/Dashboard/Sidebar.scss

@@ -8,12 +8,15 @@
   z-index: $sidebar-zindex;
 
   .ScrollbarsCustom-Track {
+
     &.ScrollbarsCustom-TrackY,
     &.ScrollbarsCustom-TrackX {
       background: rgba(0, 0, 0, 0);
     }
   }
+
   .ScrollbarsCustom-Thumb {
+
     &.ScrollbarsCustom-ThumbX,
     &.ScrollbarsCustom-ThumbY {
       background: rgba(0, 0, 0, 0);
@@ -22,27 +25,69 @@
 
   &:hover {
     .ScrollbarsCustom-Thumb {
+
       &.ScrollbarsCustom-ThumbX,
       &.ScrollbarsCustom-ThumbY {
         background: rgba(255, 255, 255, 0.25);
       }
     }
   }
+
   &__head {
-    padding: 18px 20px;
+    padding: 20px 20px;
 
     &-logo {
-      position: relative;
-      top: 2px;
+      position: absolute;
+      top: 16px;
+      left: 12px;
+      opacity: 0;
+      visibility: hidden;
 
-      svg {
+      svg{
         opacity: $sidebar-logo-opacity;
       }
     }
-    .sidebar__head-logo{
+
+    &-organization {
+      .title {
+        background: transparent;
+        padding: 0;
+        min-height: auto;
+        min-width: auto;
+        font-weight: 600;
+        outline: 0;
+        font-size: 15px;
+
+        &:not([class*="bp3-intent-"]):not(.bp3-minimal) {
+          color: rgba(255, 255, 255, 0.8);
+        }
+        &:hover,
+        &:focus,
+        &:active,
+        &.bp3-active {
+          background: transparent;
+        }
+        .bp3-button-text {
+          margin-right: 4px;
+        }
+        svg {
+          fill: rgba(255, 255, 255, 0.3);
+        }
+      }
+
+      .subtitle {
+        display: block;
+        font-size: 12px;
+        margin-top: 6px;
+        color: rgba(255, 255, 255, 0.6);
+      }
+    }
+
+    .sidebar__head-logo {
       transition: transform 0.05s ease-in-out;
     }
   }
+
   &__scroll-wrapper {
     height: 100%;
   }
@@ -66,20 +111,24 @@
         background: $sidebar-submenu-item-bg-color;
         color: $sidebar-menu-item-color-active;
       }
+
       &:focus,
       &:active {
         background: #01143e;
       }
-      > .#{$ns}-icon {
+
+      >.#{$ns}-icon {
         color: #767b9b;
         margin-right: 16px;
         margin-top: 0;
       }
-      > .#{$ns}-icon-caret-right {
+
+      >.#{$ns}-icon-caret-right {
         margin-right: -4px;
         margin-top: 3px;
         color: rgba(255, 255, 255, 0.25);
       }
+
       &-labeler {
         display: block;
         color: $sidebar-menu-label-color;
@@ -113,11 +162,13 @@
             background: transparent;
             color: $sidebar-submenu-item-hover-color;
           }
+
           &.bp3-active {
             font-weight: 500;
           }
         }
       }
+
       .#{$ns}-popover {
         padding: 0;
 
@@ -126,14 +177,17 @@
         }
       }
     }
+
     .#{$ns}-popover-target.#{$ns}-popover-open .#{$ns}-menu-item {
       color: $sidebar-menu-item-color;
     }
+
     .#{$ns}-menu-divider {
       border-top-color: rgba(255, 255, 255, 0.1);
       color: #6b708c;
       margin: 4px 0;
     }
+
     .#{$ns}-menu-spacer {
       margin: 4px 0;
       height: 1px;
@@ -145,20 +199,20 @@
     white-space: nowrap;
     width: 50px;
 
-    .sidebar__head{
-      .sidebar__head-logo{
-        transform: translate(-8px, 0);
+    .sidebar__head {
+      .sidebar__head-logo {
+        transition: opacity 0.3s ease-in-out;
+        transition-delay: 0.15s;
+        opacity: 1;
+        visibility: visible;
       }
-    }
-    // Hide text of bigcapital logo.
-    .sidebar__head-logo {
-      .bp3-icon-bigcapital {
-        path {
-          transition: opacity 0.3s ease-in-out;
-        }
-        path:not(.path-1):not(.path-2) {
-          opacity: 0;
-        }
+      // Hide text of bigcapital logo.
+      &-logo {
+
+      }
+      &-organization{
+        opacity: 0;
+        transition: opacity 0.3s ease-in-out;
       }
     }
 
@@ -175,15 +229,14 @@
       &:hover {
         min-width: 220px;
 
-        .sidebar__head-logo {  
-          transform: translate(0px, 0);
-          
-          .bp3-icon-bigcapital {
-            path:not(.path-1):not(.path-2) {
-              opacity: 1;
-            }
-          }
+        .sidebar__head-logo {
+          opacity: 0;
+          transition-delay: 0s;
         }
+        .sidebar__head-organization{
+          opacity: 1;
+        }
+
         .sidebar__menu {
           opacity: 1;
         }
@@ -205,6 +258,7 @@
       .bp3-icon {
         color: rgba(255, 255, 255, 0.4);
       }
+
       &,
       &:hover {
         min-height: auto;
@@ -221,9 +275,34 @@
         }
       }
     }
+
     .bp3-icon {
       margin: 0;
       display: block;
     }
   }
 }
+.menu--dashboard-organization{
+  padding: 10px;
+  .org-item {
+    display: flex;
+    align-items: center;
+  
+    &__logo {
+      height: 40px;
+      width: 40px;
+      line-height: 40px;
+      border-radius: 3px;
+      background-color: #CB22E5;
+      text-align: center;
+      font-weight: 400;
+      font-size: 16px;
+      color: #fff;
+    }
+  
+    &__name {
+      margin-left: 12px;
+      font-weight: 600;
+    }
+  }
+}

client/src/style/pages/ContactDuplicate/ContactDuplicateDialog.scss

@@ -1,9 +1,13 @@
 .dialog--contact-duplicate {
   .bp3-dialog-body {
-    .bp3-form-group.bp3-inline {
-      margin: 18px 0px;
+    > .paragraph {
+      margin-bottom: 1rem;
+    }
+    .bp3-form-group {
+      margin-bottom: 1.4rem;
+
       .bp3-label {
-        min-width: 100px;
+        font-size: 13px;
       }
     }
     .bp3-button:not([class*='bp3-intent-']):not(.bp3-minimal) {

client/src/style/pages/ReferenceNumber/ReferenceNumber.scss

@@ -0,0 +1,19 @@
+.reference-number-form {
+
+    .bp3-dialog-body {
+
+        .paragraph {
+            margin-bottom: 22px;
+        }
+
+        .bp3-control {
+            margin-bottom: 16px;
+        }
+    }
+
+    .bp3-dialog-footer {
+        .bp3-button[type='submit'] {
+            min-width: 80px;
+        }
+    }
+}

client/src/style/pages/SaleInvoice/List.scss

@@ -27,7 +27,7 @@
           line-height: 1.4;
 
           + .partial-paid{
-            margin-top: 5px;
+            margin-top: 2px;
           }
         }
         .overdue-status{
@@ -40,7 +40,7 @@
           font-size: 12px;
           line-height: 1;
           display: block;
-          margin-bottom: 8px;
+          margin-bottom: 6px;
           opacity: 0.7;
         }
         .fully-paid-icon{

client/src/style/pages/SaleInvoice/PageForm.scss

@@ -22,17 +22,16 @@ body.page-invoice-edit{
     }
 
     .bp3-label {
-      min-width: 140px;
+      min-width: 150px;
     }
     .bp3-form-content {
       width: 100%;
     }
 
     .bp3-form-group {
-      
-
+    
       &.bp3-inline {
-        max-width: 440px;
+        max-width: 450px;
       }
     }
     .col--invoice-date {

client/src/style/pages/SaleReceipt/PageForm.scss

@@ -22,7 +22,7 @@ body.page-receipt-edit{
       flex: 1 0 0;
     }
     .bp3-label{
-      min-width: 140px;
+      min-width: 150px;
     }
     .bp3-form-content{
       width: 100%;