[Commits] [fluid-project/infusion] 49d5fd: Merge branch 'FLUID-4323' into FLUID-4323-demo

GitHub noreply at github.com
Tue Mar 26 16:27:09 EDT 2013


  Branch: refs/heads/demo
  Home:   https://github.com/fluid-project/infusion
  Commit: 49d5fdbea9ef04488079ab0e69d141b08efc8ae5
      https://github.com/fluid-project/infusion/commit/49d5fdbea9ef04488079ab0e69d141b08efc8ae5
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2013-03-26 (Tue, 26 Mar 2013)

  Changed paths:
    M src/webapp/integration-demos/uiOptions/ClimateChange.html
    M src/webapp/integration-demos/uiOptions/main.css

  Log Message:
  -----------
  Merge branch 'FLUID-4323' into FLUID-4323-demo


  Commit: 75cfe4559378c6d0677a3fc0123618e524f40364
      https://github.com/fluid-project/infusion/commit/75cfe4559378c6d0677a3fc0123618e524f40364
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2013-03-26 (Tue, 26 Mar 2013)

  Changed paths:
    M src/webapp/integration-demos/uiOptions/ClimateChange.html
    M src/webapp/integration-demos/uiOptions/main.css

  Log Message:
  -----------
  FLUID-4323: Clean-up of HTML and improvements to semantics of markup.


  Commit: 4a780f71edb95df634c1d468008bdda689e11bbd
      https://github.com/fluid-project/infusion/commit/4a780f71edb95df634c1d468008bdda689e11bbd
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2013-03-26 (Tue, 26 Mar 2013)

  Log Message:
  -----------
  Merge branch 'demo' into FLUID-4323-demo


  Commit: 004fd994b43db852c83a13768b947d206b59f262
      https://github.com/fluid-project/infusion/commit/004fd994b43db852c83a13768b947d206b59f262
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2013-03-26 (Tue, 26 Mar 2013)

  Changed paths:
    M src/webapp/integration-demos/uiOptions/ClimateChange.html
    A src/webapp/integration-demos/uiOptions/images/head_title_black.png
    A src/webapp/integration-demos/uiOptions/images/head_title_white.png
    A src/webapp/integration-demos/uiOptions/images/head_title_yellow.png
    M src/webapp/integration-demos/uiOptions/main.css

  Log Message:
  -----------
  FLUID-4323: Changes for high-contrast.


  Commit: b2d079d70f5262ea13f2adc052833628e52df758
      https://github.com/fluid-project/infusion/commit/b2d079d70f5262ea13f2adc052833628e52df758
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2013-03-26 (Tue, 26 Mar 2013)

  Changed paths:
    M src/webapp/components/uiOptions/js/SettingsPanels.js
    M src/webapp/tests/component-tests/uiOptions/html/TextfieldSlider-test.html
    M src/webapp/tests/component-tests/uiOptions/js/UIOptionsTests.js

  Log Message:
  -----------
  Merge branch 'demo' into FLUID-4323-demo


  Commit: abe7a4c0c05dcf136548be2c438f22f8ea62c0ea
      https://github.com/fluid-project/infusion/commit/abe7a4c0c05dcf136548be2c438f22f8ea62c0ea
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2013-03-26 (Tue, 26 Mar 2013)

  Changed paths:
    M src/webapp/integration-demos/uiOptions/ClimateChange.html
    A src/webapp/integration-demos/uiOptions/images/head_title_black.png
    A src/webapp/integration-demos/uiOptions/images/head_title_white.png
    A src/webapp/integration-demos/uiOptions/images/head_title_yellow.png
    M src/webapp/integration-demos/uiOptions/main.css

  Log Message:
  -----------
  Merge branch 'FLUID-4323' into FLUID-4323-demo


  Commit: 2eaf60231d27f91021ab5128133991239e67e591
      https://github.com/fluid-project/infusion/commit/2eaf60231d27f91021ab5128133991239e67e591
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2013-03-26 (Tue, 26 Mar 2013)

  Changed paths:
    M src/webapp/integration-demos/uiOptions/ClimateChange.html
    A src/webapp/integration-demos/uiOptions/images/mid_nav_bullet-black.gif
    A src/webapp/integration-demos/uiOptions/images/mid_nav_bullet-white.gif
    A src/webapp/integration-demos/uiOptions/images/mid_nav_bullet-yellow.gif
    R src/webapp/integration-demos/uiOptions/images/search_submit.png
    R src/webapp/integration-demos/uiOptions/images/share_this.gif
    M src/webapp/integration-demos/uiOptions/main.css

  Log Message:
  -----------
  FLUID-4323: More changes for high-contrast.


  Commit: aa7a095e632516167548fbeb8d464d2941e056c3
      https://github.com/fluid-project/infusion/commit/aa7a095e632516167548fbeb8d464d2941e056c3
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2013-03-26 (Tue, 26 Mar 2013)

  Changed paths:
    M src/webapp/integration-demos/uiOptions/ClimateChange.html
    M src/webapp/integration-demos/uiOptions/js/uiOptionsDemo.js
    M src/webapp/integration-demos/uiOptions/js/uiOptionsExtra.js

  Log Message:
  -----------
  Merge branch 'demo' into FLUID-4323-demo

Conflicts:
	src/webapp/integration-demos/uiOptions/ClimateChange.html


  Commit: 17f77dd02019eb864ea9c17d49474560c7c63b13
      https://github.com/fluid-project/infusion/commit/17f77dd02019eb864ea9c17d49474560c7c63b13
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2013-03-26 (Tue, 26 Mar 2013)

  Changed paths:
    M src/webapp/integration-demos/uiOptions/ClimateChange.html
    A src/webapp/integration-demos/uiOptions/images/mid_nav_bullet-black.gif
    A src/webapp/integration-demos/uiOptions/images/mid_nav_bullet-white.gif
    A src/webapp/integration-demos/uiOptions/images/mid_nav_bullet-yellow.gif
    R src/webapp/integration-demos/uiOptions/images/search_submit.png
    R src/webapp/integration-demos/uiOptions/images/share_this.gif
    M src/webapp/integration-demos/uiOptions/main.css

  Log Message:
  -----------
  Merge branch 'FLUID-4323' into FLUID-4323-demo


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

  Changed paths:
    M src/webapp/integration-demos/uiOptions/ClimateChange.html
    A src/webapp/integration-demos/uiOptions/images/head_title_black.png
    A src/webapp/integration-demos/uiOptions/images/head_title_white.png
    A src/webapp/integration-demos/uiOptions/images/head_title_yellow.png
    A src/webapp/integration-demos/uiOptions/images/mid_nav_bullet-black.gif
    A src/webapp/integration-demos/uiOptions/images/mid_nav_bullet-white.gif
    A src/webapp/integration-demos/uiOptions/images/mid_nav_bullet-yellow.gif
    R src/webapp/integration-demos/uiOptions/images/search_submit.png
    R src/webapp/integration-demos/uiOptions/images/share_this.gif
    M src/webapp/integration-demos/uiOptions/main.css

  Log Message:
  -----------
  Merge remote-tracking branch 'acheetham/FLUID-4323-demo' into demo

* acheetham/FLUID-4323-demo:
  FLUID-4323: More changes for high-contrast.
  FLUID-4323: Changes for high-contrast.
  FLUID-4323: Clean-up of HTML and improvements to semantics of markup.


Compare: https://github.com/fluid-project/infusion/compare/34cf2e5b2b0f...fc1f8306b092


More information about the Commits mailing list