activeadmin 2.6.1 → 2.12.0

data/app/assets/stylesheets/active_admin/_base.scss

@@ -1,41 +1,57 @@
 /* Active Admin CSS */
-// Normalize
-@import "./normalize";
+@media screen {
+  // Normalize
+  @import "./normalize";
 
-// Partials
-@import "./typography";
-@import "./header";
-@import "./forms";
-@import "./components/comments";
-@import "./components/flash_messages";
-@import "./components/date_picker";
-@import "./components/tables";
-@import "./components/batch_actions";
-@import "./components/modal_dialog";
-@import "./components/blank_slates";
-@import "./components/breadcrumbs";
-@import "./components/dropdown_menu";
-@import "./components/buttons";
-@import "./components/grid";
-@import "./components/links";
-@import "./components/pagination";
-@import "./components/panels";
-@import "./components/columns";
-@import "./components/scopes";
-@import "./components/status_tags";
-@import "./components/table_tools";
-@import "./components/index_list";
-@import "./components/unsupported_browser";
-@import "./components/tabs";
-@import "./pages/logged_out";
-@import "./structure/footer";
-@import "./structure/main_structure";
-@import "./structure/title_bar";
+  // Partials
+  @import "./typography";
+  @import "./header";
+  @import "./forms";
+  @import "./components/comments";
+  @import "./components/flash_messages";
+  @import "./components/date_picker";
+  @import "./components/tables";
+  @import "./components/batch_actions";
+  @import "./components/modal_dialog";
+  @import "./components/blank_slates";
+  @import "./components/breadcrumbs";
+  @import "./components/dropdown_menu";
+  @import "./components/buttons";
+  @import "./components/grid";
+  @import "./components/links";
+  @import "./components/pagination";
+  @import "./components/panels";
+  @import "./components/columns";
+  @import "./components/scopes";
+  @import "./components/status_tags";
+  @import "./components/table_tools";
+  @import "./components/index_list";
+  @import "./components/unsupported_browser";
+  @import "./components/tabs";
+  @import "./pages/logged_out";
+  @import "./structure/footer";
+  @import "./structure/main_structure";
+  @import "./structure/title_bar";
 
-body {
-  @include sans-family;
-  line-height: 1.5;
-  font-size: 72%;
-  background: $body-background-color;
-  color: $text-color;
+  html {
+    box-sizing: border-box;
+  }
+
+  *,
+  *:before,
+  *:after {
+    box-sizing: inherit;
+  }
+
+  body {
+    @include sans-family;
+    line-height: 1.5;
+    font-size: 72%;
+    background: $body-background-color;
+    color: $text-color;
+  }
+}
+
+@media print {
+  @import "./print";
 }

data/app/assets/stylesheets/active_admin/_forms.scss

@@ -250,8 +250,6 @@ form {
 
 // -------------------------------------- Sidebar Forms
 
-$sidebar-inner-content-width: $sidebar-width - ($section-padding * 2);
-
 .sidebar_section {
 
   label {
@@ -274,13 +272,6 @@ $sidebar-inner-content-width: $sidebar-width - ($section-padding * 2);
 
 // -------------------------------------- Filter Forms
 
-$filter-field-seperator-width: 12px;
-
-$side-by-side-filter-input-width: ($sidebar-inner-content-width / 2) - ($text-input-horizontal-padding * 2) - $filter-field-seperator-width;
-$side-by-side-filter-select-width: ($sidebar-inner-content-width / 2) - $filter-field-seperator-width;
-
-$date-range-filter-input-width: ($sidebar-inner-content-width / 2) - ($filter-field-seperator-width / 2);
-
 form.filter_form {
   .filter_form_field {
     margin-bottom: 10px;
@@ -313,7 +304,6 @@ form.filter_form {
 
     &.filter_date_range {
       input[type=text] {
-        box-sizing: border-box;
         width: $date-range-filter-input-width;
 
         + input {

data/app/assets/stylesheets/active_admin/_header.scss

@@ -52,6 +52,11 @@
     margin: 0;
     padding: 0;
 
+    li {
+      /* Hover on li, display the ul */
+      &:hover > ul { display: block;}
+    }
+
     & > li {
       display: inline-block;
       margin-right: 4px;
@@ -95,8 +100,6 @@
       }
 
 
-      /* Hover on li, display the ul */
-      &:hover ul { display: block;}
       /* Drop down menus */
       ul {
         background: $hover-menu-item-background;
@@ -114,6 +117,7 @@
         z-index: 1010;
 
         li {
+          position: relative;
           margin: 0px;
           a {
             background: none;
@@ -124,10 +128,40 @@
           &.current {
             a { @include rounded(0) }
           }
+
+          &.has_nested > a {
+            background: url($menu-arrow-right-light-icon-url) no-repeat calc(100% - 7px) 55%;
+            padding-right: 20px;
+          }
+
+          &.has_nested:hover > a {
+            background: url($menu-arrow-right-dark-icon-url) no-repeat calc(100% - 7px) 55%;
+            color: #fff;
+          }
+
+          ul {
+            @include rounded-all(10px,10px,10px,10px);
+            margin-top: 0;
+            top: -3px;
+            left: 100%;
+
+            /* Create an invisible backdrop that adds 8px margin around the dropdown menu or submenu
+               that maintains the hover. This makes it much easier to navigate to submenus in
+               particular without losing hover accientally, especially near rounded corners. */
+            &:after {
+              content: "";
+              display: block;
+              position: absolute;
+              top: -8px;
+              left: -8px;
+              height: calc(100% + 16px);
+              width: calc(100% + 16px);
+              z-index: -2;
+            }
+          }
         }
       }
     }
-
   }
 
   #tabs {

data/app/assets/stylesheets/active_admin/_normalize.scss

@@ -1,17 +1,15 @@
-/*! normalize.css v7.0.0 | MIT License | github.com/necolas/normalize.css */
+/*! normalize.css v8.0.1 | MIT License | github.com/necolas/normalize.css */
 
 /* Document
    ========================================================================== */
 
 /**
  * 1. Correct the line height in all browsers.
- * 2. Prevent adjustments of font size after orientation changes in
- *    IE on Windows Phone and in iOS.
+ * 2. Prevent adjustments of font size after orientation changes in iOS.
  */
 
 html {
   line-height: 1.15; /* 1 */
-  -ms-text-size-adjust: 100%; /* 2 */
   -webkit-text-size-adjust: 100%; /* 2 */
 }
 
@@ -19,7 +17,7 @@ html {
    ========================================================================== */
 
 /**
- * Remove the margin in all browsers (opinionated).
+ * Remove the margin in all browsers.
  */
 
 body {
@@ -27,15 +25,10 @@ body {
 }
 
 /**
- * Add the correct display in IE 9-.
+ * Render the `main` element consistently in IE.
  */
 
-article,
-aside,
-footer,
-header,
-nav,
-section {
+main {
   display: block;
 }
 
@@ -52,25 +45,6 @@ h1 {
 /* Grouping content
    ========================================================================== */
 
-/**
- * Add the correct display in IE 9-.
- * 1. Add the correct display in IE.
- */
-
-figcaption,
-figure,
-main { /* 1 */
-  display: block;
-}
-
-/**
- * Add the correct margin in IE 8.
- */
-
-figure {
-  margin: 1em 40px;
-}
-
 /**
  * 1. Add the correct box sizing in Firefox.
  * 2. Show the overflow in Edge and IE.
@@ -96,17 +70,15 @@ pre {
    ========================================================================== */
 
 /**
- * 1. Remove the gray background on active links in IE 10.
- * 2. Remove gaps in links underline in iOS 8+ and Safari 8+.
+ * Remove the gray background on active links in IE 10.
  */
 
 a {
-  background-color: transparent; /* 1 */
-  -webkit-text-decoration-skip: objects; /* 2 */
+  background-color: transparent;
 }
 
 /**
- * 1. Remove the bottom border in Chrome 57- and Firefox 39-.
+ * 1. Remove the bottom border in Chrome 57-
  * 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari.
  */
 
@@ -116,15 +88,6 @@ abbr[title] {
   text-decoration: underline dotted; /* 2 */
 }
 
-/**
- * Prevent the duplicate application of `bolder` by the next rule in Safari 6.
- */
-
-b,
-strong {
-  font-weight: inherit;
-}
-
 /**
  * Add the correct font weight in Chrome, Edge, and Safari.
  */
@@ -146,23 +109,6 @@ samp {
   font-size: 1em; /* 2 */
 }
 
-/**
- * Add the correct font style in Android 4.3-.
- */
-
-dfn {
-  font-style: italic;
-}
-
-/**
- * Add the correct background and color in IE 9-.
- */
-
-mark {
-  background-color: #ff0;
-  color: #000;
-}
-
 /**
  * Add the correct font size in all browsers.
  */
@@ -196,44 +142,18 @@ sup {
    ========================================================================== */
 
 /**
- * Add the correct display in IE 9-.
- */
-
-audio,
-video {
-  display: inline-block;
-}
-
-/**
- * Add the correct display in iOS 4-7.
- */
-
-audio:not([controls]) {
-  display: none;
-  height: 0;
-}
-
-/**
- * Remove the border on images inside links in IE 10-.
+ * Remove the border on images inside links in IE 10.
  */
 
 img {
   border-style: none;
 }
 
-/**
- * Hide the overflow in IE.
- */
-
-svg:not(:root) {
-  overflow: hidden;
-}
-
 /* Forms
    ========================================================================== */
 
 /**
- * 1. Change the font styles in all browsers (opinionated).
+ * 1. Change the font styles in all browsers.
  * 2. Remove the margin in Firefox and Safari.
  */
 
@@ -242,7 +162,7 @@ input,
 optgroup,
 select,
 textarea {
-  font-family: sans-serif; /* 1 */
+  font-family: inherit; /* 1 */
   font-size: 100%; /* 1 */
   line-height: 1.15; /* 1 */
   margin: 0; /* 2 */
@@ -269,16 +189,14 @@ select { /* 1 */
 }
 
 /**
- * 1. Prevent a WebKit bug where (2) destroys native `audio` and `video`
- *    controls in Android 4.
- * 2. Correct the inability to style clickable types in iOS and Safari.
+ * Correct the inability to style clickable types in iOS and Safari.
  */
 
 button,
-html [type="button"], /* 1 */
+[type="button"],
 [type="reset"],
 [type="submit"] {
-  -webkit-appearance: button; /* 2 */
+  -webkit-appearance: button;
 }
 
 /**
@@ -329,17 +247,15 @@ legend {
 }
 
 /**
- * 1. Add the correct display in IE 9-.
- * 2. Add the correct vertical alignment in Chrome, Firefox, and Opera.
+ * Add the correct vertical alignment in Chrome, Firefox, and Opera.
  */
 
 progress {
-  display: inline-block; /* 1 */
-  vertical-align: baseline; /* 2 */
+  vertical-align: baseline;
 }
 
 /**
- * Remove the default vertical scrollbar in IE.
+ * Remove the default vertical scrollbar in IE 10+.
  */
 
 textarea {
@@ -347,8 +263,8 @@ textarea {
 }
 
 /**
- * 1. Add the correct box sizing in IE 10-.
- * 2. Remove the padding in IE 10-.
+ * 1. Add the correct box sizing in IE 10.
+ * 2. Remove the padding in IE 10.
  */
 
 [type="checkbox"],
@@ -377,10 +293,9 @@ textarea {
 }
 
 /**
- * Remove the inner padding and cancel buttons in Chrome and Safari on macOS.
+ * Remove the inner padding in Chrome and Safari on macOS.
  */
 
-[type="search"]::-webkit-search-cancel-button,
 [type="search"]::-webkit-search-decoration {
   -webkit-appearance: none;
 }
@@ -399,12 +314,10 @@ textarea {
    ========================================================================== */
 
 /*
- * Add the correct display in IE 9-.
- * 1. Add the correct display in Edge, IE, and Firefox.
+ * Add the correct display in Edge, IE 10+, and Firefox.
  */
 
-details, /* 1 */
-menu {
+details {
   display: block;
 }
 
@@ -416,30 +329,19 @@ summary {
   display: list-item;
 }
 
-/* Scripting
+/* Misc
    ========================================================================== */
 
 /**
- * Add the correct display in IE 9-.
- */
-
-canvas {
-  display: inline-block;
-}
-
-/**
- * Add the correct display in IE.
+ * Add the correct display in IE 10+.
  */
 
 template {
   display: none;
 }
 
-/* Hidden
-   ========================================================================== */
-
 /**
- * Add the correct display in IE 10-.
+ * Add the correct display in IE 10.
  */
 
 [hidden] {

data/app/assets/stylesheets/active_admin/components/_comments.scss

@@ -2,9 +2,9 @@
 .comments {
 
   .active_admin_comment {
-    clear: both;
+    @include clearfix;
     margin-top: 10px;
-    margin-bottom: 40px;
+    margin-bottom: 20px;
     max-width: 700px;
 
     .active_admin_comment_meta {

data/app/assets/stylesheets/active_admin/components/_date_picker.scss

@@ -17,11 +17,10 @@
   }
 
   .ui-datepicker-header {
-    height: 14px;
     @include primary-gradient;
     padding: 12px 5px 7px 4px;
     margin: 0px 0px 2px 2px;
-    width: 147px;
+    width: 156px;
     border-top-left-radius: 7px;
     border-top-right-radius: 7px;
     position: relative;

data/app/assets/stylesheets/active_admin/components/_dropdown_menu.scss

@@ -106,7 +106,6 @@
       li {
         display: block;
         border-bottom: solid 1px #ebebeb;
-        box-sizing: border-box;
 
         a {
           display: block;

data/app/assets/stylesheets/active_admin/mixins/_variables.scss

@@ -5,6 +5,9 @@
 // Images
 $menu-arrow-light-icon-url: 'data:image/png;base64,R0lGODlhBwAEAKIAAL6+vry8vIiIiJWVlf///3t7ewAAAAAAACH5BAEAAAUALAAAAAAHAAQAAAMLWLol80MoF5mQKgEAOw==' !default;
 $menu-arrow-dark-icon-url: 'data:image/png;base64,R0lGODlhBwAEAKIAAG1tbWxsbElJSVBQUP///0JCQgAAAAAAACH5BAEAAAUALAAAAAAHAAQAAAMLWLol80MoF5mQKgEAOw==' !default;
+$menu-arrow-right-light-icon-url: 'data:image/gif;base64,R0lGODlhBAAHAKECAKqqqszMzPkVFfkVFSH+EUNyZWF0ZWQgd2l0aCBHSU1QACH5BAEKAAIALAAAAAAEAAcAAAIJlA0XKbH9nmAFADs=' !default;
+$menu-arrow-right-dark-icon-url: 'data:image/gif;base64,R0lGODlhBAAHAMIEAG1tbWxsbElJSVBQUPkVFfkVFfkVFfkVFSH+EUNyZWF0ZWQgd2l0aCBHSU1QACH5BAEKAAEALAAAAAAEAAcAAAMKGKqy02G8OGeACQA7' !default;
+
 $orderable-icon-url: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAcAAABGCAYAAAAAVo4aAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAH5JREFUeNpi3LhlOwMU1AExGxDXwARYoHQLEFdD2cxAXAliMKFJgEAFEHfBJEHGMKLhMpgkTsAEdch/NNwCk2xCdiEQtML4LEgCf6EubUX3Cgh0oNvJ+P//f7wOGpUclRwYSZb41CyidNbB8giNM+9oXhmVHHm5bJjUSAABBgDKKiwMMUxPwgAAAABJRU5ErkJggg==' !default;
 
 // Colors
@@ -37,3 +40,12 @@ $text-input-horizontal-padding: 10px !default;
 $text-input-total-padding: $text-input-horizontal-padding * 2 + $border-width * 2;
 
 $blank-slate-border: 1px dashed #DADADA !default;
+
+// Sidebar Forms
+$sidebar-inner-content-width: $sidebar-width - ($section-padding * 2);
+
+// Filter Forms
+$filter-field-seperator-width: 12px !default;
+$side-by-side-filter-input-width: ($sidebar-inner-content-width * 0.5) - ($text-input-horizontal-padding * 2) - $filter-field-seperator-width;
+$side-by-side-filter-select-width: ($sidebar-inner-content-width * 0.5) - $filter-field-seperator-width;
+$date-range-filter-input-width: ($sidebar-inner-content-width * 0.5) - ($filter-field-seperator-width * 0.5);

data/app/assets/stylesheets/active_admin/structure/_title_bar.scss

@@ -1,7 +1,6 @@
 #title_bar {
   @include section-header;
   @include clearfix;
-  box-sizing: border-box;
   box-shadow: 0 1px 2px rgba(0, 0, 0, 0.37);
   display: table;
   border-bottom-color: #EEE;

data/app/javascript/active_admin/initializers/has-many.js

@@ -57,7 +57,6 @@ $(function() {
     recompute_positions($(this).closest('.has_many'));
   });
 
-  init_sortable();
   $(document).on('has_many_add:after', '.has_many_container', init_sortable);
 });
 
@@ -93,3 +92,7 @@ var recompute_positions = function(parent){
     }
   });
 };
+
+$(document).
+  ready(init_sortable).
+  on('page:load turbolinks:load', init_sortable);

data/app/javascript/active_admin/initializers/per-page.js

@@ -3,7 +3,7 @@ import PerPage from "../lib/per-page";
 (($) => {
 
   $(document).
-    on('change', '.pagination_per_page > select', function(event) {
+    on('change', '.pagination_per_page > select', function(_event) {
       PerPage._jQueryInterface.call($(this), 'update')
     });
 

data/app/javascript/active_admin/lib/checkbox-toggler.js

@@ -6,7 +6,7 @@ class CheckboxToggler {
     this._bind();
   }
 
-  option(key, value) {
+  option(_key, _value) {
   }
 
   _init() {
@@ -30,7 +30,7 @@ class CheckboxToggler {
     this.toggle_all_checkbox.change(() => this._didChangeToggleAllCheckbox());
   }
 
-  _didChangeCheckbox(checkbox){
+  _didChangeCheckbox(_checkbox){
     const numChecked = this.checkboxes.filter(':checked').length;
 
     const allChecked = numChecked === this.checkboxes.length;
@@ -44,6 +44,6 @@ class CheckboxToggler {
     this.checkboxes.prop({ checked: setting });
     return setting;
   }
-};
+}
 
 export default CheckboxToggler;

data/app/javascript/active_admin/lib/dropdown-menu.js

@@ -111,6 +111,6 @@ class DropdownMenu {
       this.$nipple.css('left', menu_center - nipple_center);
     }
   }
-};
+}
 
 export default DropdownMenu;

data/app/javascript/active_admin/lib/modal-dialog.js

@@ -1,14 +1,14 @@
 function ModalDialog(message, inputs, callback){
   let html = `<form id="dialog_confirm" title="${message}"><ul>`;
   for (let name in inputs) {
-    var elem, opts, wrapper;
+    var opts, wrapper;
     let type = inputs[name];
     if (/^(datepicker|checkbox|text|number)$/.test(type)) {
       wrapper = 'input';
     } else if (type === 'textarea') {
       wrapper = 'textarea';
     } else if ($.isArray(type)) {
-      [wrapper, elem, opts, type] = ['select', 'option', type, ''];
+      [wrapper, opts, type] = ['select', type, ''];
     } else {
       throw new Error(`Unsupported input type: {${name}: ${type}}`);
     }
@@ -21,20 +21,20 @@ function ModalDialog(message, inputs, callback){
           const result = [];
 
           opts.forEach(v => {
-            const $elem = $(`<${elem}/>`);
+            const $elem = $('<option></option>');
             if ($.isArray(v)) {
               $elem.text(v[0]).val(v[1]);
             } else {
               $elem.text(v);
             }
-            result.push($elem.wrap('<div>').parent().html());
+            result.push($elem.wrap('<div></div>').parent().html());
           });
 
           return result;
         })()).join('') : '') +
       `</${wrapper}>` +
     "</li>";
-    [wrapper, elem, opts, type, klass] = []; // unset any temporary variables
+    [wrapper, opts, type, klass] = []; // unset any temporary variables
   }
 
   html += "</ul></form>";
@@ -44,7 +44,7 @@ function ModalDialog(message, inputs, callback){
 
   form.dialog({
     modal: true,
-    open(event, ui) {
+    open(_event, _ui) {
       $('body').trigger('modal_dialog:after_open', [form]);
     },
     dialogClass: 'active_admin_dialog',
@@ -58,6 +58,6 @@ function ModalDialog(message, inputs, callback){
       }
     }
   });
-};
+}
 
 export default ModalDialog;

data/app/javascript/active_admin/lib/per-page.js

@@ -33,6 +33,6 @@ class PerPage {
       }
     })
   }
-};
+}
 
 export default PerPage;