alchemy_cms 4.1.0.rc1 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7c6e6c1f40e4383311b0a9957b13821fa7016452762aeb0c5f4d84d82064939
-  data.tar.gz: 639a56f67ce75ce52cc937acfc83e2a9d86c0047c3ee07f923f77c9ba79d3075
+  metadata.gz: bbe62e8c54256149001175961c97976329047d9d74c51f1651075b4dd103ce7e
+  data.tar.gz: 34ce79ac45dd9e2d5f245ef86438a26a9c3a0d6a76863d6ccb4aebb30fcf23a4
 SHA512:
-  metadata.gz: b0f19bf04cab697f7cca03f324edd068ecd935124967253dbfd03581647a876b0b2f31cfdd6dc57ac8e9cbd86c366fa18b827f7114aeaea362d87f36c99b436c
-  data.tar.gz: 3763b1f005cd66a6da77165c9ed8c9ba28f7851c3ec798cfc0153238cd3ecbca475c6ba4e82e85d13493eb978b0c572cbcf38179ba15610fbb3b3696d8da8e28
+  metadata.gz: a02c9a806ad4b85e11874b5a203637ef6329a0003df928f374efb73f4ebbbd8b0bda6c207df7899459eb181e92c51b76c79d334385985d16e1fbe91a849a68c3
+  data.tar.gz: 2c42c60dcca6d7cf212478c8b445c644a5deffdbadb38c7abb3888cb1e7eaefe35e48e698e38329a4a3c5ea68e5d090b8ad3a63ee67545054cb8e401e6025674

data/CHANGELOG.md

