update

package.json

@@ -36,6 +36,7 @@
     "bootstrap-vue": "^2.0.0-rc.11",
     "chart.js": "^2.7.3",
     "core-js": "^2.5.7",
+    "country-region-data": "^1.4.7",
     "css-vars-ponyfill": "^1.15.0",
     "cxlt-vue2-toastr": "^1.1.0",
     "express": "^4.17.1",

src/assets/scss/_custom.scss

@@ -309,6 +309,7 @@ h1 {
 }
 .seperate-bar {
   background: gray;
+  width: 100%;
 }
 
 .modal-dialog {
@@ -375,6 +376,8 @@ h1 {
   border: solid 1px #ebebeb;
 
   .input-group-prepend {
+
+    border-radius: 4px;
     .input-group-text {
       height: 40px;
       width: 46px;
@@ -383,6 +386,8 @@ h1 {
       background: white;
       justify-content: center;
       display: flex;
+
+      border-radius: 4px;
     }
   }
   .form-control {
@@ -499,7 +504,7 @@ h1 {
   section {
     position: unset !important;
     width: 100% !important;
-    max-height: 170px !important;
+    max-height: 176px !important;
     ul.nav {
       width: 100%;
       .nav-dropdown.open {

src/components/UserSidebarEx.scss

@@ -23,6 +23,8 @@
         font-size: 1.1rem;
         margin-right: 10px;
         width: 16px;
+        color: rgb(180, 180, 180);
+        text-align: center;
       }
       &:hover {
         cursor: pointer;

src/components/UserSidebarEx.vue

@@ -59,8 +59,8 @@ export default {
       { name: "Title", icon: "fa fa-briefcase" },
       { name: "Text", icon: "fa fa-file-text" },
       { name: "Date Signed", icon: "fa fa-calendar" },
-      { name: "Initials", icon: "initial.png", img_mode: true},
-      { name: "Stamp", icon: "stamp.png", img_mode: true},
+      { name: "Initials", icon: "initial_white.svg", img_mode: true},
+      { name: "Stamp", icon: "stamp_white.svg", img_mode: true},
       { name: "Attachments", icon: "fa fa-paperclip" },
     ];
     const items = this.navItems.map(item => {

src/containers/DocumentsContainer.scss

@@ -1,50 +1,54 @@
-.prepare-tool-nav {
-  .tool-nav-item {
-    width: 100%;
-    border-radius: 5px;
-    box-shadow: 0 4px 20px 0 rgba(65, 48, 42, 0.15);
-    background-color: rgba(255, 255, 255, 0.2);
-    // background-color: white;
-  }
-}
-.doc-timeline {
-  display: flex;
-  margin-left: auto;
-  @media (max-width: 770px) {
-    display: none;
+.document-container{
+  .prepare-tool-nav {
+    height: calc(100% - 60px);
+    overflow-y: auto;
+    .tool-nav-item {
+      width: 100%;
+      border-radius: 5px;
+      box-shadow: 0 4px 20px 0 rgba(65, 48, 42, 0.15);
+      background-color: rgba(255, 255, 255, 0.2);
+      // background-color: white;
+    }
   }
-  .timeline-item {
+  .doc-timeline {
     display: flex;
-    align-items: center;
-    .timeline-title {
-      margin-left: 5px;
-      font-size: 14px;
-      font-weight: 500;
-      line-height: 1.36;
-      color: #2e221e;
+    margin-left: auto;
+    @media (max-width: 770px) {
+      display: none;
     }
-    .header-radio-dashline {
-      min-width: 61px;
-      border-top: dashed 2px gray;
-      height: 2px;
-      align-self: center;
-      margin-left: 15px;
-      margin-right: 15px;
-      @media (max-width: 1400px) {
-        min-width: 30px;
+    .timeline-item {
+      display: flex;
+      align-items: center;
+      .timeline-title {
+        margin-left: 5px;
+        font-size: 14px;
+        font-weight: 500;
+        line-height: 1.36;
+        color: #2e221e;
       }
-      @media (max-width: 1190px) {
-        min-width: 0px;
-        margin-right: 10px;
-        margin-left: 0;
+      .header-radio-dashline {
+        min-width: 61px;
+        border-top: dashed 2px gray;
+        height: 2px;
+        align-self: center;
+        margin-left: 15px;
+        margin-right: 15px;
+        @media (max-width: 1400px) {
+          min-width: 30px;
+        }
+        @media (max-width: 1190px) {
+          min-width: 0px;
+          margin-right: 10px;
+          margin-left: 0;
+        }
+      }
+      .ready {
+        background-color: rgba(239, 99, 76, 0.1);
+        color: #ef634c;
+      }
+      .waiting {
+        color: #9ea0a5;
       }
-    }
-    .ready {
-      background-color: rgba(239, 99, 76, 0.1);
-      color: #ef634c;
-    }
-    .waiting {
-      color: #9ea0a5;
     }
   }
-}
+}

src/containers/DocumentsContainer.vue

@@ -1,22 +1,21 @@
 <template>
   <div class="app">
-    <div class="app-body">
-      <AppSidebar >
+    <div class="app-body document-container">
+      <AppSidebar fixed>
         <AppLogo></AppLogo>
         <div class="p-3 side-menu">
-          <div class="w-100">
+          <div class="w-100 h-100">
             <b-button block variant="primary" v-on:click="gotoPage('/landing')">Cancel</b-button>
-
             <b-button
               variant="primary"
               class="d-block d-sm-none"
               block
               style="padding-top: 0.5rem;"
               v-on:click="gotoPage('/payment/pricing-plan')"
             >Upgrade Your Plan</b-button>
+            <hr class="seperate-bar" v-if="show_tool_menu"/>
             <div class="prepare-tool-nav" v-if="show_tool_menu">
-              <hr class="seperate-bar" />
-              <UserSidebarEx :navItems="nav" @dragTool="dragTool"></UserSidebarEx>
+              <UserSidebarEx :navItems="nav" @toggleSidebar="toggleSidebar"></UserSidebarEx>
             </div>
           </div>
           <Logout></Logout>
@@ -325,19 +324,18 @@ export default {
       this.$refs["welcomemodal"].show();
     }
     this.setOptions();
-    this.$refs.sidebarToggleBtn.toggle();
-
-    // this.$root.on('toggleSidebar', () => {
-    //   this.$refs.sidebarToggleBtn.toggle();
-    // });
+    this.toggleSidebar();
   },
   methods: {
-    dragTool() {
-      this.$refs.sidebarToggleBtn.toggle();
+    toggleSidebar() {
+      if(window.innerWidth<500){
+        console.log("toggled sidebar");
+        this.$refs.sidebarToggleBtn.toggle();
+      }
     },
     clickMain(e) {
       if (e.target.className == "main") {
-        this.$refs.sidebarToggleBtn.toggle();
+        this.toggleSidebar();
       }
     },
     hideModal(e) {
@@ -414,7 +412,6 @@ export default {
   },
   watch: {
     $route() {
-      // this.$refs.sidebarToggleBtn.toggle();
       this.setOptions();
     }
   }