diff --git a/app/assets/javascripts/admin/admin.js.coffee b/app/assets/javascripts/admin/admin.js.coffee index ba07bb7933..76154e9e20 100644 --- a/app/assets/javascripts/admin/admin.js.coffee +++ b/app/assets/javascripts/admin/admin.js.coffee @@ -1,3 +1,3 @@ -window.Admin = angular.module("ofn.admin", ["ngResource","ofn.dropdown"]).config ($httpProvider) -> +window.Admin = angular.module("ofn.admin", ["ngResource", "ngAnimate", "ofn.dropdown"]).config ($httpProvider) -> $httpProvider.defaults.headers.common["X-CSRF-Token"] = $("meta[name=csrf-token]").attr("content") $httpProvider.defaults.headers.common["Accept"] = "application/json, text/javascript, */*" \ No newline at end of file diff --git a/app/assets/javascripts/admin/all.js b/app/assets/javascripts/admin/all.js index 3cf4fe97e7..99c936c4d7 100644 --- a/app/assets/javascripts/admin/all.js +++ b/app/assets/javascripts/admin/all.js @@ -11,6 +11,7 @@ //= require shared/jquery-ui-timepicker-addon //= require angular //= require angular-resource +//= require angular-animate //= require admin/spree_core //= require admin/spree_auth //= require admin/spree_promo diff --git a/app/assets/stylesheets/admin/enterprise_relationships.css.sass b/app/assets/stylesheets/admin/enterprise_relationships.css.sass new file mode 100644 index 0000000000..cffc0b0623 --- /dev/null +++ b/app/assets/stylesheets/admin/enterprise_relationships.css.sass @@ -0,0 +1,20 @@ +// TODO: Provide -moz- and -o- directives +@-webkit-keyframes alert-flash + 0% + background-color: #f9f1ae + + 100% + background-color: #fff + + +table#enterprise-relationships + th.actions, td.actions + width: 16% + .errors + color: #f00 + + tr.ng-enter + -webkit-animation-name: alert-flash + -webkit-animation-duration: 1200ms + -webkit-animation-iteration-count: 1 + -webkit-animation-timing-function: ease-in-out