3 files changed, 184 insertions, 122 deletions

diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss
index 4006c9128..dae0c52c2 100644
--- a/client/src/sass/application.scss
+++ b/client/src/sass/application.scss
@@ -6,14 +6,14 @@ $icon-font-path: '../../node_modules/bootstrap-sass/assets/fonts/bootstrap/';
 
 @import '_fonts';
 
-@import '~primeng/resources/themes/bootstrap/theme.css';
-@import '~primeng/resources/primeng.css';
 @import '~video.js/dist/video-js.css';
 
 $assets-path: '../assets/';
 @import './player/player';
 @import './loading-bar';
 
+@import './primeng-custom';
+
 [hidden] {
   display: none !important;
 }
@@ -142,126 +142,6 @@ label {
   to { transform: scale(1) rotate(360deg);}
 }
 
-// ngprime data table customizations
-p-table {
-  font-size: 15px !important;
-
-  td {
-    border: 1px solid #E5E5E5 !important;
-    padding-left: 15px !important;
-    overflow: hidden !important;
-    text-overflow: ellipsis !important;
-    white-space: nowrap !important;
-  }
-
-  tr {
-    background-color: #fff !important;
-    height: 46px;
-  }
-
-  .ui-table-tbody {
-    tr {
-      &:hover {
-        background-color: #f0f0f0 !important;
-      }
-
-      &:not(:hover) {
-        .action-cell * {
-          display: none !important;
-        }
-      }
-
-      &:first-child td {
-        border-top: none !important;
-      }
-
-      &:last-child td {
-        border-bottom: none !important;
-      }
-    }
-
-    .expander {
-      cursor: pointer;
-      position: relative;
-      top: 1px;
-    }
-  }
-
-  th {
-    border: none !important;
-    border-bottom: 1px solid #f0f0f0 !important;
-    text-align: left !important;
-    padding: 5px 0 5px 15px !important;
-    font-weight: $font-semibold !important;
-    color: #000 !important;
-
-    &.ui-sortable-column:hover {
-      background-color: #f0f0f0 !important;
-      border: 1px solid #f0f0f0 !important;
-      border-width: 0 1px !important;
-
-      &:first-child {
-        border-width: 0 1px 0 0 !important;
-      }
-    }
-
-    &.ui-state-highlight {
-      background-color: #fff !important;
-
-      .fa {
-        @extend .glyphicon;
-        font-size: 11px;
-
-        &.fa-sort-asc {
-          @extend .glyphicon-triangle-top;
-        }
-
-        &.fa-sort-desc {
-          @extend .glyphicon-triangle-bottom;
-        }
-      }
-    }
-  }
-
-  .action-cell {
-    width: 250px !important;
-    padding: 0 !important;
-    text-align: center;
-
-    my-edit-button + my-delete-button {
-      margin-left: 5px;
-    }
-  }
-
-  p-paginator {
-    .ui-paginator-bottom {
-      position: relative;
-      border: none !important;
-      border: 1px solid #f0f0f0 !important;
-      height: 40px;
-      display: flex;
-      justify-content: center;
-      align-items: center;
-
-      a {
-        color: #000 !important;
-        font-weight: $font-semibold !important;
-        margin-right: 20px !important;
-        outline: 0 !important;
-        border-radius: 3px !important;
-        padding: 5px 2px !important;
-
-        &.ui-state-active {
-          &, &:hover, &:active, &:focus {
-            color: #fff !important;
-            background-color: $orange-color !important;
-          }
-        }
-      }
-    }
-  }
-}
-
 // Bootstrap customizations
 .dropdown-menu {
   border-radius: 3px;
@@ -352,6 +232,8 @@ tabset:not(.bootstrap) {
 }
 
 tabset.bootstrap {
+  margin-left: 0;
+
   .nav-item .nav-link {
     &, & a {
       color: #000;
diff --git a/client/src/sass/include/_mixins.scss b/client/src/sass/include/_mixins.scss
index 748c98afa..3904751c2 100644
--- a/client/src/sass/include/_mixins.scss
+++ b/client/src/sass/include/_mixins.scss
@@ -281,6 +281,12 @@
     cursor: pointer;
     display: inline;
   }
+
+  &[disabled] + label,
+  &[disabled] + label + label{
+    opacity: 0.5;
+    cursor: default;
+  }
 }
 
 
diff --git a/client/src/sass/primeng-custom.scss b/client/src/sass/primeng-custom.scss
new file mode 100644
index 000000000..b28b20e0f
--- /dev/null
+++ b/client/src/sass/primeng-custom.scss
@@ -0,0 +1,174 @@
+@import '_variables';
+@import '_mixins';
+
+@import '~primeng/resources/primeng.css';
+@import '~primeng/resources/themes/bootstrap/theme.css';
+
+@mixin glyphicon-light {
+  font-family: 'Glyphicons Halflings';
+  text-decoration: none !important;
+  color: #000 !important;
+}
+
+// data table customizations
+p-table {
+  font-size: 15px !important;
+
+  td {
+    border: 1px solid #E5E5E5 !important;
+    padding-left: 15px !important;
+    overflow: hidden !important;
+    text-overflow: ellipsis !important;
+    white-space: nowrap !important;
+  }
+
+  tr {
+    background-color: #fff !important;
+    height: 46px;
+  }
+
+  .ui-table-tbody {
+    tr {
+      &:hover {
+        background-color: #f0f0f0 !important;
+      }
+
+      &:not(:hover) {
+        .action-cell * {
+          display: none !important;
+        }
+      }
+
+      &:first-child td {
+        border-top: none !important;
+      }
+
+      &:last-child td {
+        border-bottom: none !important;
+      }
+    }
+
+    .expander {
+      cursor: pointer;
+      position: relative;
+      top: 1px;
+    }
+  }
+
+  th {
+    border: none !important;
+    border-bottom: 1px solid #f0f0f0 !important;
+    text-align: left !important;
+    padding: 5px 0 5px 15px !important;
+    font-weight: $font-semibold !important;
+    color: #000 !important;
+
+    &.ui-sortable-column:hover {
+      background-color: #f0f0f0 !important;
+      border: 1px solid #f0f0f0 !important;
+      border-width: 0 1px !important;
+
+      &:first-child {
+        border-width: 0 1px 0 0 !important;
+      }
+    }
+
+    &.ui-state-highlight {
+      background-color: #fff !important;
+
+      .pi {
+        @extend .glyphicon;
+
+        color: #000;
+        font-size: 11px;
+
+        &.pi-sort-up {
+          @extend .glyphicon-triangle-top;
+        }
+
+        &.pi-sort-down {
+          @extend .glyphicon-triangle-bottom;
+        }
+      }
+    }
+  }
+
+  .action-cell {
+    width: 250px !important;
+    padding: 0 !important;
+    text-align: center;
+
+    my-edit-button + my-delete-button {
+      margin-left: 5px;
+    }
+  }
+
+  p-paginator {
+    .ui-paginator-bottom {
+      position: relative;
+      border: 1px solid #f0f0f0 !important;
+      height: 40px;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+
+      .ui-paginator-pages {
+        height: auto !important;
+
+        a {
+          color: #000 !important;
+          font-weight: $font-semibold !important;
+          margin-right: 20px !important;
+          outline: 0 !important;
+          border-radius: 3px !important;
+          padding: 5px 2px !important;
+          height: auto !important;
+
+          &.ui-state-active {
+            &, &:hover, &:active, &:focus {
+              color: #fff !important;
+              background-color: $orange-color !important;
+            }
+          }
+        }
+      }
+    }
+  }
+}
+
+// PrimeNG calendar tweaks
+p-calendar .ui-datepicker {
+  a {
+    @include disable-default-a-behaviour;
+  }
+
+  .ui-datepicker-header {
+
+    .ui-datepicker-year {
+      margin-left: 5px;
+    }
+
+    .ui-datepicker-next {
+      @extend .glyphicon-chevron-right;
+      @include glyphicon-light;
+    }
+
+    .ui-datepicker-prev {
+      @extend .glyphicon-chevron-left;
+      @include glyphicon-light;
+    }
+  }
+
+  .ui-timepicker {
+
+    .pi.pi-chevron-up {
+      @extend .glyphicon-chevron-up;
+      @include glyphicon-light;
+    }
+
+    .pi.pi-chevron-down {
+      @extend .glyphicon-chevron-down;
+      @include glyphicon-light;
+    }
+  }
+}
\ No newline at end of file