activeadmin 2.12.0 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8fee30bf6175502c7e29f5cba45777a52fd9d72f9433f7f3911ba324a24638ef
-  data.tar.gz: 8ad44b1980960d2e8abb3f1406f90c3a0cd01255f0fcb30b6a56bf3cb8db1ab6
+  metadata.gz: e080845beb483b8364c49bb199ac8b4ba61975854316d053df39b39208d863bf
+  data.tar.gz: c30bcfde594fb30c2a8796741451f245b77ddeaa66c6a66ecbfbcbec3064918a
 SHA512:
-  metadata.gz: 39beb44c14375cec330f99a1d63d38959523a0bbbcf90e55f6b938a71a8d2624b9f8fdb110839b7272b346acdd533bc3f0fcd3a78ca3c3250bf401c807fb4b13
-  data.tar.gz: 9b4d5fb6d6d2238925e315c639bb6625703102d111c482399eb79b02cd6f203f7145770c2985795c2a3f60f6822f2757efe1e5c57a8c4ede3716e023e2efc50e
+  metadata.gz: fe64d783c2ac39dbbc74df16985dabcbee5e300039f8b703df6ccedf7dee24dcda09dd59b154383ba0dc593310f163dd6ca51af5f59d26b11646683158eeae4a
+  data.tar.gz: f4e988b7bf89e2cb291822c62d891d958ec48400e3ccee31fc2480b47ee1c8ab80608c939abb80733378c2f27a245044d1f89c68fe04c8fd850264df072ae8d1

data/CHANGELOG.md

@@ -2,6 +2,165 @@
 
 ## Unreleased
 
