[Commits] [fluid-project/infusion] 0bbfde: Merge remote-tracking branch 'upstream/demo' into ...

GitHub noreply at github.com
Wed Mar 27 16:33:07 EDT 2013


  Branch: refs/heads/demo
  Home:   https://github.com/fluid-project/infusion
  Commit: 0bbfde31917f4cc746b9cafda2190a2898798cfb
      https://github.com/fluid-project/infusion/commit/0bbfde31917f4cc746b9cafda2190a2898798cfb
  Author: heidi valles <hvalles at ocad.ca>
  Date:   2013-03-27 (Wed, 27 Mar 2013)

  Changed paths:
    M src/webapp/components/uiOptions/css/FatPanelUIOptions.css
    M src/webapp/integration-demos/uiOptions/ClimateChange.html
    M src/webapp/integration-demos/uiOptions/templates/FatPanelUIOptions.html

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/demo' into FLUID-4952


  Commit: 5cccd33a58b4930e308b5a880539fb1cef2aba70
      https://github.com/fluid-project/infusion/commit/5cccd33a58b4930e308b5a880539fb1cef2aba70
  Author: heidi valles <hvalles at ocad.ca>
  Date:   2013-03-27 (Wed, 27 Mar 2013)

  Changed paths:
    M src/webapp/components/uiOptions/css/FatPanelUIOptionsFrame.css
    M src/webapp/components/uiOptions/js/SettingsPanels.js

  Log Message:
  -----------
  FLUID-4952: Themed UIO itself


  Commit: b073be4849192fa5e72a584d596420a095955923
      https://github.com/fluid-project/infusion/commit/b073be4849192fa5e72a584d596420a095955923
  Author: heidi valles <hvalles at ocad.ca>
  Date:   2013-03-27 (Wed, 27 Mar 2013)

  Changed paths:
    M src/webapp/components/uiOptions/css/UIOptions.css
    R src/webapp/components/uiOptions/css/fonts/UIO.dev.svg
    R src/webapp/components/uiOptions/css/fonts/UIO.svg
    M src/webapp/components/uiOptions/html/UIOptionsTemplate-layout.html
    M src/webapp/components/uiOptions/html/UIOptionsTemplate-links.html
    M src/webapp/integration-demos/uiOptions/ClimateChange.html
    M src/webapp/integration-demos/uiOptions/js/uiOptionsExtra.js
    M src/webapp/integration-demos/uiOptions/main.css
    M src/webapp/integration-demos/uiOptions/templates/UIOptionsTemplate-selfVoicing.html
    M src/webapp/integration-demos/uiOptions/templates/UIOptionsTemplate-simplifiedContent.html

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/demo' into FLUID-4952


  Commit: 4c7852f3f0ca098961272d7dc50d721842e9f3a6
      https://github.com/fluid-project/infusion/commit/4c7852f3f0ca098961272d7dc50d721842e9f3a6
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2013-03-27 (Wed, 27 Mar 2013)

  Changed paths:
    M src/webapp/components/uiOptions/css/FatPanelUIOptionsFrame.css
    M src/webapp/components/uiOptions/js/SettingsPanels.js

  Log Message:
  -----------
  Merge remote-tracking branch 'heidiv/FLUID-4952' into demo

* heidiv/FLUID-4952:
  FLUID-4952: Themed UIO itself


Compare: https://github.com/fluid-project/infusion/compare/ab5f3e88fcaa...4c7852f3f0ca


More information about the Commits mailing list