arctic_admin 4.0.0.alpha → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d80f79149e44a52c1d586e425e82313f2d83aea8455d59eaba12a72fb94abc30
-  data.tar.gz: ff9b250756327bb54eb0ee374d4cacb0a9cb7b6090da861ee85beceda2534f62
+  metadata.gz: 4f527d7e2caa4c8209125ef8b4e0819d9dfac5056622e62fbb78f2bfc7950028
+  data.tar.gz: c137632694ed36dc983279e9e161b2415d4100b7c6daef0bcc8353f7d7514a4f
 SHA512:
-  metadata.gz: 6844d6c0fbd22ce592aa64c9f5f27e93033564f44bd7856a3e9d2f3f0ab52ffb5c8a44c106ec9eac85e7dd50c6213649930bfa303a451b4ea867405bc9ded0fd
-  data.tar.gz: 159bce7c3570d89754af6964c035497b6adbc0a87f6f709a06fa556c4ddfdd924a48866518336e6424a81cd0efa6ae87df472c3e9f8442d10bf4ef846bb62548
+  metadata.gz: 81d7c39c6fc5201af8f6543dc8033d642782489bcca767a6da9ab1badc108f546e34d9260750e1c4d46bc67dc938c84e393b4b930f1ba00915a7d49654c061a9
+  data.tar.gz: ab34c1df077f84627182680c0686986204c0636ea4d0e668ea9921c17136088b652933e388b90c504081be9b35e642ae72057362ac1a93a43d724cd3b82c9cb1

data/{Readme.md → README.md}

@@ -14,6 +14,8 @@ Simple theme for ActiveAdmin :ok_hand:
 
 ## Installation
 
+### For Sprockets users
+
 - Add this to your Gemfile:
 
 ```ruby
@@ -30,9 +32,17 @@ config.meta_tags = meta_tags_options
 config.meta_tags_for_logged_out_pages = meta_tags_options
 ```
 
-## Usage
+### For webpacker / jsbundling-rails or other JS-based asset solutions
+
+Install the needed assets with npm or yarn:
+
+```bash
+yarn add arctic_admin @fortawesome/fontawesome-free
+```
+
+## Use with Sprockets
 
-### CSS
+### 1a - CSS
 
 In your `active_admin.css`, include the css file:
 
@@ -46,7 +56,7 @@ In your `active_admin.css`, include the css file:
 
 Then restart your webserver if it was previously running.
 
-### Sass Support
+### 1b - Sass Support
 
 :exclamation: **Remove the line `@import "active_admin/base"`**
 
@@ -65,7 +75,7 @@ add this to your `active_admin.sass` file:
 @import arctic_admin/base
 ```
 
-### JS
+### 2 - JS
 
 In your `active_admin.js`, include the js file:
 
@@ -77,16 +87,7 @@ In your `active_admin.js`, include the js file:
 
 ## Use with webpacker
 
-### 1 - Preparation
-
-Install the assets from npm or yarn
-
-```
-yarn add arctic_admin
-```
-
-
-### 2 - CSS
+### 1 - CSS
 
 In your `app/javascript/stylesheets/active_admin.scss`, add the line:
 
@@ -101,28 +102,26 @@ Remove:
 @import "~@activeadmin/activeadmin/src/scss/base";
 ```
 
-### 3 - JS
+### 2 - JS
 
-In your `app/javascript/packs/active_admin.js`, add the line:
+Search for `app/javascript/packs/active_admin.js` in your rails project and add the following lines:  
 
 ```js
+import "@fortawesome/fontawesome-free/css/all.css";
 import 'arctic_admin'
 ```
 
 
 ### Customization
 
-For this, you need to use sass to custom the theme.
+For this, you need to use SASS to customize the theming.
 
