[Commits] [fluid-project/infusion] 42ebbc: FLUID-4938: Reverted the UIO panel to be a single ...

GitHub noreply at github.com
Thu Mar 28 08:49:24 EDT 2013


  Branch: refs/heads/demo
  Home:   https://github.com/fluid-project/infusion
  Commit: 42ebbc70d15d37e6cea77605c53fb8c3880fd967
      https://github.com/fluid-project/infusion/commit/42ebbc70d15d37e6cea77605c53fb8c3880fd967
  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/css/UIOptions.css
    M src/webapp/components/uiOptions/js/SlidingPanel.js
    M src/webapp/integration-demos/uiOptions/ClimateChange.html

  Log Message:
  -----------
  FLUID-4938: Reverted the UIO panel to be a single horizontally scrolling panel. Changed the reset and show/hide tabs to match the design more closely. These tabs still need appropriate rounding of corners and icon treatments.


  Commit: 1caac9f452ffa05f8f719e96e1b0c74f8e7f8105
      https://github.com/fluid-project/infusion/commit/1caac9f452ffa05f8f719e96e1b0c74f8e7f8105
  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
    A src/webapp/components/uiOptions/css/fonts/LICENSE-OpenSans.txt
    A src/webapp/components/uiOptions/css/fonts/OpenSans-Regular.ttf

  Log Message:
  -----------
  FLUID-4938: Changed fat panel font to use OpenSans. I had to tweak the alignment of the text on colour and contrast, and the toggle buttons because of the font change.


  Commit: 479817ebc24662cceb10fbf1df86839b4810159b
      https://github.com/fluid-project/infusion/commit/479817ebc24662cceb10fbf1df86839b4810159b
  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/html/UIOptionsTemplate-links.html

  Log Message:
  -----------
  FLUID-4938: Description text for toggle switches and emphasize links now wrap properly. The height of the panel was adjusted as a result. Also tweaked the toggle switch positioning.


  Commit: 0857dff45c98ef492123aba1fd001c75036254d5
      https://github.com/fluid-project/infusion/commit/0857dff45c98ef492123aba1fd001c75036254d5
  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/html/UIOptionsTemplate-contrast.html
    M src/webapp/components/uiOptions/js/SettingsPanels.js
    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

  Log Message:
  -----------
  FLUID-4938: Fixed a merge conflict with master/demo.


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

  Log Message:
  -----------
  FLUID-4938: Height of the panel was slightly off. Increased the height to fix vertical scroll from appearing.


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

  Log Message:
  -----------
  FLUID-4938: Removed some redundant styling. In Webkit, a vertical scroll is appearing but can't figure out why.


  Commit: 27f739b1ffc4898d1ed7dd1f363a430beec90676
      https://github.com/fluid-project/infusion/commit/27f739b1ffc4898d1ed7dd1f363a430beec90676
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2013-03-28 (Thu, 28 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/css/UIOptions.css
    A src/webapp/components/uiOptions/css/fonts/LICENSE-OpenSans.txt
    A src/webapp/components/uiOptions/css/fonts/OpenSans-Regular.ttf
    M src/webapp/components/uiOptions/html/UIOptionsTemplate-links.html
    M src/webapp/components/uiOptions/js/SlidingPanel.js
    M src/webapp/integration-demos/uiOptions/ClimateChange.html

  Log Message:
  -----------
  Merge remote-tracking branch 'jon/FLUID-4938' into demo

* jon/FLUID-4938:
  FLUID-4938: Removed some redundant styling. In Webkit, a vertical scroll is appearing but can't figure out why.
  FLUID-4938: Height of the panel was slightly off. Increased the height to fix vertical scroll from appearing.
  FLUID-4938: Description text for toggle switches and emphasize links now wrap properly. The height of the panel was adjusted as a result. Also tweaked the toggle switch positioning.
  FLUID-4938: Changed fat panel font to use OpenSans. I had to tweak the alignment of the text on colour and contrast, and the toggle buttons because of the font change.
  FLUID-4938: Reverted the UIO panel to be a single horizontally scrolling panel. Changed the reset and show/hide tabs to match the design more closely. These tabs still need appropriate rounding of corners and icon treatments.


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


More information about the Commits mailing list