[Commits] [fluid-project/infusion] 7e770c: Merge remote-tracking branch 'jon/FLUID-4949' into...

GitHub noreply at github.com
Wed Mar 27 15:42:46 EDT 2013


  Branch: refs/heads/demo
  Home:   https://github.com/fluid-project/infusion
  Commit: 7e770c0ca7a3f37921b2c4c303eb5f7d6292601d
      https://github.com/fluid-project/infusion/commit/7e770c0ca7a3f37921b2c4c303eb5f7d6292601d
  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/css/UIOptions.css
    A src/webapp/components/uiOptions/css/fonts/UIO.dev.svg
    A src/webapp/components/uiOptions/css/fonts/UIO.eot
    A src/webapp/components/uiOptions/css/fonts/UIO.svg
    A src/webapp/components/uiOptions/css/fonts/UIO.ttf
    A src/webapp/components/uiOptions/css/fonts/UIO.woff
    M src/webapp/components/uiOptions/html/UIOptionsTemplate-contrast.html
    M src/webapp/components/uiOptions/html/UIOptionsTemplate-layout.html
    M src/webapp/components/uiOptions/html/UIOptionsTemplate-lineSpacer.html
    M src/webapp/components/uiOptions/html/UIOptionsTemplate-links.html
    M src/webapp/components/uiOptions/html/UIOptionsTemplate-textFont.html
    M src/webapp/components/uiOptions/html/UIOptionsTemplate-textSizer.html

  Log Message:
  -----------
  Merge remote-tracking branch 'jon/FLUID-4949' into FLUID-4951

Conflicts:
	src/webapp/components/uiOptions/css/FatPanelUIOptionsFrame.css
	src/webapp/components/uiOptions/html/FatPanelUIOptions.html


  Commit: 002865306fe7da83aee5d2141ea07589ed5fa021
      https://github.com/fluid-project/infusion/commit/002865306fe7da83aee5d2141ea07589ed5fa021
  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

  Log Message:
  -----------
  FLUID-4951: Added indicator arrow. Themeing issues tho.


  Commit: 3aeac94e695437ca1e57aa05087e5804429fa44a
      https://github.com/fluid-project/infusion/commit/3aeac94e695437ca1e57aa05087e5804429fa44a
  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/html/UIOptionsTemplate-contrast.html
    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/js/uiOptionsDemo.js
    M src/webapp/integration-demos/uiOptions/js/uiOptionsExtra.js
    M src/webapp/integration-demos/uiOptions/main.css
    M src/webapp/integration-demos/uiOptions/templates/FatPanelUIOptions.html
    M src/webapp/integration-demos/uiOptions/templates/UIOptionsTemplate-selfVoicing.html
    M src/webapp/integration-demos/uiOptions/templates/UIOptionsTemplate-simplifiedContent.html

  Log Message:
  -----------
  FLUID-4951: Indicator arrow for contrast


  Commit: 51ebcac61957616212c59d3b04264139f63a499d
      https://github.com/fluid-project/infusion/commit/51ebcac61957616212c59d3b04264139f63a499d
  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

  Log Message:
  -----------
  NO-JIRA: tweaked height of panels


  Commit: a85e8d2123aa00fadb6111bd01f249f263ba74e6
      https://github.com/fluid-project/infusion/commit/a85e8d2123aa00fadb6111bd01f249f263ba74e6
  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

  Log Message:
  -----------
  FLUID-4951: Cross-browser solution


  Commit: 452c6ec39a2534ba70a19c2671b91659684c51e9
      https://github.com/fluid-project/infusion/commit/452c6ec39a2534ba70a19c2671b91659684c51e9
  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/html/UIOptionsTemplate-contrast.html

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

* heidiv/FLUID-4951:
  FLUID-4951: Cross-browser solution
  NO-JIRA: tweaked height of panels
  FLUID-4951: Added indicator arrow. Themeing issues tho.

Conflicts:
	src/webapp/components/uiOptions/css/FatPanelUIOptionsFrame.css
	src/webapp/components/uiOptions/html/UIOptionsTemplate-layout.html


Compare: https://github.com/fluid-project/infusion/compare/97186f6625b0...452c6ec39a25


More information about the Commits mailing list