[ckan-changes] [ckan/ckan] bbffa3: Fix issue #4109

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/ckan/ckan
  Commit: bbffa380cde428c5696b679771ab4fa493a03009
      https://github.com/ckan/ckan/commit/bbffa380cde428c5696b679771ab4fa493a03009
  Author: Goce Mitevski <goce.mitevski at keitaro.com>
  Date:   2018-03-12 (Mon, 12 Mar 2018)

  Changed paths:
    M ckan/public/base/less/masthead.less

  Log Message:
  -----------
  Fix issue #4109


  Commit: 8c37431bfcba2b34efdbf0620371ba0187e01032
      https://github.com/ckan/ckan/commit/8c37431bfcba2b34efdbf0620371ba0187e01032
  Author: Goce Mitevski <goce.mitevski at keitaro.com>
  Date:   2018-03-12 (Mon, 12 Mar 2018)

  Changed paths:
    M ckan/config/environment.py
    M ckan/public/base/css/fuchsia.css
    M ckan/public/base/css/green.css
    M ckan/public/base/css/main.css
    M ckan/public/base/css/maroon.css
    M ckan/public/base/css/red.css
    M ckan/public/base/javascript/modules/custom-fields.js
    M ckan/public/base/less/bootstrap-variables.less
    M ckan/public/base/less/nav.less
    M ckan/public/base/less/search.less
    M ckan/public/base/less/variables.less
    M ckan/public/base/test/spec/modules/custom-fields.spec.js
    M ckan/templates-bs2/group/snippets/group_form.html
    M ckan/templates-bs2/organization/snippets/organization_form.html
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/home/snippets/search.html
    M ckan/templates/organization/snippets/organization_form.html
    M ckan/templates/snippets/search_form.html
    M ckan/tests/config/test_environment.py
    M contrib/docker/ckan-entrypoint.sh
    M contrib/docker/docker-compose.yml

  Log Message:
  -----------
  Merge branch 'master' of github.com:ckan/ckan into navbar-collapse-responsive


  Commit: c5c92504e594752d8b2f047614e0f943f60db54c
      https://github.com/ckan/ckan/commit/c5c92504e594752d8b2f047614e0f943f60db54c
  Author: Konstantin Sivakov <konstantin.sivakov at keitaro.com>
  Date:   2018-03-14 (Wed, 14 Mar 2018)

  Changed paths:
    M ckan/public/base/less/masthead.less

  Log Message:
  -----------
  Merge pull request #4110 from gocemitevski/navbar-collapse-responsive

Navbar collapse responsive


Compare: https://github.com/ckan/ckan/compare/ac4df0acdc54...c5c92504e594