@@ -1,42 +1,92 @@
-## 4.1.0 (unreleased)
-
-- New picture thumbnail style [#1447](https://github.com/AlchemyCMS/alchemy_cms/pull/1447) ([tvdeyen](https://github.com/tvdeyen))
+## 4.1.0 (2018-09-22)
+
+- Use console.warn for Alchemy.debug [#1476](https://github.com/AlchemyCMS/alchemy_cms/pull/1476) ([tvdeyen](https://github.com/tvdeyen))
+- Fixes picture per page in overlay [#1475](https://github.com/AlchemyCMS/alchemy_cms/pull/1475) ([tvdeyen](https://github.com/tvdeyen))
+- Style adjustments [#1474](https://github.com/AlchemyCMS/alchemy_cms/pull/1474) ([tvdeyen](https://github.com/tvdeyen))
+- Simplify pagination implementation [#1471](https://github.com/AlchemyCMS/alchemy_cms/pull/1471) ([mamhoff](https://github.com/mamhoff))
+- Try .any? to prevent error in dashboard on online users [#1469](https://github.com/AlchemyCMS/alchemy_cms/pull/1469) ([askl56](https://github.com/askl56))
+- Update changelog for 4.0.4 release [#1468](https://github.com/AlchemyCMS/alchemy_cms/pull/1468) ([tvdeyen](https://github.com/tvdeyen))
+- Do not cache sitemap in Turbolinks [#1463](https://github.com/AlchemyCMS/alchemy_cms/pull/1463) ([tvdeyen](https://github.com/tvdeyen))
+- Fix sorting in Resources controller [#1462](https://github.com/AlchemyCMS/alchemy_cms/pull/1462) ([mamhoff](https://github.com/mamhoff))
+- Fix removing picture essences [#1460](https://github.com/AlchemyCMS/alchemy_cms/pull/1460) ([mamhoff](https://github.com/mamhoff))
+- Upgrade ransack to version 2.0.0 [#1458](https://github.com/AlchemyCMS/alchemy_cms/pull/1458) ([depfu](https://github.com/marketplace/depfu))
+- Toolbar icon vertical alignment fixes [#1450](https://github.com/AlchemyCMS/alchemy_cms/pull/1450) ([tvdeyen](https://github.com/tvdeyen))
+- Fix tidy task [#1449](https://github.com/AlchemyCMS/alchemy_cms/pull/1449) ([mamhoff](https://github.com/mamhoff))
+- Update changelog [#1448](https://github.com/AlchemyCMS/alchemy_cms/pull/1448) ([tvdeyen](https://github.com/tvdeyen))
+- New thumbnail style [#1447](https://github.com/AlchemyCMS/alchemy_cms/pull/1447) ([tvdeyen](https://github.com/tvdeyen))
+- Styling fixes [#1446](https://github.com/AlchemyCMS/alchemy_cms/pull/1446) ([tvdeyen](https://github.com/tvdeyen))
+- Do not prevent default click handling in Element editor [#1445](https://github.com/AlchemyCMS/alchemy_cms/pull/1445) ([mamhoff](https://github.com/mamhoff))
+- Fix content container height [#1443](https://github.com/AlchemyCMS/alchemy_cms/pull/1443) ([tvdeyen](https://github.com/tvdeyen))
+- Use max instead of sort.last in update check [#1442](https://github.com/AlchemyCMS/alchemy_cms/pull/1442) ([tvdeyen](https://github.com/tvdeyen))
 - Use optional: true for optional belongs_to associations [#1441](https://github.com/AlchemyCMS/alchemy_cms/pull/1441) ([tvdeyen](https://github.com/tvdeyen))
 - Set parent element id when pasting from clipboard [#1440](https://github.com/AlchemyCMS/alchemy_cms/pull/1440) ([tvdeyen](https://github.com/tvdeyen))
 - Add must_revalidate to cache-control header [#1439](https://github.com/AlchemyCMS/alchemy_cms/pull/1439) ([afdev82](https://github.com/afdev82))
+- Update README.md [#1438](https://github.com/AlchemyCMS/alchemy_cms/pull/1438) ([agorneo](https://github.com/agorneo))
+- Add a pull request template [#1436](https://github.com/AlchemyCMS/alchemy_cms/pull/1436) ([tvdeyen](https://github.com/tvdeyen))
+- Add a feature request template [#1435](https://github.com/AlchemyCMS/alchemy_cms/pull/1435) ([tvdeyen](https://github.com/tvdeyen))
+- Add a GitHub issue template [#1434](https://github.com/AlchemyCMS/alchemy_cms/pull/1434) ([tvdeyen](https://github.com/tvdeyen))
+- Picture zoom UX enhancements [#1431](https://github.com/AlchemyCMS/alchemy_cms/pull/1431) ([tvdeyen](https://github.com/tvdeyen))
+- Fix draggable trash item feature [#1428](https://github.com/AlchemyCMS/alchemy_cms/pull/1428) ([tvdeyen](https://github.com/tvdeyen))
 - Load Jcrop selection gif via asset pipeline [#1427](https://github.com/AlchemyCMS/alchemy_cms/pull/1427) ([tvdeyen](https://github.com/tvdeyen))
+- Color and styles adjustments [#1426](https://github.com/AlchemyCMS/alchemy_cms/pull/1426) ([tvdeyen](https://github.com/tvdeyen))
 - Extract tags css rules into own file [#1424](https://github.com/AlchemyCMS/alchemy_cms/pull/1424) ([tvdeyen](https://github.com/tvdeyen))
 - Adjust the welcome screen to new color theme [#1423](https://github.com/AlchemyCMS/alchemy_cms/pull/1423) ([tvdeyen](https://github.com/tvdeyen))
+- Fixes menubar layout [#1422](https://github.com/AlchemyCMS/alchemy_cms/pull/1422) ([tvdeyen](https://github.com/tvdeyen))
 - Update jquery-ui-rails to 6.0 [#1420](https://github.com/AlchemyCMS/alchemy_cms/pull/1420) ([tvdeyen](https://github.com/tvdeyen))
+- Allow CanCanCan 2.x [#1418](https://github.com/AlchemyCMS/alchemy_cms/pull/1418) ([tvdeyen](https://github.com/tvdeyen))
 - Add a Heroku Deploy button [#1416](https://github.com/AlchemyCMS/alchemy_cms/pull/1416) ([tvdeyen](https://github.com/tvdeyen))
-- Upgrade simple_form to 4.0 [#1413](https://github.com/AlchemyCMS/alchemy_cms/pull/1413) ([depfu](https://github.com/apps/depfu))
+- Upgrade simple_form to version 4.0 [#1413](https://github.com/AlchemyCMS/alchemy_cms/pull/1413) ([depfu](https://github.com/marketplace/depfu))
+- Do not require localeapp gem [#1412](https://github.com/AlchemyCMS/alchemy_cms/pull/1412) ([tvdeyen](https://github.com/tvdeyen))
+- Fix all Rubocop offenses and update some config [#1411](https://github.com/AlchemyCMS/alchemy_cms/pull/1411) ([tvdeyen](https://github.com/tvdeyen))
+- Upgrade mysql2 to version 0.5.1 [#1410](https://github.com/AlchemyCMS/alchemy_cms/pull/1410) ([depfu](https://github.com/marketplace/depfu))
 - Capybara 3.0 support [#1409](https://github.com/AlchemyCMS/alchemy_cms/pull/1409) ([tvdeyen](https://github.com/tvdeyen))
 - Handle zero plural resource names [#1407](https://github.com/AlchemyCMS/alchemy_cms/pull/1407) ([dbwinger](https://github.com/dbwinger))
+- Update rubocop config [#1404](https://github.com/AlchemyCMS/alchemy_cms/pull/1404) ([tvdeyen](https://github.com/tvdeyen))
+- Explicitly set the Rails version in dummy app [#1403](https://github.com/AlchemyCMS/alchemy_cms/pull/1403) ([tvdeyen](https://github.com/tvdeyen))
 - Do not reload essence classes in dev mode [#1400](https://github.com/AlchemyCMS/alchemy_cms/pull/1400) ([tvdeyen](https://github.com/tvdeyen))
 - Move all translations into `alchemy_i18n` extension [#1398](https://github.com/AlchemyCMS/alchemy_cms/pull/1398) ([tvdeyen](https://github.com/tvdeyen))
 - Add `nested_elements` to serialized element json [#1397](https://github.com/AlchemyCMS/alchemy_cms/pull/1397) ([tvdeyen](https://github.com/tvdeyen))
+- Fix YAML safe_load [#1395](https://github.com/AlchemyCMS/alchemy_cms/pull/1395) ([tvdeyen](https://github.com/tvdeyen))
 - Fix passing html options to form builder submit input [#1394](https://github.com/AlchemyCMS/alchemy_cms/pull/1394) ([tvdeyen](https://github.com/tvdeyen))
+- Darker blue dialogs [#1393](https://github.com/AlchemyCMS/alchemy_cms/pull/1393) ([tvdeyen](https://github.com/tvdeyen))
 - New orange logo [#1392](https://github.com/AlchemyCMS/alchemy_cms/pull/1392) ([tvdeyen](https://github.com/tvdeyen))
 - Use Open Sans for admin font [#1391](https://github.com/AlchemyCMS/alchemy_cms/pull/1391) ([tvdeyen](https://github.com/tvdeyen))
 - Use ActiveRecord touching [#1390](https://github.com/AlchemyCMS/alchemy_cms/pull/1390) ([tvdeyen](https://github.com/tvdeyen))
+- correct scss typo [#1388](https://github.com/AlchemyCMS/alchemy_cms/pull/1388) ([oniram88](https://github.com/oniram88))
 - Add Rails 5.2 support [#1387](https://github.com/AlchemyCMS/alchemy_cms/pull/1387) ([tvdeyen](https://github.com/tvdeyen))
+- Update Gutentag [#1386](https://github.com/AlchemyCMS/alchemy_cms/pull/1386) ([tvdeyen](https://github.com/tvdeyen))
+- Fix resources search [#1384](https://github.com/AlchemyCMS/alchemy_cms/pull/1384) ([tvdeyen](https://github.com/tvdeyen))
+- Fixate Gutentag to 2.1.0 for now [#1383](https://github.com/AlchemyCMS/alchemy_cms/pull/1383) ([tvdeyen](https://github.com/tvdeyen))
+- Skip migrate-to-gutentag migration for fresh installs [#1381](https://github.com/AlchemyCMS/alchemy_cms/pull/1381) ([tvdeyen](https://github.com/tvdeyen))
+- More prominent active menu color [#1380](https://github.com/AlchemyCMS/alchemy_cms/pull/1380) ([tvdeyen](https://github.com/tvdeyen))
 - Use at least jquery-rails 4.0.4 [#1378](https://github.com/AlchemyCMS/alchemy_cms/pull/1378) ([tvdeyen](https://github.com/tvdeyen))
+- Give capybara more time to render pictures [#1377](https://github.com/AlchemyCMS/alchemy_cms/pull/1377) ([tvdeyen](https://github.com/tvdeyen))
+- A few admin layout refinements [#1374](https://github.com/AlchemyCMS/alchemy_cms/pull/1374) ([tvdeyen](https://github.com/tvdeyen))
 - Upgrade cancancan to version 2.1 [#1372](https://github.com/AlchemyCMS/alchemy_cms/pull/1372) ([depfu](https://github.com/apps/depfu))
 - Upgrade kaminari to version 1.1 [#1370](https://github.com/AlchemyCMS/alchemy_cms/pull/1370) ([depfu](https://github.com/apps/depfu))
-- Use Gutentag for tags [#1364](https://github.com/AlchemyCMS/alchemy_cms/pull/1364) ([tvdeyen](https://github.com/tvdeyen))
 - Remove all old migration files [#1367](https://github.com/AlchemyCMS/alchemy_cms/pull/1367) ([tvdeyen](https://github.com/tvdeyen))
+- Upgrade mysql2 to version 0.4.10 [#1366](https://github.com/AlchemyCMS/alchemy_cms/pull/1366) ([depfu](https://github.com/marketplace/depfu))
+- Upgrade pg to version 1.0.0 [#1365](https://github.com/AlchemyCMS/alchemy_cms/pull/1365) ([depfu](https://github.com/marketplace/depfu))
+- Use Gutentag for tags [#1364](https://github.com/AlchemyCMS/alchemy_cms/pull/1364) ([tvdeyen](https://github.com/tvdeyen))
+- Update Rubocop config [#1363](https://github.com/AlchemyCMS/alchemy_cms/pull/1363) ([tvdeyen](https://github.com/tvdeyen))
 - Compress 4.0 migrations [#1362](https://github.com/AlchemyCMS/alchemy_cms/pull/1362) ([tvdeyen](https://github.com/tvdeyen))
 - Removes 3.x upgraders [#1361](https://github.com/AlchemyCMS/alchemy_cms/pull/1361) ([tvdeyen](https://github.com/tvdeyen))
+- Get rid of Rails 5.2 deprecations [#1360](https://github.com/AlchemyCMS/alchemy_cms/pull/1360) ([tvdeyen](https://github.com/tvdeyen))
 - Fix API response for users able to edit content [#1356](https://github.com/AlchemyCMS/alchemy_cms/pull/1356) ([tvdeyen](https://github.com/tvdeyen))
 - Remove jasmine gems [#1355](https://github.com/AlchemyCMS/alchemy_cms/pull/1355) ([tvdeyen](https://github.com/tvdeyen))
 - Remove translations provided by ActiveModel [#1354](https://github.com/AlchemyCMS/alchemy_cms/pull/1354) ([pelargir](https://github.com/pelargir))
 - Update bundled TinyMCE to 4.7.5 [#1353](https://github.com/AlchemyCMS/alchemy_cms/pull/1353) ([tvdeyen](https://github.com/tvdeyen))
 - New color theme [#1352](https://github.com/AlchemyCMS/alchemy_cms/pull/1352) ([tvdeyen](https://github.com/tvdeyen))
 - Only scroll to element if focused from preview [#1351](https://github.com/AlchemyCMS/alchemy_cms/pull/1351) ([tvdeyen](https://github.com/tvdeyen))
+- Don't prevent submit event of element save button [#1349](https://github.com/AlchemyCMS/alchemy_cms/pull/1349) ([tvdeyen](https://github.com/tvdeyen))
+- Use FA calendar icons for EssenceDate picker [#1348](https://github.com/AlchemyCMS/alchemy_cms/pull/1348) ([tvdeyen](https://github.com/tvdeyen))
 - Use headless chrome for feature tests [#1347](https://github.com/AlchemyCMS/alchemy_cms/pull/1347) ([tvdeyen](https://github.com/tvdeyen))
+- Refactor the preview window JS code [#1346](https://github.com/AlchemyCMS/alchemy_cms/pull/1346) ([tvdeyen](https://github.com/tvdeyen))
 - New table styles [#1344](https://github.com/AlchemyCMS/alchemy_cms/pull/1344) ([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)
+- Replaces PNG icons with FontAwesome icon font [#1342](https://github.com/AlchemyCMS/alchemy_cms/pull/1342) by [tvdeyen](https://github.com/tvdeyen)
+- Ensure to use pg < 1.0 in tests [#1341](https://github.com/AlchemyCMS/alchemy_cms/pull/1341) ([tvdeyen](https://github.com/tvdeyen))
+- Add must_revalidate to cache-control header [#1340](https://github.com/AlchemyCMS/alchemy_cms/pull/1340) ([afdev82](https://github.com/afdev82))
 - 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)
 - Add possibility to add a suffix to the page title [#1331](https://github.com/AlchemyCMS/alchemy_cms/pull/1331) ([jrieger](https://github.com/jrieger))
@@ -44,6 +94,10 @@
 - Check if file exists on disk before calling identify [#1327](https://github.com/AlchemyCMS/alchemy_cms/pull/1327) ([chalmagean](https://github.com/chalmagean))
 - 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))

data/README.md

@@ -194,17 +194,19 @@ 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).
+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_i18n).
 
 ## Upgrading
 
-The Alchemy team takes upgrades very seriously and tries to make them as smooth as we can.
-Therefore we have build in upgrade tasks, that try to automate as much as possible.
-
-That's why after updating the Alchemy gem you should **always run the upgrader**:
+We, the Alchemy team, take upgrades very seriously and we try to make them as smooth as possible.
+Therefore we have build an upgrade task, that tries to automate the upgrade procedure as much as possible.
 
+That's why after the Alchemy gem has been updated, with explicit call to:
 ```shell
 $ bundle update alchemy_cms
+```
+you should **always run the upgrader**:
+```shell
 $ bin/rake alchemy:upgrade
 ```
 
@@ -217,7 +219,7 @@ Also, `git diff` is your friend.
 
 ### Customize the upgrade preparation
 
-The Alchemy upgrader comes prepared with with several rake tasks in a specific order.
+The Alchemy upgrader comes prepared with several rake tasks in a specific order.
 This is sometimes not what you want or could even break upgrades.
 In order to customize the upgrade preparation process you can instead run each of the tasks on their own.
 
@@ -316,7 +318,7 @@ Alchemy specs are written **in RSpec 3**. Please **do not use deprecated RSpec 2
 * Read the guidelines: http://guides.alchemy-cms.com.
 * Read the documentation: http://rubydoc.info/github/AlchemyCMS/alchemy_cms
 * If you found a bug please use the [issue tracker on Github](https://github.com/AlchemyCMS/alchemy_cms/issues).
-* For questions about general usage please use [Stack Overflow](http://stackoverflow.com/questions/tagged/alchemy-cms), [the User Group](http://groups.google.com/group/alchemy-cms) or the [IRC channel](irc://irc.freenode.net#alchemy_cms).
+* For questions about general usage please use [Stack Overflow](http://stackoverflow.com/questions/tagged/alchemy-cms), [the User Group](http://groups.google.com/group/alchemy-cms) or the [Slack](https://slackin.alchemy-cms.com).
 * New features should be discussed on our [Trello Board](https://trello.com/alchemycms).
 
 **PLEASE** don't use the Github issues for feature requests. If you want to contribute to Alchemy please [read the contribution guidelines](https://github.com/AlchemyCMS/alchemy_cms/blob/master/CONTRIBUTING.md) before doing so.
@@ -330,7 +332,7 @@ Alchemy specs are written **in RSpec 3**. Please **do not use deprecated RSpec 2
 * Issue-Tracker: <https://github.com/AlchemyCMS/alchemy_cms/issues>
 * Sourcecode: <https://github.com/AlchemyCMS/alchemy_cms>
 * User Group: <http://groups.google.com/group/alchemy-cms>
-* IRC Channel: <irc://irc.freenode.net#alchemy_cms>
+* Slack: <https://slackin.alchemy-cms.com>
 * Discussion Board: <https://trello.com/alchemycms>
 * Twitter: <https://twitter.com/alchemy_cms>
 

data/alchemy_cms.gemspec

@@ -33,7 +33,7 @@ Gem::Specification.new do |gem|
   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']
-  gem.add_runtime_dependency 'ransack',                          ['~> 1.4']
+  gem.add_runtime_dependency 'ransack',                          ['~> 2.0']
   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']

data/app/assets/javascripts/alchemy/alchemy.base.js.coffee

@@ -64,8 +64,7 @@ $.extend Alchemy,
     $element = $form_field.closest(".element-editor")
     if $form_field[0]
       $form_field.val ""
-      $form_field.prev().remove()
-      $form_field.parent().html '<i class="icon far fa-image fa-fw"/>'
+      $element.find(".thumbnail_background").html('<i class="icon far fa-image fa-fw"/>')
       Alchemy.setElementDirty $element
     false
 
@@ -104,8 +103,7 @@ $.extend Alchemy,
   # Logs exception to js console, if present.
   debug: (e) ->
     if window["console"]
-      console.debug e
-      console.trace()
+      console.warn(e)
     return
 
   # Logs errors to js console, if present.

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

@@ -11,7 +11,7 @@
   border-color: $error_border_color;
   color: $error_text_color;
   background-color: lighten($error_background_color, 8%);
-  box-shadow: inset 1px 1px 4px rgba($error_border_color, 0.5);
+  box-shadow: inset 0px 0 1px rgba($error_border_color, 0.5);
 }
 
 %default-input-style {

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

@@ -17,14 +17,15 @@
   $background-color: $button-bg-color,
   $hover-color: $button-hover-bg-color,
   $hover-border-color: $button-hover-border-color,
-  $border-radius: $default-border-radius,
+  $border-radius: $button-border-radius,
   $border: $button-border-width solid $button-border-color,
+  $box-shadow: $button-box-shadow,
   $padding: $button-padding,
   $margin: $button-margin,
   $color: $button-text-color,
   $line-height: $form-field-line-height,
   $focus-border-color: $button-focus-border-color,
-  $focus-box-shadow: 0 0 2px $focus-border-color) {
+  $focus-box-shadow: $button-focus-box-shadow) {
   display: inline-block;
   font-family: $default-font-family;
   font-size: $default-font-size;
@@ -34,7 +35,7 @@
   cursor: pointer;
   border-radius: $border-radius;
   background-color: $background-color;
-  box-shadow: $button-box-shadow;
+  box-shadow: $box-shadow;
   border: $border;
   color: $color;
   margin: $margin;
@@ -49,7 +50,8 @@
   }
 
   &:active, &:active:focus {
-    border-color: $button-border-color;
+    border-color: $hover-border-color;
+    box-shadow: none;
   }
 
   &:focus {
@@ -62,7 +64,7 @@
   &.disabled, &[disabled],
   &.disabled:active, &[disabled]:active,
   &.disabled:hover, &[disabled]:hover {
-    background-color: transparentize($button-bg-color, 0.25);
+    background-color: transparentize($button-bg-color, 0.5);
     cursor: not-allowed;
     box-shadow: none;
   }
@@ -85,16 +87,6 @@
   font-size: $default-font-size;
 }
 
-@mixin form-heading {
-  border-bottom: 1px solid #CECECE;
-  padding-right: 8px;
-  margin-top: 8px;
-  text-align: right;
-  font-weight: normal;
-  color: #585858;
-  text-transform: uppercase;
-}
-
 @mixin form-value-display {
   float: right;
   width: $form-right-width;
@@ -176,6 +168,7 @@
     $border: 1px solid $linked-border-color,
     $hover-border-color: darken($linked-border-color, 10%),
     $border-radius: $border-radius,
+    $box-shadow: none,
     $padding: $padding,
     $margin: 0
   );

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

@@ -10,12 +10,14 @@ $dark-gray-blue: rgb(51, 59, 81);
 $light_yellow: #fbfbd8;
 $orange: #ffd77a;
 $dark-orange: #eca96e;
+$very-dark-orange: darken($dark-orange, 20%);
 $white: #fff;
 
 $text-color: rgba($dark-gray-blue, 0.8) !default;
 $muted-text-color: rgba($dark-gray-blue, 0.5) !default;
 $icon-color: rgba($dark-gray-blue, 0.75) !default;
 $linked-color: $orange !default;
+$anchor-color: $very-dark-orange !default;
 
 $body-background-color: $light-gray !default;
 
@@ -27,7 +29,7 @@ $small-font-size: 0.9em !default;
 $default-font-style: $default-font-size $default-font-family !default;
 
 $dialog-header-height: 36px !default;
-$dialog-header-color: $dark-gray-blue !default;
+$dialog-header-color: $dark-blue !default;
 $dialog-header-text-color: $white !default;
 $dialog-header-font-size: $default-font-size !default;
 $dialog-box-shadow: 0 8px 16px rgba(35, 35, 35, 0.5) !default;
@@ -61,22 +63,24 @@ $form-field-disabled-bg-color: rgba($white, 0.5) !default;
 
 $focus-color: rgba($dark-orange, 0.75) !default;
 
-$button-bg-color: rgba($dark-orange, 0.75) !default;
-$button-hover-bg-color: $dark-orange !default;
-$button-border-color: transparent !default;
-$button-border-width: 2px !default;
+$button-bg-color: $white !default;
+$button-hover-bg-color: transparent !default;
+$button-border-color: $default-border-color !default;
+$button-border-width: 1px !default;
+$button-border-radius: $default-border-radius !default;
 $button-text-color: $text-color !default;
-$button-hover-border-color: transparent !default;
-$button-focus-border-color: $button-text-color !default;
-$button-font-weight: bold !default;
+$button-hover-border-color: $default-border-color !default;
+$button-focus-border-color: $dark-orange !default;
+$button-font-weight: 700 !default;
 $button-text-shadow: none !default;
-$button-box-shadow: none !default;
-$button-padding: 0.5em 2em !default;
+$button-box-shadow: 0px 1px 1px -1px #333 !default;
+$button-focus-box-shadow: 0px 1px 1px 0px $button-focus-border-color !default;
+$button-padding: 0.55em 2em !default;
 $button-margin: $form-field-margin !default;
 
 $secondary-button-bg-color: transparent !default;
-$secondary-button-text-color: $button-text-color !default;
-$secondary-button-border-color: $button-bg-color !default;
+$secondary-button-text-color: $text-color !default;
+$secondary-button-border-color: $default-border-color !default;
 
 $linked-button-color: rgba($linked-color, 0.75) !default;
 $linked-border-color: darken($linked-color, 10%) !default;
@@ -108,9 +112,9 @@ $sitemap-highlight-color: rgba(#fffba5, 0.5) !default;
 
 $main-menu-width: 150px !default;
 $collapsed-main-menu-width: 48px !default;
-$main-menu-bg-color: $dark-gray-blue !default;
+$main-menu-bg-color: $dark-blue !default;
 $main-menu-active-bg-color: $dark-orange !default;
-$main-menu-active-text-color: $dark-gray-blue !default;
+$main-menu-active-text-color: $dark-blue !default;
 $main-menu-text-color: $white !default;
 $main-menu-icon-color: $white !default;
 $main-menu-entry-max-width: 100px !default;
@@ -123,7 +127,7 @@ $text-shadow-light: rgba($white, 0.5) 0 0 4px !default;
 $transition-duration: 250ms !default;
 $transition-easing: linear !default;
 
-$tooltip-background-color: lighten($dark-gray-blue, 15%) !default;
+$tooltip-background-color: $dark-blue !default;
 
 $addon-icon-opacity: 0.85 !default;
 
@@ -149,4 +153,7 @@ $datepicker_day_bg: $light-gray !default;
 $datepicker_day_border: 1px solid $medium-gray !default;
 $datepicker_day_color: $text-color !default;
 
+$select-hover-bg-color: $dark-blue !default;
+$select-hover-text-color: $white !default;
+
 $thumbnail-background-color: opacify($default-border-color, 1) !default;

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

@@ -38,6 +38,7 @@
 @import "alchemy/tables";
 @import "alchemy/tags";
 @import "alchemy/trash";
+@import "alchemy/typography";
 @import "alchemy/lists";
 @import "alchemy/upload";
 @import "alchemy/jquery-ui";

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

@@ -163,8 +163,7 @@ div#library_sidebar {
   top: 0;
   right: 0;
   width: 232px;
-  padding-top: 96px;
-  padding: 84px 4*$default-padding 0 4*$default-padding;
+  padding: 86px 4*$default-padding 0 4*$default-padding;
   height: 100%;
   z-index: 3;
   background-color: $light-gray;

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

@@ -50,47 +50,10 @@ body {
   }
 }
 
-h1 {
-  padding: 0;
-  margin: 2*$default-margin;
-  font-weight: bold;
-  font-size: $default-font-size;
-
-  &.resources-header {
-    position: fixed;
-    width: 100%;
-    top: 75px;
-    left: $main-menu-width + 9px;
-    z-index: 2;
-    margin: 0 -8px;
-    padding: 16px;
-    background-color: $light-gray;
-  }
-}
-
-h2 {
-  margin: $default-margin 0;
-  padding-bottom: $default-padding;
-  clear: both;
-  font-weight: bold;
-  font-size: $default-font-size;
-}
-
-h3 {
-  margin: $default-margin 0;
-  padding-bottom: $default-padding;
-  font-size: $default-font-size;
-  font-weight: bold;
-}
-
-p {
-  margin: 0 0 2*$default-margin 0;
-  white-space: normal;
-}
-
 a {
-  color: $text-color;
+  color: inherit;
   text-decoration: none;
+  transition: $transition-duration;
 
   &:hover {
     text-decoration: underline;
@@ -109,22 +72,22 @@ form {
   margin-bottom: 0;
 }
 
-ul {
-  padding-left: 16px;
-  margin-top: 1em;
-  margin-bottom: 1em;
-
-  li {
-    margin-bottom: 0.5em;
-  }
-}
-
 hr {
   border: 0 none;
   border-bottom: 1px solid;
   opacity: 0.5;
 }
 
+.panel {
+  width: 80%;
+  max-width: 500px;
+  margin: 2em auto;
+  padding: 4*$default-padding;
+  border: $default-border;
+  background: $medium-gray;
+  border-radius: $default-border-radius;
+}
+
 .float_right { float: right }
 
 .float_left { float: left }
@@ -133,16 +96,6 @@ hr {
   text-align: center;
 }
 
-kbd {
-  font-family: Courier, monospaced;
-  background: $medium-gray;
-  border: $default-border;
-  padding: 0.25em 0.5em;
-  vertical-align: top;
-  margin-right: 1ex;
-  border-radius: $default-border-radius;
-}
-
 .top-rounded-border {
   @include border-top-radius($default-border-radius);
 }