alchemy_cms 5.0.9 → 5.1.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b8b65ee04f3b4a173ef3c7d5fd49e4d488a548b0695994d5e6f572ee1f46d633
-  data.tar.gz: 2ad0719e949bd1b48d979db6a0b2e5bfa70ee12648c0b79203ca8f87b82b4d65
+  metadata.gz: b10d39bfe40bc834b734a824c9fbce68e1acf178b5cbd3ecbf6613dd4ac33261
+  data.tar.gz: 909f0164f71e95ed26c0b7a194b3464fc8c5974f8b28161eb3da4cb8e6c0c473
 SHA512:
-  metadata.gz: b3da1ab522043b9330c3a1d48c83f0b77b5ea8baa7ec290ad058c1f6ffe757890bc054cdcd798a8efb17ecf788fa57b374dbe2276675d5ffc7d7efcba60dd7b0
-  data.tar.gz: d67fed46efb864c0910e922b2ad666e5d04058052a605560503c27429bbf0764dbd875dd5866bc5e19b2b9470ed59eb999c20df7dca317df807d46675f0a4ed8
+  metadata.gz: 58367dca12c34272d159b8346bddddd729df2d2670b9e159d617ab1958c40937f58a6deb557a2cec1951bfaa4bb4b29cb34071eb08df14583b4cfdf58985619e
+  data.tar.gz: f1f861bfbc18c988597189e5dd87db0e905a70d6d78ad8bde8f2f70bba012f564fa9cfe8febf6d53834eddfde425e231ea9549b12b1bf177a8ae337f21609661

data/.github/PULL_REQUEST_TEMPLATE.md

@@ -13,6 +13,6 @@ Explain any changes (maybe breaking?) that have been made.
 Remove if no visual changes have been made.
 
 ## Checklist
