alchemy_cms 4.0.6 → 4.1.0.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a09c975c4f08333ff19d8d65ec1ccbffbb9d379b6b51c5ae72394b0f9407ad93
-  data.tar.gz: 6639c81d4b059fc5281de173792aec47281d86958d2aadf30a64e566d193d15e
+  metadata.gz: '084ab3053975356290606cfd0c9d6e6097f6a46878a8f94ff1b24bfa6b2c16d1'
+  data.tar.gz: 99bc5df70b19f79ec32274dab59005e51793b59e976e76e8555237748707174c
 SHA512:
-  metadata.gz: fb6fadb1c5daf32aed6e4e74331b1a30fbb8da2b6d6ca3c638a3e0d6974046ef64de59a478a59702775787f233a8b07c9520d853f1b20f4eae4c811358e2f24a
-  data.tar.gz: 041b34771016cc0d83d445f9bd358a9ec2428e86dc6eb8778bc218497394c4b329bc10dc508d28f4028834841df6756e9233b5079dffe436ed704539e58012ec
+  metadata.gz: 96ad91029980370ccad1db4f32c0baadded1216f05bbbf818aaa90c425512fb851aac9651b5365d9e0550050a61fae616cfcb45a3fd31f1c31110646a00b86b8
+  data.tar.gz: 8faae7e20c891abf20dc2b184fd3643a4fc26ec5f8be39085274a69db0ec79b15bfed9cc2784d71a79cfaca0f9f7ee34e8d79a386bab7c935fa1115e2e9d4e1f

data/.codeclimate.yml

@@ -32,3 +32,4 @@ exclude_paths:
 - "spec/"
 - "lib/alchemy/upgrader/"
 - "lib/rails/"
+- "vendor/assets/"

data/.gitignore

@@ -20,3 +20,4 @@ spec/dummy/public/assets
 .rbenv-version
 .ruby-gemset
 .ruby-version
+.env

data/.localeapp/config.rb

@@ -0,0 +1,8 @@
+require 'dotenv/load'
+
+Localeapp.configure do |config|
+  config.api_key                    = ENV['LOCALEAPP_API_KEY']
+  config.translation_data_directory = 'config/locales'
+  config.synchronization_data_file  = '.localeapp/log.yml'
+  config.daemon_pid_file            = '.localeapp/localeapp.pid'
+end

data/.rubocop.yml

@@ -4,10 +4,12 @@ AllCops:
   Exclude:
     - 'bin/rspec'
     - 'vendor/**/*'
-    - 'spec/dummy/**/*'
+    - 'spec/dummy/db/**/*'
+    - 'spec/dummy/config/**/*'
     - 'alchemy_cms.gemspec'
+    - 'Rakefile'
 
-  TargetRubyVersion: 2.1
+  TargetRubyVersion: 2.2
 
 # Really, rubocop?
 Bundler/OrderedGems:
@@ -25,10 +27,6 @@ Style/EmptyLiteral:
 Style/ClassVars:
   Enabled: false
 
-# We need these names for backwards compatability
-Style/PredicateName:
-  Enabled: false
-
 # This has been used for customization
 Style/MutableConstant:
   Enabled: false
@@ -49,6 +47,10 @@ Style/WordArray:
 Style/ConditionalAssignment:
   Enabled: false
 
+Style/MixinUsage:
+  Exclude:
+    - spec/**/*
+
 Performance/Count:
   Enabled: false
 
@@ -103,7 +105,7 @@ Layout/SpaceInsideParens:
   Enabled: false
   StyleGuide: http://relaxed.ruby.style/#stylespaceinsideparens
 
-Lint/EndAlignment:
+Layout/EndAlignment:
   Enabled: false
 
 Lint/HandleExceptions:
@@ -117,9 +119,6 @@ Lint/ShadowedException:
 Style/CollectionMethods:
   Enabled: false
 
-Style/AccessorMethodName:
-  Enabled: false
-
 Style/Alias:
   Enabled: false
   StyleGuide: http://relaxed.ruby.style/#stylealias
@@ -217,9 +216,6 @@ Style/StringLiterals:
   Enabled: false
   StyleGuide: http://relaxed.ruby.style/#stylestringliterals
 
-Style/VariableNumber:
-  Enabled: false
-
 Style/WhileUntilModifier:
   Enabled: false
   StyleGuide: http://relaxed.ruby.style/#stylewhileuntilmodifier
@@ -280,3 +276,20 @@ Metrics/ParameterLists:
 
 Metrics/PerceivedComplexity:
   Enabled: false
+
+Naming/AccessorMethodName:
+  Enabled: false
+
+Naming/HeredocDelimiterNaming:
+    Enabled: false
+
+# This cop is great but has no config option to support the style `@_method_name` we are using.
+Naming/MemoizedInstanceVariableName:
+  Enabled: false
+
+# We need these names for backwards compatability
+Naming/PredicateName:
+  Enabled: false
+
+Naming/VariableNumber:
+  Enabled: false

data/.travis.yml

@@ -1,28 +1,26 @@
 language: ruby
 dist: trusty
 sudo: false
