merge with r-19

2020-01-11 11:08:33 +06:30
parent d43266bd7d 2d57faf7cf
commit 314cc507a3
106 changed files with 2722 additions and 3024 deletions
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -225,3 +225,14 @@ i.logout_icon{
    width: 100% !important;
  }
 }
+
+.report-table-header {
+  font-size: .95rem;
+  font-weight: 500;
+  color: rgba(0, 0, 0, 0.54);
+  padding: 10px;
+}
+
+.input-group-addon {
+  margin-bottom: 20px;
+}
--- a/app/assets/stylesheets/induties/assign_in_duties.scss
+++ b/app/assets/stylesheets/induties/assign_in_duties.scss
@@ -29,7 +29,6 @@
 }
 .bmd-form-group {
    position: relative;
-    padding-top: 0 !important;
 }
 .btn_create_induty{
  display: inline;
@@ -93,4 +92,4 @@
 .add_to_charges{
  width:100%;
  padding:1rem;
-}
+}