Merge privileges

2018-12-11 12:52:15 -06:00
parent 65dc1838b9 140b59e79d
commit 66d96454e6
32 changed files with 1115 additions and 210 deletions
--- a/app/assets/templates/directives/permissions-modal.html.haml
+++ b/app/assets/templates/directives/permissions-modal.html.haml
@@ -1,6 +1,6 @@
-.background{"ng-click" => "deny()"}
+.sk-modal-background{"ng-click" => "deny()"}

-.content#permissions-modal
+.sk-modal-content#permissions-modal
  .sn-component
    .sk-panel
      .sk-panel-header