+addons:
+  apt:
+    packages:
+      - chromium-chromedriver
 cache:
   bundler: true
-  directories:
-    - "travis_phantomjs"
 rvm:
-  - 2.3.5
-  - 2.4.2
+- 2.3.5
+- 2.4.2
+- 2.5.0
 before_install:
-  - "phantomjs --version"
-  - "export PATH=$PWD/travis_phantomjs/phantomjs-2.1.1-linux-x86_64/bin:$PATH"
-  - "phantomjs --version"
-  - "if [ $(phantomjs --version) != '2.1.1' ]; then rm -rf $PWD/travis_phantomjs; mkdir -p $PWD/travis_phantomjs; fi"
-  - "if [ $(phantomjs --version) != '2.1.1' ]; then wget https://assets.membergetmember.co/software/phantomjs-2.1.1-linux-x86_64.tar.bz2 -O $PWD/travis_phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2; fi"
-  - "if [ $(phantomjs --version) != '2.1.1' ]; then tar -xvf $PWD/travis_phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2 -C $PWD/travis_phantomjs; fi"
-  - "phantomjs --version"
   - gem install bundler
-before_script: bundle exec rake alchemy:spec:prepare
+before_script:
+  - bundle exec rake alchemy:spec:prepare
+  - export PATH=$PATH:/usr/lib/chromium-browser/
 script: bundle exec rspec
 after_success: bundle exec codeclimate-test-reporter
 env:
-  - DB=mysql
-  - DB=postgresql
+- DB=mysql
+- DB=postgresql
 notifications:
   slack:
     secure: QzOFw1Ph69pzwWBFgtIVkOnjbcRxB9HPRQ+RYjK+2tg+fsbiTJ+wYgHcZL49tPYcLAls4kymkFWzWBF3PCAXJMfKgUCqXzdQ2FuJC/JoVRTLll4wDnZFPG33jsm5tVznmycZ3ma4+ZWfJQ+C+elEBOba6v1kG9eGIy6sH2cvXfE=

data/CHANGELOG.md

@@ -1,30 +1,11 @@
 # Change Log
 
-## 4.0.6 (2021-05-28)
+## 4.1.0 (unreleased)
 
