[zanata/zanata-platform] f93311: Merge remote-tracking branch 'origin/master' into ...

[GitHub]

  Branch: refs/heads/ZNTA-2224
  Home:   https://github.com/zanata/zanata-platform
  Commit: f933111aa7858112f204f09c0bbbe29845f24b98
      https://github.com/zanata/zanata-platform/commit/f933111aa7858112f204f09c0bbbe29845f24b98
  Author: Unknown <kgough at redhat.com>
  Date:   2017-10-11 (Wed, 11 Oct 2017)

  Changed paths:
    A server/zanata-frontend/src/frontend/.stylelintrc
    M server/zanata-frontend/src/frontend/app/components/VersionTMMergeModal/VersionTMMergeModal.story.js
    M server/zanata-frontend/src/frontend/app/editor/components/ActivityFeedItem/index.js
    M server/zanata-frontend/src/frontend/app/editor/components/RejectTranslationModal/RejectTranslationModal.story.js
    R server/zanata-frontend/src/frontend/app/styles/bstrap-styleguide.css
    A server/zanata-frontend/src/frontend/app/styles/bstrap-styleguide.less
    M server/zanata-frontend/src/frontend/app/styles/style.less
    R server/zanata-frontend/src/frontend/package-lock.json
    M server/zanata-frontend/src/frontend/package.json
    M server/zanata-frontend/src/frontend/postcss.config.js
    M server/zanata-frontend/src/frontend/webpack.config.js
    M server/zanata-frontend/src/frontend/yarn.lock

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into ZNTA-2224


  Commit: 2f1b3f560b5dd7651774d6e7276dca18ff711dff
      https://github.com/zanata/zanata-platform/commit/2f1b3f560b5dd7651774d6e7276dca18ff711dff
  Author: kgough <kgough at redhat.com>
  Date:   2017-10-11 (Wed, 11 Oct 2017)

  Changed paths:
    M server/zanata-frontend/src/frontend/app/editor/components/Button/index.css
    M server/zanata-frontend/src/frontend/app/editor/components/Dropdown/index.css
    M server/zanata-frontend/src/frontend/app/editor/components/EditorSearchInput/EditorSearchInput.test.js
    M server/zanata-frontend/src/frontend/app/editor/components/EditorSearchInput/index.css
    M server/zanata-frontend/src/frontend/app/editor/components/EditorSearchInput/index.js
    M server/zanata-frontend/src/frontend/app/editor/components/GlossaryTermModal/index.css
    M server/zanata-frontend/src/frontend/app/editor/containers/Root/index.css
    M server/zanata-frontend/src/frontend/app/editor/containers/SuggestionDetailsModal/index.css

  Log Message:
  -----------
  fix(ZNTA-2224) tidy up of editor component css, fix modal vertical scrolling in editor


  Commit: 2602c8cd8729f30b298407269833def2c5804a9f
      https://github.com/zanata/zanata-platform/commit/2602c8cd8729f30b298407269833def2c5804a9f
  Author: kgough <kgough at redhat.com>
  Date:   2017-10-11 (Wed, 11 Oct 2017)

  Changed paths:
    M server/zanata-frontend/src/frontend/app/editor/components/FilterToggle/index.css
    M server/zanata-frontend/src/frontend/app/editor/components/InputGroup/index.css
    M server/zanata-frontend/src/frontend/app/editor/components/ProgressBar/index.css
    M server/zanata-frontend/src/frontend/app/editor/components/SplitDropdown/index.css
    M server/zanata-frontend/src/frontend/app/editor/components/ToggleSwitch/index.css
    M server/zanata-frontend/src/frontend/app/editor/containers/SuggestionDetailsModal/index.css

  Log Message:
  -----------
  fix(ZNTA-2224) tidied the rest of the editor component folder css


Compare: https://github.com/zanata/zanata-platform/compare/f933111aa785^...2602c8cd8729