-You can even change basic color of the theme by placing some other variables:
-
-If you use the [SCSS](http://sass-lang.com/documentation/file.SASS_REFERENCE.html), add this to your
-`active_admin.scss` file:
+Right now you can change the primary color of the theme by placing the following variable in your `active_admin.scss` file:
 
 ```scss
 $primary-color: #2dbb43;
 
-@import "arctic_admin/base";
+@import "~arctic_admin/src/scss/main";
 ```
 
 If you use the
@@ -132,7 +131,7 @@ add this to your `active_admin.sass` file:
 ```sass
 $primary-color: #2dbb43
 
-@import arctic_admin/base
+@import ~arctic_admin/src/scss/main
 ```
 
 Then restart your webserver if it was previously running.

data/app/assets/javascripts/arctic_admin/main.js

@@ -5,7 +5,7 @@ document.addEventListener('DOMContentLoaded', () => {
   if (sidebar) {
     sidebar.addEventListener('click', event => {
       const insideSection = document.querySelector('#filters_sidebar_section')
-      if (!(event.target === insideSection || insideSection.contains(event.target))) {
+      if (!(event.target === insideSection || insideSection.contains(event.target)) && event.target.className != "select2-selection__choice__remove") {
         sidebar.classList.toggle('sidebar_open')
       }
     })
@@ -39,12 +39,14 @@ document.addEventListener('DOMContentLoaded', () => {
   })
 
   // toggle of nested menu items
-  const nestedMenuItem = document.querySelector('#tabs .has_nested')
-  if (nestedMenuItem) {
-    nestedMenuItem.addEventListener('click', (e) => {
-      e.stopPropagation()
-      nestedMenuItem.classList.toggle('open')
-    })
-  }
+  const nestedMenuItems = document.querySelectorAll('#tabs .has_nested')
+  nestedMenuItems.forEach(
+    (nestedMenuItem) => {
+      nestedMenuItem.addEventListener('click', (e) => {
+        e.stopPropagation()
+        nestedMenuItem.classList.toggle('open')
+      })
+    }
+  )
 
 })

data/app/assets/stylesheets/arctic_admin/components/_inputs.scss

@@ -62,7 +62,7 @@ input[type="checkbox"] {
 
   &:checked {
     border-color: $primary-color;
-    background-color: $primary-color;
+    background-color: $primary-color !important;
   }
 }
 

data/app/assets/stylesheets/arctic_admin/components/_select2.scss

@@ -34,7 +34,7 @@
 }
 
 .select2-container--default .select2-results__option[aria-selected=true]{
-  background_color: $body-background;
+  background-color: $body-background;
 }
 
 .select2-search--dropdown .select2-search__field{
@@ -47,4 +47,4 @@
 
 .select2-results__option{
   padding-left: 12px;
-}
+}

data/app/assets/stylesheets/arctic_admin/components/_tables.scss

@@ -39,12 +39,6 @@ thead th {
 }
 
 tbody tr {
-  border: 1px solid $border-color;
-
-  &:hover {
-    background-color: rgba(228, 234, 236, 0.3);
-  }
-
   th {
     font-size: $font-size;
   }
@@ -64,3 +58,14 @@ tbody tr {
     }
   }
 }
+
+// style only for table
+.index_as_table {
+  tbody tr {
+    border: 1px solid $border-color;
+
+    &:hover {
+      background-color: rgba(228, 234, 236, 0.3);
+    }
+  }
+}

data/app/assets/stylesheets/arctic_admin/layouts/_sidebar.scss

@@ -101,7 +101,7 @@
           }
         }
 
-        ul {
+        & > ul {
           display: block;
         }
       }

data/app/assets/stylesheets/arctic_admin/mixins/_buttons_mixins.scss

@@ -37,6 +37,7 @@
   background-color: #fff;
   color: $color;
   border: 1px solid $color;
+  padding: 4px 8px;
   @include button();
 
   &:hover {
@@ -117,4 +118,4 @@
 
 @mixin little-button() {
   padding: 6px 12px;
-}
+}

data/app/assets/stylesheets/arctic_admin/pages/_index.scss

@@ -1,3 +1,5 @@
+@use "sass:math";
+
 body.index {
 
   .resource_selection_toggle_cell, .resource_selection_cell {
@@ -39,6 +41,22 @@ body.index {
       position: absolute;
       z-index: 1;
     }
+
+    .indexes.table_tools_segmented_control {
+      display: flex;
+      justify-content: right;
+
+      a {
+        @include secondary-button($primary-color);
+      }
+
+      .index {
+        margin-right: 4px;
+        &:last-child {
+          margin-right: 0;
+        }
+      }
+    }
   }
 
   .paginated_collection_contents {
@@ -62,7 +80,7 @@ body.index {
       @include transform(translateY(-50%));
 
       @media screen and (min-width: $md-width) {
-        font-size: $font-size/1;
+        // font-size: math.div($font-size, 1px);
       }
     }
 
@@ -89,6 +107,10 @@ body.index {
   .scopes {
     .scope {
       @include group-button($primary-color);
+
+      a {
+        margin-right: .25rem;
+      }
     }
   }
 

data/lib/arctic_admin/version.rb

@@ -1,3 +1,3 @@
 module ArcticAdmin
-  VERSION = "4.0.0.alpha"
+  VERSION = "4.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arctic_admin
 version: !ruby/object:Gem::Version
-  version: 4.0.0.alpha
+  version: 4.1.0
 platform: ruby
 authors:
 - Clément Prod'homme
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-01 00:00:00.000000000 Z
+date: 2023-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -79,7 +79,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - LICENCE.txt
-- Readme.md
+- README.md
 - app/assets/fonts/Lato-Bold.eot
 - app/assets/fonts/Lato-Bold.ttf
 - app/assets/fonts/Lato-Bold.woff
@@ -154,11 +154,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: Arctic Admin theme for ActiveAdmin