-- Allow "data" key for module navigations [#1512](https://github.com/AlchemyCMS/alchemy_cms/pull/1512) ([mamhoff](https://github.com/mamhoff))
-
-## 4.0.5 (2018-09-17)
-
-- Do not cache sitemap in Turbolinks [#1463](https://github.com/AlchemyCMS/alchemy_cms/pull/1463) ([tvdeyen](https://github.com/tvdeyen))
-- Skip folded deeper levels when rendering page tree [#1324](https://github.com/AlchemyCMS/alchemy_cms/pull/1324) ([pascalj](https://github.com/pascalj))
-
-## 4.0.4 (2018-09-05)
-
-- Allow Kaminari 1.x [#1467](https://github.com/AlchemyCMS/alchemy_cms/pull/1467) ([tvdeyen](https://github.com/tvdeyen))
-
-## 4.0.3 (2018-05-14)
-
-- Add must_revalidate to cache-control header [#1340](https://github.com/AlchemyCMS/alchemy_cms/pull/1340) ([afdev82](https://github.com/afdev82))
-
-## 4.0.2 (2018-05-08)
-
-- Fix draggable trash item feature [#1429](https://github.com/AlchemyCMS/alchemy_cms/pull/1429) ([tvdeyen](https://github.com/tvdeyen))
-- Allow CanCanCan 2.x [#1418](https://github.com/AlchemyCMS/alchemy_cms/pull/1418) ([tvdeyen](https://github.com/tvdeyen))
-
-## 4.0.1 (2018-04-23)
-
-- Add more classes to YAML.safe_load [#1414](https://github.com/AlchemyCMS/alchemy_cms/pull/1414) ([tvdeyen](https://github.com/tvdeyen))
+* Replaces PNG icons with FontAwesome icon font [#1342](https://github.com/AlchemyCMS/alchemy_cms/pull/1342) by [tvdeyen](https://github.com/tvdeyen)
+* Remove pleaseWait overlay from links with GET requests [#1343](https://github.com/AlchemyCMS/alchemy_cms/pull/1343) by [tvdeyen](https://github.com/tvdeyen)
+* Removed fixed table headers from admin resource tables [#1339](https://github.com/AlchemyCMS/alchemy_cms/pull/1339) by [tvdeyen](https://github.com/tvdeyen)
+* Removed Bourbon Sass library [#1339](https://github.com/AlchemyCMS/alchemy_cms/pull/1339) by [tvdeyen](https://github.com/tvdeyen)
 
 ## 4.0.0 (2017-11-06)
 

data/Gemfile

@@ -2,17 +2,17 @@ source 'https://rubygems.org'
 
 gemspec
 
+gem 'rails', '~> 5.2.0'
+
 # Profiling
 gem 'rack-mini-profiler', group: :development, require: false
 
 gem 'sqlite3' if ENV['DB'].nil? || ENV['DB'] == 'sqlite'
-gem 'mysql2', '~> 0.3.18' if ENV['DB'] == 'mysql'
-gem 'pg'      if ENV['DB'] == 'postgresql'
+gem 'mysql2', '~> 0.5.1' if ENV['DB'] == 'mysql'
+gem 'pg',     '~> 1.0'   if ENV['DB'] == 'postgresql'
 gem 'sassc-rails'
 
 group :development, :test do
-  gem 'jasmine-rails',        github: 'searls/jasmine-rails'
-  gem 'jasmine-jquery-rails', github: 'travisjeffery/jasmine-jquery-rails'
   gem 'simplecov', require: false
   if ENV['TRAVIS']
     gem 'codeclimate-test-reporter', '~> 1.0', require: false
@@ -28,11 +28,14 @@ group :development, :test do
     gem 'spring-commands-rspec'
     gem 'rubocop', require: false
     gem 'listen'
+    gem 'localeapp', '~> 3.0', require: false
+    gem 'dotenv', '~> 2.2'
   end
-  gem 'capybara', '~> 2.4'
+  gem 'capybara', '~> 3.0'
+  gem 'capybara-screenshot', '~> 1.0'
   gem 'database_cleaner', '~> 1.3'
   gem 'factory_bot_rails', '~> 4.5'
-  gem 'poltergeist', '~> 1.10'
+  gem 'selenium-webdriver', '~> 3.8'
   gem 'rspec-activemodel-mocks', '~> 1.0'
   gem 'rspec-rails', '~> 3.0'
   gem 'shoulda-matchers', '~> 3.1'
@@ -41,6 +44,6 @@ end
 
 # We need this if we want to start the dummy app in production, ie on Teatro.io
 group :production do
-  gem 'uglifier', '>= 1.0.3'
+  gem 'uglifier', '>= 2.7.2'
   gem 'therubyracer'
 end

data/README.md

@@ -1,8 +1,11 @@
 [![Gem Version](https://badge.fury.io/rb/alchemy_cms.svg)](http://badge.fury.io/rb/alchemy_cms)
-[![Build Status](https://travis-ci.org/AlchemyCMS/alchemy_cms.svg?branch=4.0-stable)](https://travis-ci.org/AlchemyCMS/alchemy_cms)
-[![Code Climate](https://codeclimate.com/github/AlchemyCMS/alchemy_cms.svg)](https://codeclimate.com/github/AlchemyCMS/alchemy_cms)
-[![Test Coverage](https://codeclimate.com/github/AlchemyCMS/alchemy_cms/badges/coverage.svg)](https://codeclimate.com/github/AlchemyCMS/alchemy_cms)
-[![Slack Status](http://slack.alchemy-cms.com/badge.svg)](http://slack.alchemy-cms.com)
+[![Build Status](https://travis-ci.org/AlchemyCMS/alchemy_cms.svg?branch=master)](https://travis-ci.org/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)
+[![Slack Status](http://slackin.alchemy-cms.com/badge.svg)](http://slackin.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.0-stable)](https://github.com/AlchemyCMS/alchemy_cms/tree/4.0-stable).**
+
 
 ## About
 
@@ -61,16 +64,10 @@ For a Ruby 1.8.7 compatible version use the [`2.3-stable` branch](https://github
 Put this into your `Gemfile`:
 
 ```ruby
-gem 'alchemy_cms', github: 'AlchemyCMS/alchemy_cms', branch: '4.0-stable'
-```
-
-If you want to use Russian translation and have better i18n support, you should put:
-
-```ruby
-gem 'russian', '~> 0.6.0'
+gem 'alchemy_cms', github: 'AlchemyCMS/alchemy_cms', branch: 'master'
 ```
 
-or gem with similar functionality into your Gemfile.
+**NOTE:** You normally want to use a stable branch, like `4.0-stable`.
 
 #### 2. Update your bundle:
 
@@ -88,9 +85,11 @@ the Devise based user model that Alchemy provides and was extracted [into its ow
 If you don't have your own user class, you can use the Alchemy user model. Just add the following gem into your `Gemfile`:
 
 ```ruby
-gem 'alchemy-devise', github: 'AlchemyCMS/alchemy-devise', branch: '4.0-stable'
+gem 'alchemy-devise', github: 'AlchemyCMS/alchemy-devise', branch: 'master'
 ```
 
+**NOTE:** You normally want to use a stable branch, like `4.0-stable`.
+
 Then run:
 
 ```shell
@@ -163,7 +162,7 @@ For example, these settings:
 ```ruby
 # config/initializers/alchemy.rb
 
-Alchemy.admin_path = '/backend'
+Alchemy.admin_path = 'backend'
 Alchemy.admin_constraints = {subdomain: 'hidden'}
 ```
 
@@ -183,6 +182,9 @@ Please follow the guidelines about picture caching on the Dragonfly homepage for
 
 http://markevans.github.io/dragonfly/cache
 
+### Localization
+
+Alchemy ships with one default English translation for the admin interface. If you want to use the admin interface in other languages please have a look at the [`alchemy_i18n` project](https://github.com/AlchemyCMS/alchemy_cms).
 
 ## Upgrading
 

data/Rakefile

@@ -23,7 +23,7 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('app/**/*.rb')
 end
 
-APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
+APP_RAKEFILE = File.expand_path('spec/dummy/Rakefile', __dir__)
 load 'rails/tasks/engine.rake'
 
 require 'rspec/core'

data/alchemy_cms.gemspec

@@ -1,5 +1,5 @@
 # coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'alchemy/version'
 
@@ -20,17 +20,16 @@ Gem::Specification.new do |gem|
 
   gem.add_runtime_dependency 'active_model_serializers',         ['~> 0.9.0']
   gem.add_runtime_dependency 'acts_as_list',                     ['~> 0.3']
-  gem.add_runtime_dependency 'acts-as-taggable-on',              ['~> 5.0']
   gem.add_runtime_dependency 'awesome_nested_set',               ['~> 3.1']
-  gem.add_runtime_dependency 'bourbon',                          ['~> 4.2']
-  gem.add_runtime_dependency 'cancancan',                        ['>= 1.9', '< 3.0']
+  gem.add_runtime_dependency 'cancancan',                        ['~> 2.1']
   gem.add_runtime_dependency 'coffee-rails',                     ['~> 4.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']
-  gem.add_runtime_dependency 'jquery-rails',                     ['~> 4.0']
+  gem.add_runtime_dependency 'jquery-rails',                     ['~> 4.0', '>= 4.0.4']
   gem.add_runtime_dependency 'jquery-ui-rails',                  ['~> 5.0.0']
-  gem.add_runtime_dependency 'kaminari',                         ['>= 0.15', '< 2.0']
+  gem.add_runtime_dependency 'kaminari',                         ['~> 1.1']
   gem.add_runtime_dependency 'originator',                       ['~> 3.1']
   gem.add_runtime_dependency 'non-stupid-digest-assets',         ['~> 1.0.8']
   gem.add_runtime_dependency 'rails',                            ['~> 5.0', '< 6.0']
@@ -38,7 +37,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'request_store',                    ['~> 1.2']
   gem.add_runtime_dependency 'responders',                       ['~> 2.0']
   gem.add_runtime_dependency 'select2-rails',                    ['>= 3.5.9.1', '< 4.0']
-  gem.add_runtime_dependency 'simple_form',                      ['~> 3.0']
+  gem.add_runtime_dependency 'simple_form',                      ['~> 4.0']
   gem.add_runtime_dependency 'turbolinks',                       ['>= 2.5']
 
   gem.post_install_message = <<-MSG

data/app/assets/images/alchemy/alchemy-logo.svg

@@ -1,70 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 17.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="240.5px" height="70.575px" viewBox="0 0 240.5 70.575" enable-background="new 0 0 240.5 70.575" xml:space="preserve">
-<g>
-	<path fill="#33393F" d="M10.283,20.956h9.441l10.115,36.975h-8.26l-1.686-6.406H9.552l-1.685,6.406H0L10.283,20.956z M10.733,46.13
-		h7.979c-1.405-6.406-3.203-14.048-3.933-18.038C13.992,32.082,12.194,39.724,10.733,46.13z"/>
-	<path fill="#33393F" d="M40.796,57.931h-7.586V17.528l7.586-1.123V57.931z"/>
-	<path fill="#33393F" d="M65.07,56.021c-1.068,0.449-3.878,2.585-8.26,2.585c-7.53,0-11.688-4.72-11.688-14.667
-		c0-10.452,4.327-15.509,12.194-15.509c3.147,0,5.732,0.786,6.743,1.18l-0.899,5.563c-0.73-0.281-2.753-0.899-4.776-0.899
-		c-3.709,0-5.451,2.866-5.451,9.384c0,6.631,1.911,9.047,5.226,9.047c2.304,0,4.383-1.236,5.17-1.517L65.07,56.021z"/>
-	<path fill="#33393F" d="M67.992,17.528l7.586-1.123v16.352h0.112c0.787-0.731,3.372-4.327,7.98-4.327
-		c5.282,0,7.361,3.259,7.361,10.058v19.443h-7.586V40.343c0-4.159-0.674-5.339-2.978-5.339c-2.304,0-4.215,2.361-4.889,3.147v19.78
-		h-7.586V17.528z"/>
-	<path fill="#33393F" d="M116.936,55.852c-0.843,0.561-4.327,2.754-9.89,2.754c-6.519,0-11.8-4.215-11.8-14.33
-		c0-10.733,5.225-15.846,11.632-15.846c6.406,0,10.901,3.99,10.901,13.43c0,2.023-0.281,3.652-0.337,3.934h-14.666
-		c0.056,5.001,2.529,7.08,5.732,7.08c3.034,0,5.563-1.348,6.911-1.967L116.936,55.852z M102.775,41.073h7.698
-		c0-5.732-1.573-7.249-3.653-7.249C104.854,33.824,102.831,35.622,102.775,41.073z"/>
-	<path fill="#33393F" d="M122.273,29.048h6.687l0.337,3.878c0.844-1.012,2.979-4.495,7.25-4.495c3.259,0,5.282,1.124,6.125,4.439
-		c0.955-1.293,3.315-4.439,7.361-4.439c4.889,0,6.968,2.754,6.968,10.002v19.499h-7.53V39.05c0-2.529-0.394-4.046-2.361-4.046
-		c-1.967,0-3.484,2.248-3.877,3.147v19.78h-7.25V39.05c0-2.529-0.393-4.046-2.36-4.046c-1.967,0-3.428,2.192-3.878,3.147v19.78
-		h-7.474V29.048z"/>
-	<path fill="#33393F" d="M184.367,29.048l-9.496,30.513c-2.361,7.587-6.8,9.722-9.16,11.014c-0.787-1.011-2.641-3.596-3.372-4.608
-		c0.843-0.731,4.889-2.81,6.069-7.418l-9.103-29.501h7.923c0.843,3.428,3.878,16.071,4.72,20.792
-		c0.9-4.833,3.878-17.364,4.776-20.792H184.367z"/>
-</g>
-<g>
-	<polygon fill-rule="evenodd" clip-rule="evenodd" fill="#C7E4F5" points="196.981,19.066 186.023,22.016 177.996,13.958 
-		180.937,2.95 191.893,0 199.911,8.058 	"/>
-	<polygon fill-rule="evenodd" clip-rule="evenodd" fill="#33393F" points="201.487,31.458 195.325,33.114 190.819,28.588 
-		192.476,22.407 198.627,20.752 203.132,25.277 	"/>
-	<polygon fill-rule="evenodd" clip-rule="evenodd" fill="#88AD59" points="214.803,22.347 206.133,24.685 199.781,18.303 
-		202.098,9.593 210.778,7.255 217.13,13.637 	"/>
-</g>
-<g>
-	<path fill="#33393F" stroke="#33393F" d="M195.908,43.146c-0.337,0-0.755-0.264-1.253-0.792c-0.498-0.527-0.997-0.791-1.494-0.791
-		c-1.802,0-3.641,1.663-5.517,4.99c-1.656,2.945-2.484,5.246-2.484,6.902c0,1.846,0.777,2.769,2.33,2.769
-		c1.538,0,3.062-0.506,4.572-1.517c1.391-0.937,2.586-2.175,3.583-3.714c0.087-0.162,0.205-0.242,0.352-0.242
-		c0.175,0,0.344,0.118,0.506,0.352c0.161,0.234,0.219,0.425,0.175,0.571c-0.118,0.469-0.938,1.45-2.462,2.946
-		c-1.392,1.362-2.242,2.125-2.55,2.285c-1.451,0.792-2.36,1.188-2.726,1.188c-0.043,0-0.234,0.018-0.571,0.055
-		c-0.337,0.036-0.52,0.055-0.55,0.055c-1.524,0-2.674-0.55-3.45-1.648c-0.645-0.909-0.967-2.045-0.967-3.407
-		c0-2.154,0.967-4.777,2.902-7.869c2.227-3.561,4.586-5.348,7.077-5.363c0.425,0,1.048,0.183,1.869,0.549
-		c1.069,0.469,1.627,1.041,1.671,1.715c0.028,0.293-0.085,0.527-0.341,0.704C196.322,43.058,196.098,43.146,195.908,43.146z"/>
-	<path fill="#33393F" stroke="#33393F" d="M224.306,56.796c-1.261,0-2.294-0.915-3.1-2.748c-0.63-1.421-0.946-2.717-0.946-3.89
-		c0,0.278,0-0.432,0-2.132c0.029-1.113,0.015-1.977-0.043-2.593c-0.074-0.85-0.22-1.275-0.438-1.275
-		c-0.044,0-0.416,0.557-1.117,1.67c-2.38,3.723-3.665,5.715-3.854,5.98c-1.986,2.755-3.541,4.131-4.665,4.131
-		c-1.124,0-1.737-1.223-1.839-3.67c-0.029-0.674,0.036-2.807,0.198-6.397c0.029-0.806-0.036-1.208-0.198-1.208
-		c-0.469,0-1.7,1.81-3.692,5.429c-2.037,3.679-3.121,6.191-3.253,7.54c-0.044,0.542-0.381,0.813-1.011,0.813
-		c-0.293,0-0.557-0.469-0.791-1.407c-0.162-0.718-0.242-1.253-0.242-1.604c0-2.682,0.066-4.99,0.198-6.924
-		c0.117-1.787,0.342-3.304,0.676-4.55c0.35-1.348,0.75-2.023,1.2-2.023c0.32,0,0.615,0.118,0.884,0.352
-		c0.269,0.234,0.375,0.461,0.316,0.681c-0.864,3.122-1.311,6.33-1.34,9.628c1.579-2.843,2.675-4.74,3.29-5.692
-		c1.783-2.741,3.179-4.111,4.188-4.111c1.213,0,1.79,1.443,1.732,4.33c-0.012,0.308-0.048,1.003-0.108,2.088
-		c-0.06,0.997-0.089,1.787-0.089,2.373c0,1.129,0.109,1.986,0.328,2.572c0.527-0.162,1.441-1.114,2.743-2.858
-		c1.067-1.466,1.974-2.828,2.72-4.088c1.931-3.342,3.335-5.012,4.213-5.012c0.878,0,1.434,0.843,1.668,2.528
-		c0.073,1.041,0.182,2.638,0.329,4.792c0.264,3.912,0.951,5.884,2.066,5.913c0.425,0.015,0.803-0.202,1.132-0.649
-		c0.33-0.447,0.597-0.67,0.803-0.67c0.41,0,0.615,0.22,0.615,0.66c0,0.601-0.367,1.113-1.099,1.538
-		C225.207,56.635,224.716,56.796,224.306,56.796z"/>
-	<path fill="#33393F" stroke="#33393F" d="M239.23,42.421c-0.087,0-0.377-0.132-0.868-0.396c-0.491-0.264-0.86-0.403-1.109-0.417
-		c-0.997-0.088-2.389,0.637-4.176,2.175c-1.846,1.583-2.769,2.939-2.769,4.067c0,0.601,1.069,0.901,3.209,0.901
-		c4.131,0,6.198,1.15,6.198,3.45c0,1.627-0.914,3.085-2.742,4.374c-1.667,1.172-3.327,1.758-4.979,1.758
-		c-0.732,0-1.412-0.227-2.04-0.681c-0.732-0.513-1.097-1.18-1.097-2c0-0.337,0.145-0.733,0.435-1.187
-		c0.332-0.528,0.687-0.792,1.063-0.792c0.101,0,0.203,0.023,0.305,0.066c-0.053,0.513-0.137,0.909-0.255,1.188
-		c-0.065,0.161-0.097,0.329-0.097,0.506c0,0.658,0.394,0.989,1.183,0.989c1.213,0,2.602-0.396,4.166-1.187
-		c1.738-0.88,2.609-1.803,2.609-2.77c0-0.601-0.302-1.099-0.904-1.494c-0.5-0.322-1.051-0.498-1.652-0.527l-4.229-0.154
-		c-0.705-0.029-1.388-0.176-2.049-0.44c-0.896-0.352-1.343-0.82-1.343-1.406c0-1.451,1.14-3.287,3.418-5.506
-		c2.278-2.221,4.202-3.33,5.77-3.33c0.44,0,0.974,0.169,1.605,0.506c0.747,0.41,1.121,0.864,1.121,1.362
-		C240,42.106,239.743,42.421,239.23,42.421z"/>
-</g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="267" height="91" viewBox="0 0 267 91"><path d="M261.749 29.77h-9.812l-.72 2.738a193.53 193.53 0 0 0-.802 3.217c-.334-1.384-.604-2.5-.767-3.162l-.685-2.792H234.075c-1.102-.371-2.338-.564-3.705-.564-2.537 0-4.557.864-6.104 1.934-1.406-1.15-3.402-1.934-6.221-1.934-1.341 0-2.524.242-3.564.625l-.006-.061H201.334v4.17c-2.345-3.051-5.884-4.735-10.401-4.735-4.196 0-8.831 1.936-11.655 6.784-1.194-3.746-3.896-6.784-9.557-6.784-1.385 0-2.626.24-3.727.617v-12.19l-4.204.623-6.934 1.027-3.132.464v10.324a22.109 22.109 0 0 0-6.086-.864c-5.96 0-9.341 2.652-11.128 4.876-.108.133-.2.284-.303.422V17.633l-4.207.623-6.933 1.027-3.131.464v24.04l-5.118-18.709-.739-2.701H99.863l-.745 2.686L95.854 36.8 80.915 21.597a2.922 2.922 0 0 0-2.823-.776l-18.554 4.875a2.918 2.918 0 0 0-.634-.981L39.437 4.906a2.927 2.927 0 0 0-2.826-.777L9.797 11.173a2.92 2.92 0 0 0-2.073 2.054L.372 40.078a2.922 2.922 0 0 0 .735 2.818L20.6 62.705a2.921 2.921 0 0 0 2.822.774l9.259-2.43-3.051 11.1a2.921 2.921 0 0 0 .735 2.821l10.94 11.122a2.92 2.92 0 0 0 2.822.778l15.08-3.953a2.919 2.919 0 0 0 2.077-2.055l3.536-12.978.316.324a2.928 2.928 0 0 0 2.064.872c.254.001.508-.031.761-.098l20.839-5.48H103.275l.72-2.733.82-3.121h3.794l.822 3.122.718 2.732h24.059v-4.307c.07.092.133.194.207.282 1.729 2.119 5.001 4.643 10.76 4.643 2.735 0 4.945-.705 6.55-1.415v.797H180.119v-4.383c2.392 3.007 5.737 4.495 9.134 4.885-1.602 1.106-3.095 2.759-4.467 4.952-2.161 3.454-3.211 6.441-3.211 9.137 0 2.014.524 3.774 1.562 5.236 1.388 1.967 3.57 3.053 6.143 3.053.226 0 .384-.016.896-.073.142-.014.243-.025.312-.03 1.014-.043 2.078-.446 4.047-1.521.468-.248.973-.622 2.077-1.656.966 3.029 2.97 3.501 4.119 3.501 2.479 0 4.354-1.665 4.575-4.057.007-.045.041-.233.189-.649.774 1.335 2.059 2.415 4.188 2.415 2.658 0 4.791-2.088 6.555-4.378.065.155.132.312.203.47 1.794 4.082 4.646 4.694 6.185 4.694.76 0 1.52-.168 2.307-.503.228.213.463.419.726.605a6.818 6.818 0 0 0 3.993 1.302c2.273 0 4.515-.764 6.661-2.274 3.357-2.369 4.061-5.111 4.061-6.996 0-2.266-1.092-4.215-3.014-5.406a4.177 4.177 0 0 0 2.142-1.312c.918 1.27 1.794 2.475 2.303 3.129l1.917 2.468 2.74-1.503.268-.144c2.382-1.291 7.335-3.979 9.847-12.048l8.677-27.888 1.479-4.759h-4.984z" fill="none"/><path fill="#eca96e" d="M102.705 26.102h8.626l9.245 33.793h-7.549l-1.541-5.856h-9.448l-1.541 5.856h-7.189l9.397-33.793zm.411 23.008h7.291c-1.282-5.857-2.925-12.841-3.594-16.487-.719 3.647-2.362 10.63-3.697 16.487zm27.472 10.786h-6.931V22.969l6.931-1.026v37.953zm22.187-1.748c-.977.409-3.545 2.364-7.549 2.364-6.883 0-10.682-4.314-10.682-13.405 0-9.554 3.953-14.176 11.143-14.176 2.878 0 5.239.719 6.163 1.079l-.822 5.083c-.666-.256-2.517-.822-4.365-.822-3.388 0-4.981 2.62-4.981 8.579 0 6.061 1.747 8.267 4.775 8.267 2.108 0 4.008-1.128 4.726-1.386l1.592 4.417zm2.671-35.179l6.931-1.026v14.943h.105c.717-.667 3.079-3.954 7.291-3.954 4.826 0 6.728 2.979 6.728 9.193v17.771h-6.934V43.819c0-3.801-.616-4.879-2.721-4.879-2.107 0-3.853 2.157-4.47 2.876v18.079h-6.931V22.969zm44.73 35.026c-.771.514-3.956 2.518-9.038 2.518-5.957 0-10.785-3.852-10.785-13.097 0-9.811 4.775-14.484 10.63-14.484 5.854 0 9.963 3.646 9.963 12.273 0 1.851-.257 3.339-.309 3.597h-13.401c.05 4.571 2.311 6.469 5.235 6.469 2.773 0 5.086-1.231 6.319-1.795l1.386 4.519zm-12.941-13.509h7.034c0-5.237-1.437-6.624-3.338-6.624-1.798 0-3.646 1.643-3.696 6.624zm17.82-10.989h6.107l.31 3.543c.772-.925 2.722-4.109 6.624-4.109 2.98 0 4.828 1.027 5.598 4.057.874-1.181 3.03-4.057 6.728-4.057 4.468 0 6.37 2.517 6.37 9.141v17.823h-6.883V42.637c0-2.311-.358-3.697-2.158-3.697-1.797 0-3.183 2.054-3.543 2.876v18.079h-6.625V42.637c0-2.311-.358-3.697-2.157-3.697-1.796 0-3.131 2.003-3.542 2.876v18.079h-6.828V33.497zm56.744 0l-8.679 27.887c-2.156 6.934-6.213 8.886-8.37 10.067-.718-.926-2.414-3.287-3.081-4.213.771-.668 4.467-2.566 5.546-6.778l-8.318-26.963h7.239c.771 3.132 3.545 14.688 4.314 19.002.821-4.417 3.545-15.87 4.367-19.002h6.982z"/><g><path fill="#eca96e" d="M193.986 68.011c.319 0 .667.193 1.031.578.897.95 1.506 1.125 2.353.546.367-.254.548-.633.508-1.05-.054-.799-.66-1.456-1.799-1.957-.818-.364-1.438-.541-1.896-.541-2.436.013-4.74 1.736-6.854 5.116-1.807 2.889-2.722 5.389-2.722 7.435 0 1.336.326 2.474.969 3.379.796 1.128 1.983 1.701 3.526 1.701.029 0 .213-.016.555-.054.268-.028.427-.045.47-.046.306 0 .867-.139 2.703-1.14.226-.117.704-.468 2.439-2.166 1.932-1.896 2.285-2.549 2.366-2.884.084-.275.01-.583-.22-.921-.238-.344-.523-.518-.838-.518a.786.786 0 0 0-.708.429c-.872 1.35-1.932 2.444-3.146 3.266-1.295.868-2.615 1.308-3.923 1.308-.778 0-1.671-.234-1.671-2.074 0-1.427.742-3.47 2.211-6.08 1.621-2.872 3.183-4.327 4.646-4.327zm30.25 10.553c-.354 0-.695.247-1.103.798-.301.408-.535.409-.654.408-.259-.01-1.135-.388-1.441-4.977l-.305-4.414c-.25-1.795-.915-2.704-1.979-2.704-.68 0-1.78.545-4.245 4.804a46.07 46.07 0 0 1-2.457 3.695c-.936 1.256-1.511 1.87-1.856 2.171-.082-.436-.124-.979-.124-1.635 0-.533.027-1.253.081-2.143.055-.995.089-1.633.101-1.925.039-2.004-.251-3.293-.885-3.941a1.569 1.569 0 0 0-1.157-.483c-1.114 0-2.453 1.26-4.214 3.968-.44.683-1.144 1.88-2.093 3.565.149-2.311.529-4.59 1.141-6.795.071-.267.054-.669-.433-1.089-.33-.287-.703-.436-1.107-.436-.863 0-1.277 1.173-1.539 2.19-.313 1.16-.526 2.592-.635 4.245-.119 1.754-.181 3.891-.181 6.36 0 .357.075.868.233 1.577.203.807.5 1.631 1.17 1.631.813 0 1.32-.423 1.381-1.157.113-1.165 1.095-3.422 2.918-6.71 1.54-2.804 2.334-3.953 2.701-4.42 0 .089 0 .194-.005.32-.15 3.265-.211 5.245-.182 5.886.105 2.516.823 3.792 2.139 3.792 1.21 0 2.685-1.261 4.636-3.968.255-.355 2.324-3.588 3.537-5.488.234-.37.414-.648.545-.854.012.086.021.184.031.293.052.55.064 1.329.038 2.328v2.002c.01 1.115.313 2.354.903 3.685.812 1.851 1.907 2.786 3.252 2.786.459 0 .972-.164 1.575-.502.819-.475 1.234-1.083 1.234-1.804.001-.652-.392-1.059-1.021-1.059zm6.628-4.902c-2.19 0-2.468-.365-2.475-.365 0-.874.821-2.04 2.372-3.37 1.809-1.556 2.828-1.882 3.366-1.882.036 0 .073.003.123.006.072.004.298.046.826.328.721.386.872.415 1.009.415.727 0 1.163-.494 1.163-1.324 0-.631-.425-1.187-1.268-1.647-.651-.35-1.201-.517-1.684-.517-1.572 0-3.401 1.039-5.592 3.175-2.195 2.138-3.262 3.892-3.262 5.361 0 .738.509 1.313 1.518 1.711.65.258 1.33.402 2.023.432l3.86.141c.473.023.891.157 1.28.407.556.367.619.737.619.983 0 .86-1.161 1.629-2.133 2.122-1.358.688-2.57 1.035-3.598 1.035-.625 0-.625-.247-.625-.444 0-.104.017-.197.054-.283.126-.3.213-.694.266-1.218l.035-.339-.312-.132c-.656-.279-1.311.032-1.813.841-.316.495-.47.93-.47 1.33 0 .904.4 1.646 1.192 2.199a3.557 3.557 0 0 0 2.134.712c1.598 0 3.218-.569 4.811-1.693 1.794-1.263 2.701-2.733 2.701-4.371.002-2.398-2.057-3.613-6.12-3.613z"/></g><g fill-rule="evenodd" clip-rule="evenodd" fill="#eca96e"><path d="M47.632 51.588L23.382 57.956 5.754 40.043 12.401 15.762 36.65 9.393 54.254 27.305z"/><path d="M57.42 79.029L43.781 82.603 33.888 72.543 37.632 58.91 51.244 55.334 61.138 65.395z"/><path d="M86.963 59.079L67.775 64.128 53.829 49.94 59.066 30.726 78.277 25.679 92.223 39.865z"/></g></svg>

data/app/assets/images/alchemy/icon.svg

@@ -1,14 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 17.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="28px" height="28px" viewBox="0 0 28 28" enable-background="new 0 0 28 28" xml:space="preserve">
-<g>
-	<polygon fill-rule="evenodd" clip-rule="evenodd" fill="#C7E4F5" points="13.584,15.795 5.744,17.906 0,12.141 2.104,4.265 
-		9.943,2.154 15.68,7.919 	"/>
-	<polygon fill-rule="evenodd" clip-rule="evenodd" fill="#33393F" points="16.807,24.662 12.399,25.846 9.175,22.608 10.36,18.186 
-		14.761,17.001 17.984,20.239 	"/>
-	<polygon fill-rule="evenodd" clip-rule="evenodd" fill="#88AD59" points="26.335,18.143 20.131,19.815 15.587,15.249 17.245,9.018 
-		23.455,7.345 28,11.911 	"/>
-</g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="-4 -6 32 32" class="svg-inline--fa fa-lg fa-fw"><path fill="currentColor" d="M15.7 7.9L9.9 2.2 2.1 4.3 0 12.1l5.7 5.8 7.8-2.1 2.2-7.9zm-5.3 10.3l-1.2 4.4 3.2 3.2 4.4-1.2 1.2-4.4-3.2-3.2-4.4 1.2zM23.5 7.3L17.2 9l-1.7 6.2 4.5 4.6 6.2-1.7 1.7-6.2-4.4-4.6z"/></svg>