[ckan-changes] [ckan/ckan] 0bdf26: Update less version, to avoid merge main.css confl...

[GitHub]

  Branch: refs/heads/3484_revision_ui_removal2
  Home:   https://github.com/ckan/ckan
  Commit: 0bdf262651207f1818348e7474d356b2eecda8fc
      https://github.com/ckan/ckan/commit/0bdf262651207f1818348e7474d356b2eecda8fc
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2018-01-02 (Tue, 02 Jan 2018)

  Changed paths:
    M doc/contributing/frontend/index.rst

  Log Message:
  -----------
  Update less version, to avoid merge main.css conflicts in future. Clearly the last person to use less used a more recent version (than 2.5.2) because the color values in main.css are no longer long-hand (e.g. main.css has #ffffff rather than the #fff short-hand found in the .less file)


  Commit: 626a88fa5cf81146581b2ab373589971b6d8fee7
      https://github.com/ckan/ckan/commit/626a88fa5cf81146581b2ab373589971b6d8fee7
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2018-01-02 (Tue, 02 Jan 2018)

  Changed paths:
    M ckan/controllers/package.py
    M ckan/public/base/css/main.css
    M ckan/public/base/less/dataset.less
    M ckan/templates-bs2/package/read.html
    M ckan/templates-bs2/package/resource_read.html
    M ckan/templates-bs2/package/resources.html
    M ckan/templates-bs2/package/snippets/resource_item.html
    M ckan/templates-bs2/package/snippets/resources.html
    M ckan/templates-bs2/package/snippets/resources_list.html
    M ckan/templates/package/read.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/resources.html
    M ckan/templates/package/snippets/resource_item.html
    M ckan/templates/package/snippets/resources.html
    M ckan/templates/package/snippets/resources_list.html

  Log Message:
  -----------
  Resource links and resource page now take the activity_id param so you can look at old versions of those too.


Compare: https://github.com/ckan/ckan/compare/2a8f384f6f9c...626a88fa5cf8