activeadmin_blaze_theme 0.5.14 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68d7d7b562bdffd55efd278288f3391cae039c58cfb277c87918e39f86e6d9db
-  data.tar.gz: 49e68e847645f14004ca6d9405fc1adc84a959611b3c9d7062856de196d0b49c
+  metadata.gz: e4b53242af49f31d662d0c774b78cad40d87ad563c771ce174b8ca8866d1b539
+  data.tar.gz: f6b941ff7872c51db2d6c47e5117420d0e5f8e611ca897f7e4db88e61a398e97
 SHA512:
-  metadata.gz: a4ab0ae384a9b3787b09244c794aa4ef4ce0e3a93753983028bb7835f591eb7b4664be9264c65c09c622686093a30c0c3bb74d0c13a44b91cfbc6ffb84c39e2f
-  data.tar.gz: '09b8619df3a899802d293ce7ae36ef6c029507e80a188b7a46bf5ba36bce76c2454ec2817280d6e22ab5d154effbb371ac0889d61378024b199e7a55dc3d6b6a'
+  metadata.gz: 0cd32f3785b930a07522b2ee62bde86e3ce57e75b4e881ddd8c84ae2125871b0cc8d1a0f9ec76bc8549471296f2bb28ca9e489b19eae7bfa54c48eb89bdbf163
+  data.tar.gz: 6b79a90746b9365553acf87aa98735d8fe24243cd17385f041863ef767be6ea770bdc681c214e311cdf4a6c3977dd80059b7b600558bded86fff49e4174d4c0a

data/.github/workflows/specs.yml

@@ -0,0 +1,26 @@
+name: Specs
+
+on:
+  push:
+    branches: [master]
+  pull_request:
+    branches: [master]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        ruby: ['2.5', '2.6', '2.7']
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+      - name: Run tests
+        run: bundle exec rake

data/.gitignore

@@ -1,4 +1,13 @@
-_misc/
-Gemfile.lock
+*.gem
 *.orig
 
+/.rspec_failures
+/.rubocop-*
+/Gemfile.lock
+
+/_misc/
+/coverage/
+/spec/dummy/db/*.sqlite3*
+/spec/dummy/log/
+/spec/dummy/storage/
+/spec/dummy/tmp/

data/.rspec

@@ -0,0 +1,2 @@
+--require rails_helper
+--format documentation

data/.rubocop.yml

@@ -0,0 +1,27 @@
+inherit_from:
+  - https://relaxed.ruby.style/rubocop.yml
+
+AllCops:
+  Exclude:
+    - bin/*
+    - spec/dummy/**/*
+  NewCops: enable
+
+Gemspec/RequiredRubyVersion:
+  Enabled: false
+
+Naming/FileName:
+  Enabled: false
+
+Layout/LineLength:
+  Enabled: true
+  Max: 120
+
+Style/HashEachMethods:
+  Enabled: true
+
+Style/HashTransformKeys:
+  Enabled: true
+
+Style/HashTransformValues:
+  Enabled: true

data/Gemfile

@@ -1,3 +1,18 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 gemspec
+
+gem 'pry-rails'
+
+gem 'activestorage', '~> 6.0'
+gem 'capybara', '~> 3.33'
+gem 'puma', '~> 4.3'
+gem 'rspec-rails'
+gem 'rspec_junit_formatter', '~> 0.4'
+gem 'rubocop', '~> 1.0'
+gem 'sassc', '~> 2.4'
+gem 'selenium-webdriver', '~> 3.142'
+gem 'sprockets-rails', '~> 3.2'
+gem 'sqlite3', '~> 1.4'

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2017 Mattia Roccoberton
+Copyright (c) 2020 Mattia Roccoberton
 
 MIT License
 

data/README.md

@@ -1,57 +1,89 @@
-# Active Admin Blaze Theme [![Gem Version](https://badge.fury.io/rb/activeadmin_blaze_theme.svg)](https://badge.fury.io/rb/activeadmin_blaze_theme)
+# Active Admin Blaze Theme [![Gem Version](https://badge.fury.io/rb/activeadmin_blaze_theme.svg)](https://badge.fury.io/rb/activeadmin_blaze_theme) [![Specs](https://github.com/blocknotes/activeadmin_blaze_theme/actions/workflows/specs.yml/badge.svg)](https://github.com/blocknotes/activeadmin_blaze_theme/actions/workflows/specs.yml)
 
