[Commits] [fluid-project/infusion] 34ebac: FLUID-4949: Added icon fonts. Added font styles to...

GitHub noreply at github.com
Wed Mar 27 14:49:18 EDT 2013


  Branch: refs/heads/demo
  Home:   https://github.com/fluid-project/infusion
  Commit: 34ebacf199593d7febc59075c895e2a409f5f316
      https://github.com/fluid-project/infusion/commit/34ebacf199593d7febc59075c895e2a409f5f316
  Author: Jonathan Hung <jhung at ocad.ca>
  Date:   2013-03-27 (Wed, 27 Mar 2013)

  Changed paths:
    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/FatPanelUIOptions.html
    M src/webapp/components/uiOptions/html/UIOptionsTemplate-contrast.html
    M src/webapp/components/uiOptions/html/UIOptionsTemplate-textSizer.html

  Log Message:
  -----------
  FLUID-4949: Added icon fonts. Added font styles to UIOptions.css. Started to add icons to the headers of the UIO panels.


  Commit: e346c707001fde710f4067b2f98f496da483ef29
      https://github.com/fluid-project/infusion/commit/e346c707001fde710f4067b2f98f496da483ef29
  Author: Jonathan Hung <jhung 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
    M src/webapp/components/uiOptions/css/fonts/UIO.dev.svg
    M src/webapp/components/uiOptions/css/fonts/UIO.eot
    M src/webapp/components/uiOptions/css/fonts/UIO.svg
    M src/webapp/components/uiOptions/css/fonts/UIO.ttf
    M src/webapp/components/uiOptions/css/fonts/UIO.woff
    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

  Log Message:
  -----------
  FLUID-4949: Added missing line spacing font, text style, and simplify. Changed the text colours.


  Commit: c1266b3f23bc2905e3338fa12a012740b9d185a4
      https://github.com/fluid-project/infusion/commit/c1266b3f23bc2905e3338fa12a012740b9d185a4
  Author: Jonathan Hung <jhung at ocad.ca>
  Date:   2013-03-27 (Wed, 27 Mar 2013)

  Changed paths:
    M src/webapp/components/uiOptions/css/FatPanelUIOptions.css
    M src/webapp/components/uiOptions/css/FatPanelUIOptionsFrame.css
    M src/webapp/components/uiOptions/html/FatPanelUIOptions.html
    M src/webapp/components/uiOptions/html/UIOptionsTemplate-contrast.html
    M src/webapp/components/uiOptions/html/UIOptionsTemplate-layout.html
    M src/webapp/components/uiOptions/js/FatPanelUIOptions.js
    M src/webapp/components/uiOptions/js/SettingsPanels.js
    M src/webapp/demos/uiOptions/css/uiOptions.css
    M src/webapp/demos/uiOptions/html/uiOptions.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
    M src/webapp/tests/component-tests/uiOptions/html/FatPanelUIOptions-test.html
    M src/webapp/tests/component-tests/uiOptions/js/FatPanelUIOptionsTests.js

  Log Message:
  -----------
  NO-JIRA: merging changes from the demo branch.


  Commit: c56bf359fc68210864f666b7886b91a0bb0b803a
      https://github.com/fluid-project/infusion/commit/c56bf359fc68210864f666b7886b91a0bb0b803a
  Author: Jonathan Hung <jhung at ocad.ca>
  Date:   2013-03-27 (Wed, 27 Mar 2013)

  Changed paths:
    M src/webapp/components/uiOptions/css/UIOptions.css
    M src/webapp/components/uiOptions/html/UIOptionsTemplate-layout.html
    M src/webapp/integration-demos/uiOptions/templates/UIOptionsTemplate-selfVoicing.html
    M src/webapp/integration-demos/uiOptions/templates/UIOptionsTemplate-simplifiedContent.html

  Log Message:
  -----------
  FLUID-4949: Added icons for text-to-speech and simplify.


  Commit: c20e1c03ddbf6e871631e2e8dcccd2a98e560223
      https://github.com/fluid-project/infusion/commit/c20e1c03ddbf6e871631e2e8dcccd2a98e560223
  Author: Jonathan Hung <jhung 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/js/uiOptionsDemo.js
    M src/webapp/integration-demos/uiOptions/templates/FatPanelUIOptions.html

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


  Commit: 630de477e8b1f7d2c91d59d7f11bcef23b542647
      https://github.com/fluid-project/infusion/commit/630de477e8b1f7d2c91d59d7f11bcef23b542647
  Author: Jonathan Hung <jhung at ocad.ca>
  Date:   2013-03-27 (Wed, 27 Mar 2013)

  Changed paths:
    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-links.html

  Log Message:
  -----------
  FLUID-4949, FLUID-4938: Removed unused font SVG files. Tweaked the text used in the emphasize links and buttons panel.


  Commit: 97186f6625b0331d690df7bf582f3886a0851917
      https://github.com/fluid-project/infusion/commit/97186f6625b0331d690df7bf582f3886a0851917
  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/css/UIOptions.css
    A src/webapp/components/uiOptions/css/fonts/UIO.eot
    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
    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 'jhung/FLUID-4949' into demo

* jhung/FLUID-4949:
  FLUID-4949, FLUID-4938: Removed unused font SVG files. Tweaked the text used in the emphasize links and buttons panel.
  FLUID-4949: Added icons for text-to-speech and simplify.
  FLUID-4949: Added missing line spacing font, text style, and simplify. Changed the text colours.
  FLUID-4949: Added icon fonts. Added font styles to UIOptions.css. Started to add icons to the headers of the UIO panels.


Compare: https://github.com/fluid-project/infusion/compare/7c3cff88d9b4...97186f6625b0


More information about the Commits mailing list