diff --git a/app/assets/javascripts/application.js.erb b/app/assets/javascripts/application.js.erb index be79110f3..72cc5bbf5 100644 --- a/app/assets/javascripts/application.js.erb +++ b/app/assets/javascripts/application.js.erb @@ -30,6 +30,7 @@ //= require highlight.pack //= require tinymce-jquery //= require_directory ./sitewide +//= require jquery.dataTables.yadcf //= require datatables //= require dataTables.noSearchHidden //= require bootstrap-select diff --git a/app/assets/stylesheets/constants.scss b/app/assets/stylesheets/constants.scss index ca0cfa4be..5ab2bea32 100644 --- a/app/assets/stylesheets/constants.scss +++ b/app/assets/stylesheets/constants.scss @@ -26,12 +26,15 @@ $color-mine-shaft: #333; $color-nero: #262626; $color-black: #000; $color-cloud: rgba(0, 0, 0, .1); +$color-gray-light-yadcf: '#cccccc'; +$color-gray-dark-yadcf: '#a9a9a9'; // Miscelaneous colors $color-mystic: #eaeff2; $color-candlelight: #ffda23; $color-orange: #ff900b; $color-saturated-green: #008600; +$color-blue-yadcf: '#337ab7'; // Red colors $color-mojo: #cf4b48; diff --git a/app/views/users/settings/teams/_breadcrumbs.html.erb b/app/views/users/settings/teams/_breadcrumbs.html.erb index e44dff1b1..20ed340d8 100644 --- a/app/views/users/settings/teams/_breadcrumbs.html.erb +++ b/app/views/users/settings/teams/_breadcrumbs.html.erb @@ -1,4 +1,4 @@ -