-A theme for Active Admin using [Blaze CSS](http://blazecss.com/).
+A theme for Active Admin using [Blaze CSS](http://blazecss.com) 3.x
 
 Features:
+
 - CSS only theme with clean UI
 - compact nested forms
 - [customizable](#customize) options: colors, sidebar position, squared style, scroll on cells
 - custom controls / components: [toggle](#toggle), [Sidebar menu](#sidebar-menu), [Accordion](#accordion), [Readonly field](#readonly-field), [Styled table](#styled-table)
 - Blaze CSS [widgets](#blaze-widgets)
 
+See some [screenshots](#screenshots).
+
 ## Install
-- Add to your Gemfile: `gem 'activeadmin_blaze_theme'`
-- Execute bundle
-- Add at the end of your Active Admin styles (_app/assets/stylesheets/active_admin.scss_): `@import "activeadmin_blaze_theme/theme";`
+
+First, add to your Gemfile: `gem 'activeadmin_blaze_theme'` (and execute `bundle`)
+
+Then, if you installed Active Admin **without Webpacker** support (so using Sprockets):
+
+- Add at the end of your Active Admin styles (_app/assets/stylesheets/active_admin.scss_):
+
+```scss
+@import "activeadmin_blaze_theme/theme";
+```
+
+Otherwise, **with Webpacker**:
+
+- Add the component to the _package.json_: `yarn add blocknotes/activeadmin_blaze_theme`
+- Add at the end of your Active Admin javascript pack (_app/javascript/packs/active_admin.js_):
+
+```js
+require('activeadmin_blaze_theme');
+```
+
+- Another option is appending to _app/javascript/stylesheets/active_admin.scss_ (in this case the JS require line is not needed):
+
+```scss
+// ...
+// optionally add custom colors variables here
+@import "~activeadmin_blaze_theme/app/assets/stylesheets/activeadmin_blaze_theme/theme";
+```
+
+- Sometimes it could be necessary to remove the _node_modules_ path and recreate it (using `yarn install --check-files`) or to clean the tmp path: `bin/rails tmp:clear`
 
 ## Customize
-- To change colors add before your Active Admin styles (_app/assets/stylesheets/active_admin.scss_):
 
-```css
+- Colors customization is available using some Sass variables;
+- With Sprockets: you need to update your Active Admin styles (before **activeadmin_blaze_theme/theme** import line);
+- With Webpacker: you need to import the theme using the Sass/Scss option as described above.
+
+```scss
 // blaze colors
-$color-brand: #2C3E50;
+$color-brand: #2c3e50;
 $color-info: #4dabf5;
 $color-warning: #ff9800;
 $color-success: #4caf50;
 $color-error: #f44336;
 // main variables
-$bg-footer: #dfdfdf !default;               // bg footer bar
-$bg-form1: #f4f4f4 !default;                // bg 1st level forms
-$bg-form2: darken($bg-form1, 3%) !default;  // bg 2nd level forms (nested)
-$bg-form3: darken($bg-form1, 6%) !default;  // bg 3rd level forms (nested)
-$bg-form4: darken($bg-form1, 9%) !default;  // bg 4th level forms (nested)
-$bg-form-sub-headings: lighten( $color-brand, 64% ) !default;  // bg nested forms title
-$bg-header: $color-brand !default;          // bg header bar
-$bg-inputs: #fff !default;                  // bg forms inputs
-$bg-menu-active: #7b929e !default;          // bg menu item current / hover
-$bg-sidebar: #efefef;                       // bg sidebar
-$fg-box-title: #fff !default;
-$fg-button-link: #fff !default;
-$fg-menu-items: #f8f8f8 !default;
-$fg-table-borders: #e4e4e4 !default;
-$fg-table-link: #eee !default;
+$bg-footer: #dfdfdf;               // bg footer bar
+$bg-form1: #f4f4f4;                // bg 1st level forms
+$bg-form2: darken($bg-form1, 3%);  // bg 2nd level forms (nested)
+$bg-form3: darken($bg-form1, 6%);  // bg 3rd level forms (nested)
+$bg-form4: darken($bg-form1, 9%);  // bg 4th level forms (nested)
+$bg-form-sub-headings: lighten($color-brand, 64%);  // bg nested forms title
+$bg-header: $color-brand;          // bg header bar
+$bg-inputs: #fff;                  // bg forms inputs
+$bg-menu-active: #7b929e;          // bg menu item current / hover
+$bg-sidebar: #efefef;              // bg sidebar
+$fg-box-title: #fff;
+$fg-button-link: #fff;
+$fg-menu-items: #f8f8f8;
+$fg-table-borders: #e4e4e4;
+$fg-table-link: #eee;
 // other variables
-$form-padding: 10px !default;
-$inputs-spacing: 10px !default;
-$height-inputs: 26px !default;
-$height-topbar: 40px !default;
-$height-titlebar: 38px !default;
-$text-shadow: #000 !default;
+$form-padding: 10px;
+$inputs-spacing: 10px;
+$height-inputs: 26px;
+$height-topbar: 40px;
+$height-titlebar: 38px;
+$text-shadow: #000;
 ```
 
 - To move sidebar on the left add to your Active Admin styles (after blaze theme import):
 
-```css
+```scss
 #active_admin_content.with_sidebar {
   @extend .sidebar_left;
 }
@@ -59,7 +91,7 @@ $text-shadow: #000 !default;
 
 - Squared style (no rounded borders):
 
-```css
+```scss
 #active_admin_content, .active_admin #title_bar {
   @extend .no_rounded;
 }
@@ -67,14 +99,14 @@ $text-shadow: #000 !default;
 
 - More options:
 
-```css
+```scss
 // scrollable table cells
 body.active_admin .index_content table {
   @extend .scrollable_cells;
 }
 ```
 
-```css
+```scss
 // fix ckeditor width
 body.active_admin .cke {
   @extend .ckeditor_width_fix
@@ -84,24 +116,32 @@ body.active_admin .cke {
 ## Custom fields / components
 
 ### Toggle
+
 In *form* \ *inputs* block:
 
-`f.input :boolean, as: :blaze_toggle`
+```ruby
+f.input :boolean, as: :blaze_toggle
+```
 
 To change toggle color:
 
-`f.input :boolean, as: :blaze_toggle, input_html: { toggle_class: 'c-toggle--brand' }`
+```ruby
+f.input :boolean, as: :blaze_toggle, input_html: { toggle_class: 'c-toggle--brand' }
+```
 
 Available: `c-toggle--brand, c-toggle--info, c-toggle--warning, c-toggle--success, c-toggle--error`
 
 Standard checkbox with label on the left:
 
-`f.input :boolean, as: :blaze_toggle, input_html: { simple_checkbox: true }`
+```ruby
+f.input :boolean, as: :blaze_toggle, input_html: { simple_checkbox: true }
+```
 
 ### Sidebar menu
+
 A sidebar menu (*priority* option permit to put the sidebar above the filters):
 
-```rb
+```ruby
 sidebar :help, priority: 0 do
   ul class: 'blaze-menu' do
     li do
@@ -117,12 +157,11 @@ sidebar :help, priority: 0 do
 end
 ```
 
-![menu](extra/screenshot4.jpg)
-
 ### Accordion
+
 An accordion group in a form:
 
-```rb
+```ruby
 f.accordion_group do
   f.accordion 'First accordion' do
     f.inputs for: [:detail, f.object.detail || Detail.new] do |f2|
@@ -140,15 +179,24 @@ end
 ```
 
 ### Readonly field
+
 Some readonly fields in a form:
 
-`f.readonly :position`
+```ruby
+f.readonly :position
+```
 
-`f.readonly :position, f.object.position * 2`
+```ruby
+f.readonly :position, f.object.position * 2
+```
 
-`f.readonly 'Code', 'Automatically set after save', class: 'a-wrapper-class'`
+```ruby
+f.readonly 'Code', 'Automatically set after save', class: 'a-wrapper-class'
+```
 
-`f.readonly nil, 'Value only, no label'`
+```ruby
+f.readonly nil, 'Value only, no label'
+```
 
 ### Styled table
 Table styles:
@@ -160,6 +208,7 @@ end
 ```
 
 ## Blaze widgets
+
 See components available in Blaze CSS [docs](http://blazecss.com/components/buttons/).
 
 Badge example:
@@ -183,28 +232,27 @@ end
 ```
 
 ## Notes
+
 - To use this plugins with Active Admin 1.x please use the version [0.5.12](https://github.com/blocknotes/activeadmin_blaze_theme/releases/tag/v0.5.12)
 
 ## Screenshots
-Index:
 
-![index](extra/screenshot1.jpg)
+Index:
+![index](extra/index.png)
 
 Edit:
-
-![edit](extra/screenshot2.jpg)
-
-Show - sidebar on the left:
-
-![edit](extra/screenshot3.jpg)
+![edit](extra/edit.png)
 
 ## Do you like it? Star it!
-If you use this component just star it. A developer is more motivated to improve a project when there is some interest.
 
-Take a look at [other ActiveAdmin components](https://github.com/blocknotes?utf8=✓&tab=repositories&q=activeadmin&type=source) that I made if you are curious.
+If you use this component just star it. A developer is more motivated to improve a project when there is some interest. My other [Active Admin components](https://github.com/blocknotes?utf8=✓&tab=repositories&q=activeadmin&type=source).
+
+Or consider offering me a coffee, it's a small thing but it is greatly appreciated: [about me](https://www.blocknot.es/about-me).
 
 ## Contributors
+
 - [Mattia Roccoberton](http://blocknot.es): author
 
 ## License
+
 The gem is available as open-source under the terms of the [MIT](LICENSE.txt).

data/Rakefile

@@ -1,2 +1,16 @@
-require "bundler/gem_tasks"
+# frozen_string_literal: true
 
+require 'bundler/gem_tasks'
+
+begin
+  require 'rspec/core/rake_task'
+
+  RSpec::Core::RakeTask.new(:spec) do |t|
+    # t.ruby_opts = %w[-w]
+    t.rspec_opts = ['--color', '--format documentation']
+  end
+
+  task default: :spec
+rescue LoadError
+  puts '! LoadError: no RSpec available'
+end

data/activeadmin_blaze_theme.gemspec

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'activeadmin_blaze_theme/version'
 
@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ['Mattia Roccoberton']
   spec.email         = ['mat@blocknot.es']
   spec.summary       = 'ActiveAdmin Blaze Theme'
-  spec.description   = 'An ActiveAdmin theme which use Blaze CSS UI toolkit'
+  spec.description   = 'An ActiveAdmin theme based on Blaze CSS UI toolkit'
   spec.homepage      = 'https://github.com/blocknotes/activeadmin_blaze_theme'
   spec.license       = 'MIT'
 
@@ -20,14 +20,4 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_runtime_dependency 'activeadmin', '~> 2.0'
-
-  spec.add_development_dependency 'activestorage', '~> 6.0.3.2'
-  spec.add_development_dependency 'capybara', '~> 3.33.0'
-  spec.add_development_dependency 'pry', '~> 0.13.1'
-  spec.add_development_dependency 'puma', '~> 4.3.5'
-  spec.add_development_dependency 'rspec_junit_formatter', '~> 0.4.1'
-  spec.add_development_dependency 'rspec-rails', '~> 4.0.1'
-  spec.add_development_dependency 'rubocop', '~> 0.90.0'
-  spec.add_development_dependency 'selenium-webdriver', '~> 3.142.7'
-  spec.add_development_dependency 'sqlite3', '~> 1.4.2'
 end

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

@@ -0,0 +1,197 @@
+body.active_admin {
+  font-family: 'Roboto', sans-serif;
+  font-size: 12px;
+  min-height: 100vh;
+
+  .button-base {
+    @extend .c-button;
+
+    background-image: none;
+    box-shadow: initial;
+    color: #f4f4f4;
+    text-shadow: $text-shadow 0 1px 0;
+  }
+  .c-input-group .c-button:not(:first-child) {
+    border-left: 1px solid #ddd;
+  }
+
+  // misc
+  a.member_link {
+    color: #f4f4f4;
+    text-decoration: none;
+  }
+  .download_links {
+    padding-bottom: 10px;
+
+    >a {
+      @extend .c-button;
+      @extend .c-button--info;
+      @extend .u-small;
+    }
+  }
+  .ui-datepicker {
+    > .ui-datepicker-header {
+      border-bottom: 0 none;
+      border-radius: 0;
+      height: auto;
+      margin: 0;
+      padding: 8px 10px;
+      width: 100%;
+    }
+    .ui-datepicker-calendar th {
+      padding: 3px 0;
+    }
+    > .ui-datepicker-calendar {
+      left: 0;
+      width: 100%;
+      a {
+        text-decoration: none;
+      }
+    }
+  }
+
+  // comments
+  .comments {
+    .actions {
+      padding: 0;
+    }
+
+    .inputs >ol {
+      background-color: transparent;
+    }
+
+    .pagination_information {
+      float: none;
+    }
+  }
+
+  // boolean values
+  .status_tag {
+    min-width: 30px;
+    display: inline-block;
+    text-align: center;
+    &.no {
+      background-color: $color-error;
+    }
+    &.yes {
+      background-color: $color-success;
+    }
+  }
+
+  // dialogs
+  .ui-dialog {
+    button.ui-button {
+      @extend .button-base;
+      margin-right: 10px;
+      &:hover, &.ui-widget:hover {
+        background-color: #aaa;
+        background-image: none;
+      }
+      &.ui-dialog-titlebar-close {
+        // display: none;  // hides close button
+        margin-right: 0;
+      }
+    }
+    .ui-dialog-content {
+      min-height: auto;
+    }
+    .ui-dialog-titlebar {
+      display: flex;
+      justify-content: space-between;
+      > * {
+        align-self: center
+      }
+    }
+    // .ui-dialog-buttonset {
+    //   text-align: right;
+    // }
+  }
+
+  // special components
+  .filter_form .select-one-inputs {
+    display: flex;
+    >input[type="text"], >select {
+      width: 49%;
+    }
+    >input[type="text"] {
+      margin: 0 1% 0 0;
+    }
+    select {
+      margin: 0 0 0 1%;
+    }
+  }
+  .selectize.input > .selectize-control > .selectize-input {
+    padding-left: 4px;
+    padding-top: 3px;
+  }
+
+  // optional customizations
+  .compact_titlebar {
+    white-space: initial;
+  }
+  .sidebar_left {
+    #main_content_wrapper {
+      order: 2;
+      width: calc( 100% - 270px );
+      #main_content {
+        width: 100%;
+      }
+    }
+    #sidebar {
+      order: 1;
+      margin-left: 0;
+    }
+  }
+  table.scrollable_cells {
+    th, td {
+      max-width: 200px;
+      overflow: scroll;
+    }
+  }
+  .ckeditor_width_fix {
+    display: inline-block;
+    min-width: 450px;
+    width: auto;
+    // width: calc(80% - 22px);
+  }
+  .no_rounded {
+    *, .action_items span.action_item > a, .panel {
+      border-radius: 0;
+    }
+  }
+
+  // menu
+  .blaze-menu {
+    @extend .c-card;
+    @extend .c-card--menu;
+    @extend .u-high;
+    li {
+      @extend .c-card__item;
+      padding: 0;
+      a {
+        display: block;
+        padding: 0.5em;
+        text-decoration: none;
+      }
+    }
+  }
+  .sidebar_section .blaze-menu {
+    margin-bottom: 4px;
+  }
+
+  // textarea comments
+  #active_admin_comment_body {
+    width: 100%;
+  }
+
+  // misc
+  #active_admin_content.without_sidebar #main_content_wrapper #main_content {
+    width: 100%;
+  }
+  #wrapper {
+    display: block;
+    min-height: 100vh;
+    padding-bottom: 40px;  // footer height
+    position: relative;
+  }
+}