-- [ ] I have followed [Pull Request guidelines](https://github.com/AlchemyCMS/alchemy_cms/blob/master/CONTRIBUTING.md)
+- [ ] I have followed [Pull Request guidelines](https://github.com/AlchemyCMS/alchemy_cms/blob/main/CONTRIBUTING.md)
 - [ ] I have added a detailed description into each commit message
 - [ ] I have added tests to cover this change

data/.github/workflows/stale.yml

@@ -14,4 +14,4 @@ jobs:
       with:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
         stale-issue-message: 'This issue has not seen any activity in a long time. If the issue described still exists in recent versions of Alchemy, please open a new issue or preferably open a PR with a fix. Thanks for reporting.'
-        stale-pr-message: 'This pull request has not seen any activiy in a long time. Probably because of missing tests or a necessary rebase. Please open a new PR to latest master if you want to continue working on this. Thanks for the contribution.'
+        stale-pr-message: 'This pull request has not seen any activiy in a long time. Probably because of missing tests or a necessary rebase. Please open a new PR to latest main if you want to continue working on this. Thanks for the contribution.'

data/.gitignore

@@ -40,3 +40,4 @@ yarn-error.log
 yarn-debug.log*
 .yarn-integrity
 yarn.lock
+/spec/dummy/public/pictures

data/.travis.yml

@@ -0,0 +1,48 @@
+language: ruby
+os: linux
+dist: bionic
+services:
+  - mysql
+addons:
+  postgresql: "10"
+cache:
+  bundler: true
+  yarn: true
+  directories:
+    - /home/travis/.webdrivers/
+rvm:
+  - 2.6.6
+  - 2.7.1
+
+before_script:
+  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
+  - chmod +x ./cc-test-reporter
+  - ./cc-test-reporter before-build
+  - nvm use 12
+
+script: bundle exec rake
+
+after_script:
+  - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT
+
+jobs:
+  include:
+    - language: node_js
+      node_js: 12
+      install: yarn install
+      script: yarn jest --coverage
+      env: NODE_ENV=test
+      before_script: skip
+      after_script: skip
+
+env:
+  global:
+    CC_TEST_REPORTER_ID=bca4349e32f97919210ac8a450b04904b90683fcdd57d65a22c0f5065482bc22
+  jobs:
+    - DB=mysql RAILS_VERSION=5.2
+    - DB=mysql RAILS_VERSION=6.0
+    - DB=postgresql RAILS_VERSION=5.2
+    - DB=postgresql RAILS_VERSION=6.0
+notifications:
+  slack:
+    secure: QzOFw1Ph69pzwWBFgtIVkOnjbcRxB9HPRQ+RYjK+2tg+fsbiTJ+wYgHcZL49tPYcLAls4kymkFWzWBF3PCAXJMfKgUCqXzdQ2FuJC/JoVRTLll4wDnZFPG33jsm5tVznmycZ3ma4+ZWfJQ+C+elEBOba6v1kG9eGIy6sH2cvXfE=

data/CHANGELOG.md

@@ -1,41 +1,55 @@
-## 5.0.9 (2021-11-24)
-
-- Adjust tinymce skin assets urls again ([tvdeyen](https://github.com/tvdeyen))
-
-## 5.0.8 (2021-11-17)
-
-- Set stampable user_class_name without root identifier ([tvdeyen](https://github.com/tvdeyen))
-- Use relative path for tinymce font-face ([tvdeyen](https://github.com/tvdeyen))
-
-## 5.0.7 (2021-10-26)
-
-- Make sure to install correct npm package ([tvdeyen](https://github.com/tvdeyen))
-
-## 5.0.6 (2021-09-17)
-
-- Use self_and_ancestors in page_active? helper [#2193](https://github.com/AlchemyCMS/alchemy_cms/pull/2193) ([mamhoff](https://github.com/mamhoff))
-
-## 5.0.5 (2021-09-15)
-
-- Backport #2115 to v5.0 [#2126](https://github.com/AlchemyCMS/alchemy_cms/pull/2126) ([dbwinger](https://github.com/dbwinger))
-- Fixate Dragonfly to < 1.4 [#2122](https://github.com/AlchemyCMS/alchemy_cms/pull/2122) ([tvdeyen](https://github.com/tvdeyen))
-- Backport #2114 to v5.0 [#2118](https://github.com/AlchemyCMS/alchemy_cms/pull/2118) ([afdev82](https://github.com/afdev82))
-
-## 5.0.4 (2021-05-06)
-
-- Use symbols in polymorphic routes for resources [#2087](https://github.com/AlchemyCMS/alchemy_cms/pull/2087) ([tvdeyen](https://github.com/tvdeyen))
-
-## 5.0.3 (2021-01-12)
-
-- Fix copy element feature [#1996](https://github.com/AlchemyCMS/alchemy_cms/pull/1996) ([tvdeyen](https://github.com/tvdeyen))
-
-## 5.0.2 (2020-12-18)
-
-- Fix page sorting [#1984](https://github.com/AlchemyCMS/alchemy_cms/pull/1984) ([tvdeyen](https://github.com/tvdeyen))
+## 5.1.0 (unreleased)
+
+### Features
+
+- Persist rendered picture variants [#1882](https://github.com/AlchemyCMS/alchemy_cms/pull/1882) ([tvdeyen](https://github.com/tvdeyen))
+- Store current pictures size in session [#1927](https://github.com/AlchemyCMS/alchemy_cms/pull/1927) ([tvdeyen](https://github.com/tvdeyen))
+- Add support for custom mount points in Page::UrlPath [#1921](https://github.com/AlchemyCMS/alchemy_cms/pull/1921) ([tvdeyen](https://github.com/tvdeyen))
+- Allow to set a custom Page::UrlPath class [#1919](https://github.com/AlchemyCMS/alchemy_cms/pull/1919) ([tvdeyen](https://github.com/tvdeyen))
+
+### Changes
+
+- Do not abort if user class cannot be found [#1950](https://github.com/AlchemyCMS/alchemy_cms/pull/1950) ([tvdeyen](https://github.com/tvdeyen))
+- Deprivatize useful picture view methods [#1936](https://github.com/AlchemyCMS/alchemy_cms/pull/1936) ([mickenorlen](https://github.com/mickenorlen))
+- Unset render_size on layout default selection [#1935](https://github.com/AlchemyCMS/alchemy_cms/pull/1935) ([mickenorlen](https://github.com/mickenorlen))
+- Dont show sizes selection if using srcset [#1934](https://github.com/AlchemyCMS/alchemy_cms/pull/1934) ([mickenorlen](https://github.com/mickenorlen))
+- Change all Boolean columns to never be null [#1933](https://github.com/AlchemyCMS/alchemy_cms/pull/1933) ([mamhoff](https://github.com/mamhoff))
+- Autoselect first if only one layout available [#1932](https://github.com/AlchemyCMS/alchemy_cms/pull/1932) ([mickenorlen](https://github.com/mickenorlen))
+- Remove page from search form query [#1928](https://github.com/AlchemyCMS/alchemy_cms/pull/1928) ([tvdeyen](https://github.com/tvdeyen))
+- Allow coffee-rails 5 [#1926](https://github.com/AlchemyCMS/alchemy_cms/pull/1926) ([sechix](https://github.com/sechix))
+- Update documentation [#1917](https://github.com/AlchemyCMS/alchemy_cms/pull/1917) ([dhughesbc](https://github.com/dhughesbc))
+- Remove deprecated Attachment#urlname [#1911](https://github.com/AlchemyCMS/alchemy_cms/pull/1911) ([tvdeyen](https://github.com/tvdeyen))
+- Remove redirect_to_public_child flag and feature [#1910](https://github.com/AlchemyCMS/alchemy_cms/pull/1910) ([tvdeyen](https://github.com/tvdeyen))
+- Remove toolbar helper [#1909](https://github.com/AlchemyCMS/alchemy_cms/pull/1909) ([tvdeyen](https://github.com/tvdeyen))
+- Two minor CSS fixes [#1908](https://github.com/AlchemyCMS/alchemy_cms/pull/1908) ([tvdeyen](https://github.com/tvdeyen))
+- Do not convert JPG images into JPEG [#1905](https://github.com/AlchemyCMS/alchemy_cms/pull/1905) ([tvdeyen](https://github.com/tvdeyen))
+- Full text search respects filters [#1901](https://github.com/AlchemyCMS/alchemy_cms/pull/1901) ([tvdeyen](https://github.com/tvdeyen))
+- Do not add id attributes to hidden fields in search and filters [#1899](https://github.com/AlchemyCMS/alchemy_cms/pull/1899) ([tvdeyen](https://github.com/tvdeyen))
+- Do not freeze common_search_filter_includes [#1898](https://github.com/AlchemyCMS/alchemy_cms/pull/1898) ([tvdeyen](https://github.com/tvdeyen))
+- Refactor sidebar CSS [#1897](https://github.com/AlchemyCMS/alchemy_cms/pull/1897) ([tvdeyen](https://github.com/tvdeyen))
+- Fix tag-list height [#1896](https://github.com/AlchemyCMS/alchemy_cms/pull/1896) ([tvdeyen](https://github.com/tvdeyen))
+- Fix vertical position of site name in page tab [#1895](https://github.com/AlchemyCMS/alchemy_cms/pull/1895) ([tvdeyen](https://github.com/tvdeyen))
+- Support nested controllers in modules [#1894](https://github.com/AlchemyCMS/alchemy_cms/pull/1894) ([tvdeyen](https://github.com/tvdeyen))
+- Always make pages taggable [#1893](https://github.com/AlchemyCMS/alchemy_cms/pull/1893) ([tvdeyen](https://github.com/tvdeyen))
+- Fix editing sites [#1891](https://github.com/AlchemyCMS/alchemy_cms/pull/1891) ([mamhoff](https://github.com/mamhoff))
+- Fix missing help_text_text translations [#1888](https://github.com/AlchemyCMS/alchemy_cms/pull/1888) ([gr8bit](https://github.com/gr8bit))
+
+### Misc
+
+- Remove greetings action [#1956](https://github.com/AlchemyCMS/alchemy_cms/pull/1956) ([tvdeyen](https://github.com/tvdeyen))
+- [ruby] Upgrade rubocop to version 1.0.0 [#1952](https://github.com/AlchemyCMS/alchemy_cms/pull/1952) ([depfu](https://github.com/apps/depfu))
+- [ruby] Upgrade rubocop to version 0.93.1 [#1948](https://github.com/AlchemyCMS/alchemy_cms/pull/1948) ([depfu](https://github.com/apps/depfu))
+- [ruby] Upgrade puma to version 5.0.2 [#1944](https://github.com/AlchemyCMS/alchemy_cms/pull/1944) ([depfu](https://github.com/apps/depfu))
+- [ruby] Upgrade rubocop to version 0.92.0 [#1942](https://github.com/AlchemyCMS/alchemy_cms/pull/1942) ([depfu](https://github.com/apps/depfu))
+- Use Node 12 on CI runs [#1925](https://github.com/AlchemyCMS/alchemy_cms/pull/1925) ([tvdeyen](https://github.com/tvdeyen))
+- [ruby] Upgrade rubocop to version 0.89.0 [#1920](https://github.com/AlchemyCMS/alchemy_cms/pull/1920) ([depfu](https://github.com/apps/depfu))
+- Move back to Travis CI [#1907](https://github.com/AlchemyCMS/alchemy_cms/pull/1907) ([tvdeyen](https://github.com/tvdeyen))
+- [ruby] Upgrade rubocop to version 0.88.0 [#1892](https://github.com/AlchemyCMS/alchemy_cms/pull/1892) ([depfu](https://github.com/apps/depfu))
+- [ruby] Upgrade rubocop to version 0.87.1 [#1889](https://github.com/AlchemyCMS/alchemy_cms/pull/1889) ([depfu](https://github.com/apps/depfu))
 
 ## 5.0.1 (2020-09-29)
 
-- Better image alt text support [#1940](https://github.com/AlchemyCMS/alchemy_cms/pull/1940) ([tvdeyen](https://github.com/tvdeyen))
+- [a11y] Better image alt text support [#1940](https://github.com/AlchemyCMS/alchemy_cms/pull/1940) ([tvdeyen](https://github.com/tvdeyen))
 
 ## 5.0.0 (2020-07-17)
 
@@ -43,7 +57,7 @@
 - Do not enable image cropper if file is missing [#1903](https://github.com/AlchemyCMS/alchemy_cms/pull/1903) ([tvdeyen](https://github.com/tvdeyen))
 - Always show original image as zoomed image [#1902](https://github.com/AlchemyCMS/alchemy_cms/pull/1902) ([tvdeyen](https://github.com/tvdeyen))
 - Rename Attachment#urlname into slug [#1848](https://github.com/AlchemyCMS/alchemy_cms/pull/1848) ([tvdeyen](https://github.com/tvdeyen))
-- Deprecate toolbar helper ([tvdeyen](https://github.com/tvdeyen))
+- Deprecate toolbar helper [#1900](https://github.com/AlchemyCMS/alchemy_cms/pull/1900) ([tvdeyen](https://github.com/tvdeyen))
 - Deprecate redirect_to_public_child ([tvdeyen](https://github.com/tvdeyen))
 - Add --auto-accept option to installer ([tvdeyen](https://github.com/tvdeyen))
 - Move all installer code into install generator ([tvdeyen](https://github.com/tvdeyen))

data/CONTRIBUTING.md

@@ -39,11 +39,11 @@ refactoring and documentation changes require no new tests. If you are adding
 functionality or fixing a bug, we need tests!
 
 4. Push to your fork and submit a pull request. If the changes will apply cleanly
-to the latest stable branches and master branch, you will only need to submit one
+to the latest stable branches and main branch, you will only need to submit one
 pull request.
 
 5. If a PR does not apply cleanly to one of its targeted branches, then a separate
-PR should be created that does. For instance, if a PR applied to master & 2.7-stable but not 2.8-stable, then there should be one PR for master & 2.7-stable and another, separate PR for 2.8-stable.
+PR should be created that does. For instance, if a PR applied to main & 2.7-stable but not 2.8-stable, then there should be one PR for main & 2.7-stable and another, separate PR for 2.8-stable.
 
 At this point you're waiting on us. We like to at least comment on, if not
 accept pull requests. We may suggest some changes or improvements or alternatives.

data/Gemfile

@@ -13,7 +13,7 @@ gem "mysql2", "~> 0.5.1" if ENV["DB"] == "mysql"
 gem "pg", "~> 1.0" if ENV["DB"] == "postgresql"
 
 group :development, :test do
-  if ENV["GITHUB_ACTIONS"]
+  if ENV["TRAVIS"]
     gem "sassc", "~> 2.4.0" # https://github.com/sass/sassc-ruby/issues/146
   else
     gem "launchy"
@@ -22,7 +22,7 @@ group :development, :test do
     gem "yard"
     gem "redcarpet"
     gem "pry-byebug"
-    gem "rubocop", "~> 0.85.0", require: false
+    gem "rubocop", "~> 1.0.0", require: false
     gem "listen"
     gem "localeapp", "~> 3.0", require: false
     gem "dotenv", "~> 2.2"

data/README.md

@@ -1,7 +1,7 @@
 # AlchemyCMS
 
 [![Gem Version](https://badge.fury.io/rb/alchemy_cms.svg)](http://badge.fury.io/rb/alchemy_cms)
-[![Build Status](https://github.com/AlchemyCMS/alchemy_cms/workflows/CI/badge.svg?branch=main)](https://github.com/AlchemyCMS/alchemy_cms/actions)
+[![Build Status](https://travis-ci.com/AlchemyCMS/alchemy_cms.svg?branch=main)](https://travis-ci.com/AlchemyCMS/alchemy_cms)
 [![Maintainability](https://api.codeclimate.com/v1/badges/196c56c56568ed24a697/maintainability)](https://codeclimate.com/github/AlchemyCMS/alchemy_cms/maintainability)
 [![Test Coverage](https://api.codeclimate.com/v1/badges/196c56c56568ed24a697/test_coverage)](https://codeclimate.com/github/AlchemyCMS/alchemy_cms/test_coverage)
 [![Depfu](https://badges.depfu.com/badges/ebe56d2dd7b7044a8ae700cc81212a8e/overview.svg)](https://depfu.com/github/AlchemyCMS/alchemy_cms?project_id=4600)
@@ -18,7 +18,7 @@ Alchemy is an open source CMS engine written in Ruby on Rails.
 
 Read more about Alchemy on the [website](https://alchemy-cms.com) and in the [guidelines](https://guides.alchemy-cms.com).
 
-**CAUTION: This master branch is a development branch that *can* contain bugs. For productive environments you should use the [current Ruby gem version](https://rubygems.org/gems/alchemy_cms), or the [latest stable branch (4.5-stable)](https://github.com/AlchemyCMS/alchemy_cms/tree/4.5-stable).**
+**CAUTION: This main branch is a development branch that *can* contain bugs. For productive environments you should use the [current Ruby gem version](https://rubygems.org/gems/alchemy_cms), or the [latest stable branch (5.0-stable)](https://github.com/AlchemyCMS/alchemy_cms/tree/5.0-stable).**
 
 
 ## ✅ Features

data/alchemy_cms.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |gem|
   gem.summary               = 'A powerful, userfriendly and flexible CMS for Rails'
   gem.description           = 'Alchemy is a powerful, userfriendly and flexible Rails CMS.'
   gem.requirements << 'ImageMagick (libmagick), v6.6 or greater.'
-  gem.required_ruby_version = '~> 2.3'
+  gem.required_ruby_version = '>= 2.3.0'
   gem.license               = 'BSD New'
   gem.files                 = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^spec/}) }
   gem.require_paths         = ['lib']
@@ -22,8 +22,8 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'acts_as_list',                     ['>= 0.3', '< 2']
   gem.add_runtime_dependency 'awesome_nested_set',               ['~> 3.1']
   gem.add_runtime_dependency 'cancancan',                        ['>= 2.1', '< 4.0']
-  gem.add_runtime_dependency 'coffee-rails',                     ['~> 4.0', '< 5.0']
-  gem.add_runtime_dependency 'dragonfly',                        ['~> 1.0', '>= 1.0.7', '< 1.4.0']
+  gem.add_runtime_dependency 'coffee-rails',                     ['>= 4.0', '< 6.0']
+  gem.add_runtime_dependency 'dragonfly',                        ['~> 1.0', '>= 1.0.7']
   gem.add_runtime_dependency 'dragonfly_svg',                    ['~> 0.0.4']
   gem.add_runtime_dependency 'gutentag',                         ['~> 2.2', '>= 2.2.1']
   gem.add_runtime_dependency 'handlebars_assets',                ['~> 0.23']
@@ -46,7 +46,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'capybara',                     ['~> 3.0']
   gem.add_development_dependency 'capybara-screenshot',          ['~> 1.0']
   gem.add_development_dependency 'factory_bot_rails',            ['~> 6.0']
-  gem.add_development_dependency 'puma',                         ['~> 4.0']
+  gem.add_development_dependency 'puma',                         ['~> 5.0']
   gem.add_development_dependency 'rails-controller-testing',     ['~> 1.0']
   gem.add_development_dependency 'rspec-activemodel-mocks',      ['~> 1.0']
   gem.add_development_dependency 'rspec-rails',                  ['>= 4.0.0.beta2']

data/app/assets/images/alchemy/missing-image.svg

@@ -0,0 +1 @@
+<svg aria-hidden="true" focusable="false" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 512" width="16" height="16"><path fill="#f7f7f7" d="M569.517 440.013C587.975 472.007 564.806 512 527.94 512H48.054c-36.937 0-59.999-40.055-41.577-71.987L246.423 23.985c18.467-32.009 64.72-31.951 83.154 0l239.94 416.028zM288 354c-25.405 0-46 20.595-46 46s20.595 46 46 46 46-20.595 46-46-20.595-46-46-46zm-43.673-165.346l7.418 136c.347 6.364 5.609 11.346 11.982 11.346h48.546c6.373 0 11.635-4.982 11.982-11.346l7.418-136c.375-6.874-5.098-12.654-11.982-12.654h-63.383c-6.884 0-12.356 5.78-11.981 12.654z" class=""></path></svg>

data/app/assets/stylesheets/alchemy/_variables.scss

@@ -143,6 +143,7 @@ $element-header-bg-color: $medium-gray !default;
 $top-menu-height: 75px !default;
 
 $tabs-height: 31px !default;
+$pagination-height: 52px !default;
 
 $datepicker_current_bg: $blue !default;
 $datepicker_current_color: $white !default;

data/app/assets/stylesheets/alchemy/archive.scss

@@ -1,5 +1,5 @@
 .resources-header {
-  padding: 2*$default-padding;
+  padding: 2 * $default-padding;
 }
 
 .resources-table-wrapper {
@@ -16,12 +16,11 @@ div#image_assign_filter_and_image_sizing {
 }
 
 #picture_archive {
-
   .selected_item_tools {
-    margin: -2*$default-padding;
+    margin: -2 * $default-padding;
     border-bottom: 1px solid $default-border-color;
-    margin-bottom: 4*$default-padding;
-    padding: 4*$default-padding;
+    margin-bottom: 4 * $default-padding;
+    padding: 4 * $default-padding;
     display: none;
   }
 }
@@ -37,7 +36,7 @@ div#image_assign_filter_and_image_sizing {
 }
 
 .picture_thumbnail {
-  margin: 2*$default-margin;
+  margin: 2 * $default-margin;
   background-color: #fff;
   position: relative;
   box-shadow: 0 0 0 1px $default-border-color;
@@ -80,8 +79,8 @@ div#image_assign_filter_and_image_sizing {
   }
 
   &:hover {
-
-    .picture_tool, .picture_tags {
+    .picture_tool,
+    .picture_tags {
       visibility: visible;
       opacity: 1;
     }
@@ -95,7 +94,6 @@ div#image_assign_filter_and_image_sizing {
 }
 
 #pictures {
-
   .thumbnail_background {
     @include zoom-in;
   }
@@ -165,25 +163,34 @@ div.assign_image_list_image {
   pointer-events: none;
 }
 
-.picture_tags, .picture_tool {
+.picture_tags,
+.picture_tool {
   visibility: hidden;
   opacity: 0;
   transition: opacity $transition-duration;
 }
 
 div#library_sidebar {
+  display: flex;
+  flex-direction: column;
   position: fixed;
   border-left: 1px solid $default-border-color;
   top: 0;
   right: 0;
   width: 232px;
-  padding: 86px 4*$default-padding 0 4*$default-padding;
+
+  padding: $top-menu-height + 2 * $default-padding 4 * $default-padding
+    $pagination-height + 2 * $default-padding 4 * $default-padding;
   height: 100%;
   z-index: 3;
   background-color: $light-gray;
 
   h2 {
-    margin-top: 4*$default-margin;
+    margin-top: 4 * $default-margin;
+  }
+
+  h3 {
+    margin: 2em 0 1em;
   }
 }
 
@@ -192,20 +199,19 @@ div#library_sidebar {
 }
 
 div#filter_bar {
-
   .selectboxit {
     width: 194px;
   }
 }
 
 .alchemy-dialog-body {
-
   #library_sidebar {
-    padding: 0 4*$default-padding;
+    padding: 0 4 * $default-padding;
   }
 }
 
-#assign_image_list, #assign_file_list {
+#assign_image_list,
+#assign_file_list {
   position: relative;
   height: 548px;
 }
@@ -234,7 +240,7 @@ div#filter_bar {
       display: block;
       line-height: 25px;
       text-decoration: none;
-      padding: $default-padding 2*$default-padding;
+      padding: $default-padding 2 * $default-padding;
     }
 
     .icon {

data/app/assets/stylesheets/alchemy/errors.scss

@@ -40,7 +40,7 @@ div#errors, div.errors {
 
 body.error {
   .error.message {
-    max-height: 95%;
+    max-height: 100%;
     overflow-y: scroll;
   }
 }

data/app/assets/stylesheets/alchemy/navigation.scss

@@ -256,7 +256,7 @@
   > a {
     display: flex;
     cursor: pointer;
-    padding: 0px 8px;
+    padding-left: 2 * $default-padding;
 
     &:focus {
       @include default-focus-style($box-shadow: inset 0 0 0 2px $focus-color);
@@ -273,19 +273,16 @@
     text-shadow: $text-shadow-light;
   }
 
-  .page_language {
-    display: inline-block;
-    color: $muted-text-color;
-    margin-right: 2px;
-    font-size: $small-font-size;
-    text-transform: uppercase;
-  }
-
+  .page_language,
   .page_site {
     display: inline-block;
     color: $muted-text-color;
-    margin-right: $default-margin;
     font-size: $small-font-size;
+    margin-right: $default-margin;
     line-height: 31px;
   }
+
+  .page_language {
+    text-transform: uppercase;
+  }
 }

data/app/assets/stylesheets/alchemy/pagination.scss

@@ -7,7 +7,7 @@
   right: 0;
   width: 100%;
   left: 0px;
-  height: 52px;
+  height: $pagination-height;
   padding: 2*$default-padding;
   padding-left: $main-menu-width + 10px;
   text-align: left;

data/app/assets/stylesheets/alchemy/search.scss

@@ -11,9 +11,19 @@
     top: 9px;
   }
 
-  label {
-    display: block;
+  button {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 30px;
     height: inherit;
+    appearance: none;
+    background-color: transparent;
+    border: 0 none;
+    border-radius: 0;
+    box-shadow: none;
+    margin: 0;
+    padding: 0;
   }
 }
 

data/app/assets/stylesheets/alchemy/tags.scss

@@ -1,26 +1,10 @@
 .tag-list {
+  display: flex;
+  flex-direction: column;
   height: 100%;
-  padding-bottom: 138px;
-
-  &.filtered {
-    padding-bottom: 178px;
-  }
-
-  &.with_filter_bar {
-    padding-bottom: 218px;
-
-    &.filtered {
-      padding-bottom: 256px;
-    }
-  }
 
   .js_filter_field_box {
-    position: absolute;
-    right: auto;
-    top: auto;
-    width: 200px;
-    z-index: 1100;
-    transition: background-color $transition-duration;
+    margin: 0;
 
     input {
       background-color: transparentize($white, 0.25);
@@ -29,23 +13,22 @@
         background-color: $white;
       }
     }
-
-    label { display: none }
   }
 
   ul {
     list-style-type: none;
     padding: 0;
-    margin: 44px 0 4px 0;
+    margin: 0;
     height: 100%;
-    width: 200px;
     overflow-x: hidden;
     overflow-y: auto;
 
     li {
       display: block;
 
-      &:first-child { margin-top: 0 }
+      &:first-child {
+        margin-top: 0;
+      }
 
       a {
         @include tag-base;
@@ -53,13 +36,14 @@
         display: block;
       }
 
-      &:hover { background-color: $very-light-blue }
+      &:hover {
+        background-color: $very-light-blue;
+      }
 
       &.active {
-
         a {
           background-color: $dark-gray;
-          color: $light-gray
+          color: $light-gray;
         }
       }
     }
@@ -69,7 +53,7 @@
 .tag {
   @include tag-base(
     $margin: $default-margin/2 0,
-    $padding: $default-padding 2*$default-padding $default-padding
+    $padding: $default-padding 2 * $default-padding $default-padding
   );
   pointer-events: none;
   font-size: $small-font-size;
@@ -124,7 +108,9 @@
       position: relative;
       border-radius: $default-border-radius;
 
-      &.odd { background-color: #eaf3f9 }
+      &.odd {
+        background-color: #eaf3f9;
+      }
 
       input {
         position: absolute;
@@ -141,14 +127,16 @@
   }
 }
 
-.tag_list, .autocomplete_tag_list {
+.tag_list,
+.autocomplete_tag_list {
   .select2-container.select2-container-multi {
     .select2-search-choice {
       padding: 0;
 
       div {
         @include tag-base(
-          $padding: $default-padding 6*$default-padding $default-padding 3*$default-padding,
+          $padding: $default-padding 6 * $default-padding $default-padding 3 *
+            $default-padding,
           $margin: 0
         );
       }

data/app/assets/stylesheets/tinymce/skins/alchemy/content.min.css.scss

@@ -30,7 +30,7 @@ td,th {
 
 .mce-object {
   border: 1px dotted #3a3a3a;
-  background: #d5d5d5 url('tinymce/skins/alchemy/fonts/img/object.gif') no-repeat center;
+  background: #d5d5d5 url(img/object.gif) no-repeat center;
 }
 
 .mce-pagebreak {
@@ -55,7 +55,7 @@ td,th {
   width: 9px!important;
   height: 9px!important;
   border: 1px dotted #3a3a3a;
-  background: #d5d5d5 url('tinymce/skins/alchemy/fonts/img/anchor.gif') no-repeat center;
+  background: #d5d5d5 url(img/anchor.gif) no-repeat center;
 }
 
 .mce-nbsp {
@@ -77,7 +77,7 @@ hr {
 }
 
 .mce-spellchecker-word {
-  background: url('tinymce/skins/alchemy/fonts/img/wline.gif') repeat-x bottom left;
+  background: url(img/wline.gif) repeat-x bottom left;
   cursor: default;
 }