+## 3.3.0 [☰](https://github.com/activeadmin/activeadmin/compare/v3.2.5..v3.3.0)
+
+### Enhancements
+
+* Improve v3 docs regarding compatibility with vite_rails [#8548] by [@mattbrictson]
+* Backport test against Rails 8.0 [#8556] by [@mgrunberg] and [@tagliala]
+* Test against Ruby 3.4 [#8614] by [@tagliala]
+* Backport Support sortable argument in id_column [#8650] by [@jaynetics]
+* Backport Support title for id_column [#8652] by [@mgrunberg]
+
+### Bug Fixes
+
+* Backport Fix attributes passed to form has_many not being set on new record form items [#8551] by [@Fs00]
+* Backport Fix deprecation warning in Ruby 3.4 [#8596] by [@tagliala]
+* Backport Fix circular require warning in belongs_to.rb [#8601] by [@tagliala]
+
+## 3.2.5 [☰](https://github.com/activeadmin/activeadmin/compare/v3.2.4..v3.2.5)
+
+### Enhancements
+
+* Backport Add favicon to template app to fix Rails 7.2 test suite run [#8468] by [@mgrunberg]
+* Backport Use attribute_types instead of columns_hash to determine type [#8469] by [@mgrunberg]
+* Backport Optimize count query for pagination_total: false option [#8470] by [@mgrunberg]
+
+### Bug Fixes
+
+* Restore inner span tag to form inputs legend [#8467] by [@denisahearn]
+
+## 3.2.4 [☰](https://github.com/activeadmin/activeadmin/compare/v3.2.3..v3.2.4)
+
+### Enhancements
+
+* Test against Rails 7.2 [#8434] by [@mgrunberg]
+
+### Bug Fixes
+
+* Backport Improve form f.inputs attributes rendering [#8446] by [@amiel]
+
+## 3.2.3 [☰](https://github.com/activeadmin/activeadmin/compare/v3.2.2..v3.2.3)
+
+### Enhancements
+
+* Backport better implementation of counter-cache-column check [#8412] by [@plashchynski]
+
+### Bug Fixes
+
+* Remove deprecation warnings when building with dart sass >= 1.77.7 [#8405] by [@mgrunberg]
+
+## 3.2.2 [☰](https://github.com/activeadmin/activeadmin/compare/v3.2.1..v3.2.2)
+
+### Security Fixes
+
+* Backport Fix potential XSS issue when rendering form legends [#8349] by
+  [@deivid-rodriguez]
+
+### Enhancements
+
+* Update vendored jQuery UI to 1.13.3 [#8329] by [@tagliala]
+
+## 3.2.1 [☰](https://github.com/activeadmin/activeadmin/compare/v3.2.0..v3.2.1)
+
+### Enhancements
+
+* Backport Suppress ruby 3.3 warning [#8310] by [@mgrunberg]
+* Backport Recommend using target="_blank" instead of target="blank" [#8311] by [@mgrunberg]
+
+## 3.2.0 [☰](https://github.com/activeadmin/activeadmin/compare/v3.1.0..v3.2.0)
+
+### Security Fixes
+
+* Backport protect against CSV Injection. [#8167] by [@mgrunberg]
+
+### Enhancements
+
+* Backport support citext column type in string filter. [#8165] by [@mgrunberg]
+* Backport provide detail in DB statement timeout error for filters. [#8163] by [@mgrunberg]
+
+### Bug Fixes
+
+* Backport make sure menu creation does not modify menu options. [#8166] by [@mgrunberg]
+* Backport ransack error with filters when ActiveStorage is used. [#8164] by [@mgrunberg]
+
+## 3.1.0 [☰](https://github.com/activeadmin/activeadmin/compare/v3.0.0..v3.1.0)
+
+### Enhancements
+
+* Support Rails 7.1. [#8102] by [@mgrunberg]
+* Remove deprecated usage of ActiveSupport::Deprecation singleton. [#8106] by [@mgrunberg]
+* Replace to_formatted_s with to_s to convert date to string. [#8105] by [@mgrunberg]
+* Remove upper bound dependency limits from gemspec. [#8098] by [@javierjulio]
+
+## 3.0.0 [☰](https://github.com/activeadmin/activeadmin/compare/v2.14.0..v3.0.0)
+
+### Breaking Changes
+
+* Remove custom Ransack predicates that were MetaSearch backports. [#8010] by [@javierjulio]
+* Require Ransack v4. [#8009] by [@javierjulio]
+
+### Enhancements
+
+* Use display name fallback if blank display name result. [#6342] by [@javierjulio]
+
+### Translation Improvements
+
+* Improve Swedish translations. [#7993] by [@carlottostromstedt]
+
+## 2.14.0 [☰](https://github.com/activeadmin/activeadmin/compare/v2.13.1..v2.14.0)
+
+### Enhancements
+
+* Add csp_meta_tag to layout. [#7986] by [@javierjulio]
+* Update config.register_javascript with options support. [#7002] by [@lanzhiheng]
+* Use `csrf_meta_tags` in place of singular version. [#7985] by [@javierjulio]
+* Allow different new and edit rules in authorization adapters. [#6535] by [@timwis]
+
+### Bug Fixes
+
+* Fix form layout for hints and checkboxes. [#7772] by [@JewelSam]
+* Update filters disabled error to include specific action. [#6195] by [@javawizard]
+* Fix Comments controller destroy declaration. [#6482] by [@bliof]
+* Stop pagination elements from overflowing outside of panel container. [#7599] by [@ray-curran]
+
+### Translation Improvements
+
+* Update vi locale with more translations. [#7984] by [@rs-phunt]
+* Update zh-CN locale with multiple corrections. [#7944] by [@hfl]
+* Fix typo in Vietnamese locale for filter text. [#7920] by [@tvziet]
+* Improve French translation. [#7653] by [@cprodhomme]
+
+### Documentation
+
+* Add more documentation about PORO decorator requirements. [#7556] by [@sanfrecce-osaka]
+* Add Load Paths docs to the active_admin.rb template. [#7541] by [@gabo-cs]
+
+### Performance
+
+* Removes docs from exported gem. [#7013] by [@brunoarueira]
+
+## 2.13.1 [☰](https://github.com/activeadmin/activeadmin/compare/v2.13.0..v2.13.1)
+
+### Bug Fixes
+
+* Honor load paths order when loading admin files. [#7488] by [@tf]
+* Fix passing expected hash payload argument. [#7487] by [@ispyropoulos]
+
+## 2.13.0 [☰](https://github.com/activeadmin/activeadmin/compare/v2.12.0..v2.13.0)
+
+### Documentation
+
+* Update validation errors documentation to account for deprecated `ActiveModel::Errors#keys`. [#7475] by [@amit]
+
+### Dependency Changes
+
+* Drop rails 6.0 support. [#7476] by [@deivid-rodriguez]
+
+### Performance
+
+* Fix pundit performance. [#7479] by [@deivid-rodriguez]
+
 ## 2.12.0 [☰](https://github.com/activeadmin/activeadmin/compare/v2.11.2..v2.12.0)
 
 ### Enhancements
@@ -722,6 +881,7 @@ Please check [0-6-stable] for previous changes.
 [#6099]: https://github.com/activeadmin/activeadmin/pull/6099
 [#6124]: https://github.com/activeadmin/activeadmin/pull/6124
 [#6149]: https://github.com/activeadmin/activeadmin/pull/6149
+[#6195]: https://github.com/activeadmin/activeadmin/pull/6195
 [#6198]: https://github.com/activeadmin/activeadmin/pull/6198
 [#6210]: https://github.com/activeadmin/activeadmin/pull/6210
 [#6221]: https://github.com/activeadmin/activeadmin/pull/6221
@@ -730,14 +890,17 @@ Please check [0-6-stable] for previous changes.
 [#6315]: https://github.com/activeadmin/activeadmin/pull/6315
 [#6318]: https://github.com/activeadmin/activeadmin/pull/6318
 [#6341]: https://github.com/activeadmin/activeadmin/pull/6341
+[#6342]: https://github.com/activeadmin/activeadmin/pull/6342
 [#6368]: https://github.com/activeadmin/activeadmin/pull/6368
 [#6393]: https://github.com/activeadmin/activeadmin/pull/6393
 [#6422]: https://github.com/activeadmin/activeadmin/pull/6422
 [#6451]: https://github.com/activeadmin/activeadmin/pull/6451
 [#6460]: https://github.com/activeadmin/activeadmin/pull/6460
 [#6462]: https://github.com/activeadmin/activeadmin/pull/6462
+[#6482]: https://github.com/activeadmin/activeadmin/pull/6482
 [#6487]: https://github.com/activeadmin/activeadmin/pull/6487
 [#6523]: https://github.com/activeadmin/activeadmin/pull/6523
+[#6535]: https://github.com/activeadmin/activeadmin/pull/6535
 [#6536]: https://github.com/activeadmin/activeadmin/pull/6536
 [#6548]: https://github.com/activeadmin/activeadmin/pull/6548
 [#6583]: https://github.com/activeadmin/activeadmin/pull/6583
@@ -752,6 +915,8 @@ Please check [0-6-stable] for previous changes.
 [#6936]: https://github.com/activeadmin/activeadmin/pull/6936
 [#6954]: https://github.com/activeadmin/activeadmin/pull/6954
 [#6959]: https://github.com/activeadmin/activeadmin/pull/6959
+[#7002]: https://github.com/activeadmin/activeadmin/pull/7002
+[#7013]: https://github.com/activeadmin/activeadmin/pull/7013
 [#7095]: https://github.com/activeadmin/activeadmin/pull/7095
 [#7127]: https://github.com/activeadmin/activeadmin/pull/7127
 [#7144]: https://github.com/activeadmin/activeadmin/pull/7144
@@ -772,6 +937,53 @@ Please check [0-6-stable] for previous changes.
 [#7384]: https://github.com/activeadmin/activeadmin/pull/7384
 [#7394]: https://github.com/activeadmin/activeadmin/pull/7394
 [#7453]: https://github.com/activeadmin/activeadmin/pull/7453
+[#7475]: https://github.com/activeadmin/activeadmin/pull/7475
+[#7476]: https://github.com/activeadmin/activeadmin/pull/7476
+[#7479]: https://github.com/activeadmin/activeadmin/pull/7479
+[#7487]: https://github.com/activeadmin/activeadmin/pull/7487
+[#7488]: https://github.com/activeadmin/activeadmin/pull/7488
+[#7541]: https://github.com/activeadmin/activeadmin/pull/7541
+[#7556]: https://github.com/activeadmin/activeadmin/pull/7556
+[#7599]: https://github.com/activeadmin/activeadmin/pull/7599
+[#7653]: https://github.com/activeadmin/activeadmin/pull/7653
+[#7772]: https://github.com/activeadmin/activeadmin/pull/7772
+[#7920]: https://github.com/activeadmin/activeadmin/pull/7920
+[#7944]: https://github.com/activeadmin/activeadmin/pull/7944
+[#7984]: https://github.com/activeadmin/activeadmin/pull/7984
+[#7985]: https://github.com/activeadmin/activeadmin/pull/7985
+[#7986]: https://github.com/activeadmin/activeadmin/pull/7986
+[#7993]: https://github.com/activeadmin/activeadmin/pull/7993
+[#8009]: https://github.com/activeadmin/activeadmin/pull/8009
+[#8010]: https://github.com/activeadmin/activeadmin/pull/8010
+[#8098]: https://github.com/activeadmin/activeadmin/pull/8098
+[#8102]: https://github.com/activeadmin/activeadmin/pull/8102
+[#8105]: https://github.com/activeadmin/activeadmin/pull/8105
+[#8106]: https://github.com/activeadmin/activeadmin/pull/8106
+[#8163]: https://github.com/activeadmin/activeadmin/pull/8163
+[#8164]: https://github.com/activeadmin/activeadmin/pull/8164
+[#8165]: https://github.com/activeadmin/activeadmin/pull/8165
+[#8166]: https://github.com/activeadmin/activeadmin/pull/8166
+[#8167]: https://github.com/activeadmin/activeadmin/pull/8167
+[#8310]: https://github.com/activeadmin/activeadmin/pull/8310
+[#8311]: https://github.com/activeadmin/activeadmin/pull/8311
+[#8329]: https://github.com/activeadmin/activeadmin/pull/8329
+[#8349]: https://github.com/activeadmin/activeadmin/pull/8349
+[#8405]: https://github.com/activeadmin/activeadmin/pull/8405
+[#8412]: https://github.com/activeadmin/activeadmin/pull/8412
+[#8434]: https://github.com/activeadmin/activeadmin/pull/8434
+[#8446]: https://github.com/activeadmin/activeadmin/pull/8446
+[#8467]: https://github.com/activeadmin/activeadmin/pull/8467
+[#8468]: https://github.com/activeadmin/activeadmin/pull/8468
+[#8469]: https://github.com/activeadmin/activeadmin/pull/8469
+[#8470]: https://github.com/activeadmin/activeadmin/pull/8470
+[#8548]: https://github.com/activeadmin/activeadmin/pull/8548
+[#8551]: https://github.com/activeadmin/activeadmin/pull/8551
+[#8556]: https://github.com/activeadmin/activeadmin/pull/8556
+[#8596]: https://github.com/activeadmin/activeadmin/pull/8596
+[#8601]: https://github.com/activeadmin/activeadmin/pull/8601
+[#8614]: https://github.com/activeadmin/activeadmin/pull/8614
+[#8650]: https://github.com/activeadmin/activeadmin/pull/8650
+[#8652]: https://github.com/activeadmin/activeadmin/pull/8652
 
 [@1000ship]: https://github.com/1000ship
 [@5t111111]: https://github.com/5t111111
@@ -782,13 +994,17 @@ Please check [0-6-stable] for previous changes.
 [@alejandroperea]: https://github.com/alejandroperea
 [@alex-bogomolov]: https://github.com/alex-bogomolov
 [@amiel]: https://github.com/amiel
+[@amit]: https://github.com/amit
 [@amiuhle]: https://github.com/amiuhle
 [@andreslemik]: https://github.com/andreslemik
 [@bartoszkopinski]: https://github.com/bartoszkopinski
+[@bliof]: https://github.com/bliof
 [@blocknotes]: https://github.com/blocknotes
 [@bolshakov]: https://github.com/bolshakov
+[@brunoarueira]: https://github.com/brunoarueira
 [@brunvez]: https://github.com/brunvez
 [@buren]: https://github.com/buren
+[@carlottostromstedt]: https://github.com/carlottostromstedt
 [@chancancode]: https://github.com/chancancode
 [@chrp]: https://github.com/chrp
 [@chumakoff]: https://github.com/chumakoff
@@ -796,6 +1012,7 @@ Please check [0-6-stable] for previous changes.
 [@craigmcnamara]: https://github.com/craigmcnamara
 [@DanielHeath]: https://github.com/DanielHeath
 [@deivid-rodriguez]: https://github.com/deivid-rodriguez
+[@denisahearn]: https://github.com/denisahearn
 [@dennisvdvliet]: https://github.com/dennisvdvliet
 [@dhyegofernando]: https://github.com/dhyegofernando
 [@dkniffin]: https://github.com/dkniffin
@@ -808,22 +1025,26 @@ Please check [0-6-stable] for previous changes.
 [@Fivell]: https://github.com/Fivell
 [@Fs00]: https://github.com/Fs00
 [@fuzziness]: https://github.com/fuzziness
+[@gabo-cs]: https://github.com/gabo-cs
 [@giapnhdev]: https://github.com/giapnhdev
 [@gigorok]: https://github.com/gigorok
 [@glebtv]: https://github.com/glebtv
 [@gonzedge]: https://github.com/gonzedge
 [@guigs]: https://github.com/guigs
 [@HappyKadaver]: https://github.com/HappyKadaver
+[@hfl]: https://github.com/hfl
 [@imcvampire]: https://github.com/imcvampire
 [@innparusu95]: https://github.com/innparusu95
 [@ionut998]: https://github.com/ionut998
 [@irmela]: https://github.com/irmela
+[@ispyropoulos]: https://github.com/ispyropoulos
 [@Ivanov-Anton]: https://github.com/Ivanov-Anton
 [@jasl]: https://github.com/jasl
 [@javawizard]: https://github.com/javawizard
 [@javierjulio]: https://github.com/javierjulio
 [@jawa]: https://github.com/jawa
 [@jaynetics]: https://github.com/jaynetics
+[@JewelSam]: https://github.com/JewelSam
 [@JiiHu]: https://github.com/JiiHu
 [@jiikko]: https://github.com/jiikko
 [@johnnyshields]: https://github.com/johnnyshields
@@ -837,11 +1058,13 @@ Please check [0-6-stable] for previous changes.
 [@Kris-LIBIS]: https://github.com/Kris-LIBIS
 [@krzcho]: https://github.com/krzcho
 [@kwent]: https://github.com/kwent
+[@lanzhiheng]: https://github.com/lanzhiheng
 [@leio10]: https://github.com/leio10
 [@littleforest]: https://github.com/littleforest
 [@Looooong]: https://github.com/Looooong
 [@lubosch]: https://github.com/lubosch
 [@markstory]: https://github.com/markstory
+[@mattbrictson]: https://github.com/mattbrictson
 [@mauriciopasquier]: https://github.com/mauriciopasquier
 [@mconiglio]: https://github.com/mconiglio
 [@mgrunberg]: https://github.com/mgrunberg
@@ -857,13 +1080,17 @@ Please check [0-6-stable] for previous changes.
 [@orkhan]: https://github.com/orkhan
 [@panasyuk]: https://github.com/panasyuk
 [@PChambino]: https://github.com/PChambino
+[@plashchynski]: https://github.com/plashchynski
 [@potatosalad]: https://github.com/potatosalad
 [@pranas]: https://github.com/pranas
+[@ray-curran]: https://github.com/ray-curran
 [@renotocn]: https://github.com/renotocn
 [@rn0rno]: https://github.com/rn0rno
 [@RobinvanderVliet]: https://github.com/RobinvanderVliet
 [@rogerkk]: https://github.com/rogerkk
 [@roramirez]: https://github.com/roramirez
+[@rs-phunt]: https://github.com/rs-phunt
+[@sanfrecce-osaka]: https://github.com/sanfrecce-osaka
 [@seanlinsley]: https://github.com/seanlinsley
 [@sergey-alekseev]: https://github.com/sergey-alekseev
 [@sgara]: https://github.com/sgara
@@ -876,12 +1103,15 @@ Please check [0-6-stable] for previous changes.
 [@stereoscott]: https://github.com/stereoscott
 [@tagliala]: https://github.com/tagliala
 [@taralbass]: https://github.com/taralbass
+[@tf]: https://github.com/tf
 [@tiagotex]: https://github.com/tiagotex
 [@timoschilling]: https://github.com/timoschilling
 [@TimPetricola]: https://github.com/TimPetricola
+[@timwis]: https://github.com/timwis
 [@tomgilligan]: https://github.com/tomgilligan
 [@TonyArra]: https://github.com/TonyArra
 [@tordans]: https://github.com/tordans
+[@tvziet]: https://github.com/tvziet
 [@utkarsh2102]: https://github.com/utkarsh2102
 [@varyonic]: https://github.com/varyonic
 [@vcsjones]: https://github.com/vcsjones

data/CONTRIBUTING.md

@@ -25,8 +25,7 @@ git checkout -b 325-add-japanese-translations
 
 ### Get the test suite running
 
-Make sure you're using a recent ruby and have the `bundler` gem installed, at
-least version `1.14.3`.
+Make sure you're using a recent Ruby version.
 
 You'll also need chrome installed in order to run cucumber scenarios.
 
@@ -56,14 +55,14 @@ Now you should be able to run the entire suite using:
 bin/rake
 ```
 
-The test run will generate a sample Rails application in `tmp/test_apps` to run the
-tests against.
+The task will generate a sample Rails application in `tmp/test_apps` to run the
+test suite against.
 
 If you want to test against a Rails version different from the latest, make sure
 you use the correct Gemfile, for example:
 
 ```sh
-export BUNDLE_GEMFILE=gemfiles/rails_60/Gemfile
+export BUNDLE_GEMFILE=gemfiles/rails_61/Gemfile
 ```
 
 **Warning** SCSS assets are aimed to be used indifferently with Sprockets **and** webpacker.
@@ -108,13 +107,6 @@ with the db:
 bin/rake local db:migrate
 ```
 
-### Get the style right
-
-Your patch should follow the same conventions & pass the same code quality
-checks as the rest of the project. `bin/rake lint` will give you feedback in
-this regard. You can check & fix style issues by running each linter
-individually. Run `bin/rake -T lint` to see the available linters.
-
 ### Make a Pull Request
 
 At this point, you should switch back to your master branch and make sure it's

data/README.md

@@ -85,8 +85,8 @@ Thanks to [Tidelift][tidelift] and all our Tidelift subscribers.
 Thanks to [Open Collective][opencollective contributors] and all our Open Collective contributors.
 
 [Arbre]: https://github.com/activeadmin/arbre
-[Devise]: https://github.com/plataformatec/devise
-[Formtastic]: https://github.com/justinfrench/formtastic
+[Devise]: https://github.com/heartcombo/devise
+[Formtastic]: https://github.com/formtastic/formtastic
 [Inherited Resources]: https://github.com/activeadmin/inherited_resources
 [Kaminari]: https://github.com/kaminari/kaminari
 [Ransack]: https://github.com/activerecord-hackery/ransack
@@ -95,8 +95,8 @@ Thanks to [Open Collective][opencollective contributors] and all our Open Collec
 [rubygems]: https://rubygems.org/gems/activeadmin
 [actions_badge]: https://github.com/activeadmin/activeadmin/workflows/ci/badge.svg
 [actions]: https://github.com/activeadmin/activeadmin/actions
-[coverage_badge]: https://api.codeclimate.com/v1/badges/779e407d22bacff19733/test_coverage
-[coverage]: https://codeclimate.com/github/activeadmin/activeadmin/test_coverage
+[coverage_badge]: https://codecov.io/gh/activeadmin/activeadmin/branch/master/graph/badge.svg?token=NAjeBdkQXW
+[coverage]: https://codecov.io/gh/activeadmin/activeadmin
 [inch_badge]: http://inch-ci.org/github/activeadmin/activeadmin.svg?branch=master
 [inch]: http://inch-ci.org/github/activeadmin/activeadmin
 [tidelift_badge]: https://tidelift.com/badges/github/activeadmin/activeadmin

data/app/assets/javascripts/active_admin/base.js

@@ -474,7 +474,7 @@
     _setPrototypeOf(subClass, superClass);
   }
   function _setPrototypeOf(o, p) {
-    _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) {
+    _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) {
       o.__proto__ = p;
       return o;
     };
@@ -518,7 +518,4 @@
   }
   exports.ModalDialog = ModalDialog;
   exports.modal_dialog = modal_dialog;
-  Object.defineProperty(exports, "__esModule", {
-    value: true
-  });
 });

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

@@ -171,7 +171,7 @@ form {
     &.boolean {
       min-height: 1.1em;
       label {
-        width: 80%;
+        width: 100%;
         padding-left:20%;
         padding-right: 10px;
         text-transform: none !important;
@@ -220,9 +220,8 @@ form {
   /* Buttons */
 
   input[type=submit], input[type=button], button {
-    @include dark-button;
     cursor: pointer;
-
+    @include dark-button;
   }
 
   .buttons, .actions {

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

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

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

@@ -3,9 +3,12 @@
 
   .dropdown_menu_button {
     @include light-button;
-    position: relative;
-    padding-right: 22px !important;
-    cursor: pointer;
+
+    & {
+      position: relative;
+      padding-right: 22px !important;
+      cursor: pointer;
+    }
 
     &:before {
       content: ' ';
@@ -139,11 +142,11 @@
         }
 
         &:last-child {
+          border: none;
           a {
             border-bottom-left-radius: 2px;
             border-bottom-right-radius: 2px;
           }
-          border: none;
         }
       }
     }

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

@@ -38,8 +38,11 @@
   margin-left: 4px;
   select {
     @include light-button;
-    @include rounded(0px);
-    padding: 1px 5px;
+
+    & {
+      @include rounded(0px);
+      padding: 1px 5px;
+    }
   }
 }
 

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

@@ -1,6 +1,6 @@
 .table_tools {
-  @include clearfix;
   margin-bottom: 16px;
+  @include clearfix;
 }
 
 .table_tools .dropdown_menu {
@@ -9,11 +9,14 @@
 
 a.table_tools_button, .table_tools .dropdown_menu_button {
   @include light-button;
-  @include gradient(#FFFFFF, #F0F0F0);
-  @include border-colors(#d9d9d9, #d0d0d0, #c5c5c5);
-  font-size: 0.9em;
-  padding: 4px 14px 4px;
-  margin: 0;
+
+  & {
+    @include gradient(#FFFFFF, #F0F0F0);
+    @include border-colors(#d9d9d9, #d0d0d0, #c5c5c5);
+    font-size: 0.9em;
+    padding: 4px 14px 4px;
+    margin: 0;
+  }
 
   &:not(.disabled) {
     &:hover {

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

@@ -28,13 +28,16 @@
 
     a {
       @include light-button;
-      @include gradient(#FFFFFF, #F0F0F0);
-      @include border-colors(#d9d9d9, #d0d0d0, #c5c5c5);
-      text-decoration: none;
-      border-radius: 0;
-      border-width: 1px .5px 1px .5px;
-      margin-right: 0;
-      padding: 4px 14px 4px;
+
+      & {
+        @include gradient(#FFFFFF, #F0F0F0);
+        @include border-colors(#d9d9d9, #d0d0d0, #c5c5c5);
+        text-decoration: none;
+        border-radius: 0;
+        border-width: 1px .5px 1px .5px;
+        margin-right: 0;
+        padding: 4px 14px 4px;
+      }
 
       &:not(.disabled) {
         &:hover {

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

@@ -17,13 +17,13 @@
 }
 
 @mixin default-button {
-  @include basic-button;
   @include gradient(lighten($primary-color, 15%), darken($primary-color, 12%));
   @include text-shadow(#000);
   box-shadow: 0 1px 1px rgba(0,0,0,0.10), 0 1px 0 0px rgba(255,255,255, 0.2) inset;
   border: solid 1px #484e53;
   @include border-colors(#616a71, #484e53, #363b3f);
   color: #efefef;
+  @include basic-button;
 
   &:not(.disabled) {
     &:hover{
@@ -38,13 +38,13 @@
 }
 
 @mixin light-button {
-  @include basic-button;
   @include gradient(#FFFFFF, #E7E7E7);
   box-shadow: 0 1px 1px rgba(0,0,0,0.10), 0 1px 0 0 rgba(255,255,255, 0.8) inset;
   border: solid 1px #c7c7c7;
   @include border-colors(#d3d3d3, #c7c7c7, #c2c2c2);
   @include text-shadow;
   color: $primary-color;
+  @include basic-button;
 
   &:not(.disabled) {
     &:hover {

data/app/assets/stylesheets/active_admin/pages/_logged_out.scss

@@ -28,13 +28,13 @@ body.logged_out {
         @include no-shadow;
         background: none;
         padding: 0;
+        margin-bottom: 0;
         li { padding: 10px 0; }
 
         input[type=text], input[type=email], input[type=password] {
           width: 70%;
         }
         &.buttons { margin-left: 20%; }
-        margin-bottom: 0;
       }
     }
 

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

@@ -9,6 +9,11 @@
 }
 
 // -------------------------------------- Index Footer (Under Table)
-#index_footer { padding-top: 5px; text-align: right; font-size: 0.85em; }
+#index_footer {
+  padding-top: 5px;
+  text-align: right;
+  font-size: 0.85em;
+  @include clearfix;
+}
 
 .index_content { clear: both; }

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

@@ -1,6 +1,5 @@
 #title_bar {
   @include section-header;
-  @include clearfix;
   box-shadow: 0 1px 2px rgba(0, 0, 0, 0.37);
   display: table;
   border-bottom-color: #EEE;
@@ -9,6 +8,7 @@
   margin: 0;
   padding: 10px $horizontal-page-margin;
   z-index: 800;
+  @include clearfix;
 
   #titlebar_left, #titlebar_right {
     height: 50px;
@@ -32,8 +32,11 @@
     span.action_item {
       & > a, & > .dropdown_menu > a {
         @include light-button;
-        padding: 12px 17px 10px;
-        margin: 0px;
+
+        & {
+          padding: 12px 17px 10px;
+          margin: 0px;
+        }
       }
     }
   }