Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui

app/assets/stylesheets/addorder.scss

@@ -9,6 +9,7 @@
     background-color: #54A5AF;
     padding:5px;
     color :#fff;
+
 }
 
 .custom-card {

app/assets/stylesheets/application.scss

@@ -6,6 +6,7 @@
 @import "bootstrap-material-datetimepicker/css/bootstrap-material-datetimepicker";
 @import "bootstrap-select/css/bootstrap-select";
 @import "morrisjs/morris";
+@import "fileinput.min";
 @import "BSBMaterial/style";
 @import "BSBMaterial/themes/all-themes";
 
@@ -19,6 +20,10 @@
   padding-right: 5px ;
 }
 
+.navbar {
+  padding: 0.1rem 1rem;
+}
+
 .navbar-header {
   padding: 0px;
 }
@@ -57,18 +62,18 @@ section.content {
 
 .sidebar {
   width: 210px;
-  height: calc(100vh - 55px);
+  height: calc(100vh - 50px);
   position: fixed;
-  top: 55px;
+  top: 50px;
   right: 250px;
 }
 
 .right-sidebar {
   width: 240px;
-  height: calc(100vh - 55px);
+  height: calc(100vh - 50px);
   position: fixed;
   right: -260px;
-  top: 55px;
+  top: 50px;
 }
 
 .nav-tabs li a.active {

app/assets/stylesheets/sx-sidebar.css

@@ -14,7 +14,7 @@
 }
 
 #wrapper.toggled {
-    padding-left: 200px;
+    padding-left: 210px;
 }
 
 #sidebar-wrapper {
@@ -41,13 +41,14 @@
 #page-content-wrapper {
     width: 100%;
     position: absolute;
-    padding: 0px;
+    padding-top: 20px;
     
 }
 
 #wrapper.toggled #page-content-wrapper {
     position: absolute;
     margin-right: -200px;
+    padding-top: 20px;
 }
 
 
@@ -117,7 +118,7 @@
         padding-left: 0;
     }
     #wrapper.toggled {
-        padding-left: 210px;
+        padding-left: 209px;
     }
     #sidebar-wrapper {
         width: 0;
@@ -126,12 +127,13 @@
         width: 216px;
     }
     #page-content-wrapper {
-        padding: 0px;
+        padding-top: 20px;
         position: relative;
     }
     #wrapper.toggled #page-content-wrapper {
         position: relative;
         margin-right: 0;
+        padding-top: 20px;
     }
 }
 .accordion {