[Commits] [fluid-project/infusion] b33fe2: Merge branch 'master' into FLUID-4377

noreply at github.com noreply at github.com
Thu Aug 18 20:13:18 UTC 2011


  Branch: refs/heads/master
  Home:   https://github.com/fluid-project/infusion

  Commit: b33fe23cffbbeecac6d1a25ef3acb3a0cf1b4a52
      https://github.com/fluid-project/infusion/commit/b33fe23cffbbeecac6d1a25ef3acb3a0cf1b4a52
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2011-08-18 (Thu, 18 Aug 2011)

  Changed paths:
    M build-scripts/build.properties
  M build-scripts/importantInjection.json
  M build-scripts/uiOptions/js/StylesheetImportant.js
  M src/webapp/demos/index.html
  R src/webapp/demos/uiOptions/FatPanelUIOptions/demo.html
  R src/webapp/demos/uiOptions/FatPanelUIOptions/html/uiOptions.html
  R src/webapp/demos/uiOptions/FatPanelUIOptions/js/fatPanelUIOptions.js
  R src/webapp/demos/uiOptions/FullNoPreviewUIOptions/css/UIOptions.css
  R src/webapp/demos/uiOptions/FullNoPreviewUIOptions/css/UIOptionsPreview.css
  R src/webapp/demos/uiOptions/FullNoPreviewUIOptions/demo.html
  R src/webapp/demos/uiOptions/FullNoPreviewUIOptions/html/uiOptions.html
  R src/webapp/demos/uiOptions/FullPreviewUIOptions/css/UIOptionsPreview.css
  R src/webapp/demos/uiOptions/FullPreviewUIOptions/css/uiOptions.css
  R src/webapp/demos/uiOptions/FullPreviewUIOptions/demo.html
  R src/webapp/demos/uiOptions/FullPreviewUIOptions/html/UIOptionsPreview.html
  R src/webapp/demos/uiOptions/FullPreviewUIOptions/html/uiOptions.html
  R src/webapp/demos/uiOptions/FullPreviewUIOptions/images/500x327_mint_truffle.jpg
  R src/webapp/demos/uiOptions/FullPreviewUIOptions/images/border_1.png
  R src/webapp/demos/uiOptions/FullPreviewUIOptions/images/expand_collapse.png
  R src/webapp/demos/uiOptions/FullPreviewUIOptions/images/h1.png
  R src/webapp/demos/uiOptions/FullPreviewUIOptions/images/main_bg.png
  R src/webapp/demos/uiOptions/FullPreviewUIOptions/images/mintleaf.png
  A src/webapp/demos/uiOptions/css/UIOptionsFullPage.css
  A src/webapp/demos/uiOptions/css/uiOptions.css
  A src/webapp/demos/uiOptions/demo.html
  A src/webapp/demos/uiOptions/fonts/Lato-Black.ttf
  A src/webapp/demos/uiOptions/fonts/Lato-Light.ttf
  A src/webapp/demos/uiOptions/fonts/Lato-LightItalic.ttf
  A src/webapp/demos/uiOptions/fonts/Lato-Regular.ttf
  A src/webapp/demos/uiOptions/fonts/LoveYaLikeASister.ttf
  A src/webapp/demos/uiOptions/html/uiOptions.html
  A src/webapp/demos/uiOptions/html/uiOptionsFullWithPreview.html
  A src/webapp/demos/uiOptions/html/uiOptionsFullWithoutPreview.html
  A src/webapp/demos/uiOptions/html/uiOptionsPreview.html
  A src/webapp/demos/uiOptions/images/arrow_left.png
  A src/webapp/demos/uiOptions/images/arrow_right.png
  A src/webapp/demos/uiOptions/images/background_texture.png
  A src/webapp/demos/uiOptions/images/photo_apple.png
  A src/webapp/demos/uiOptions/images/photo_orange.png
  A src/webapp/demos/uiOptions/js/uiOptions.js

  Log Message:
  -----------
  Merge branch 'master' into FLUID-4377

Conflicts:
	build-scripts/importantInjection.json
	src/webapp/demos/uiOptions/FatPanelUIOptions/html/uiOptions.html
	src/webapp/demos/uiOptions/FullNoPreviewUIOptions/html/uiOptions.html
	src/webapp/demos/uiOptions/FullPreviewUIOptions/html/UIOptionsPreview.html
	src/webapp/demos/uiOptions/FullPreviewUIOptions/html/uiOptions.html

	Also updated the new demo with the changes that were being made in this branch.


  Commit: 79735087eb03a28197f367039d705f519d8fd418
      https://github.com/fluid-project/infusion/commit/79735087eb03a28197f367039d705f519d8fd418
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2011-08-18 (Thu, 18 Aug 2011)

  Changed paths:
    M src/webapp/components/uiOptions/js/URLUtilities.js
  M src/webapp/tests/component-tests/uiOptions/js/URLUtilitiesTests.js

  Log Message:
  -----------
  Merge branch 'master' into FLUID-4377


  Commit: db6e9407ce7ef87840a79f08dc62157965156d38
      https://github.com/fluid-project/infusion/commit/db6e9407ce7ef87840a79f08dc62157965156d38
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2011-08-18 (Thu, 18 Aug 2011)

  Changed paths:
    M src/webapp/demos/uiOptions/html/uiOptions.html
  M src/webapp/demos/uiOptions/html/uiOptionsFullWithPreview.html
  M src/webapp/demos/uiOptions/html/uiOptionsFullWithoutPreview.html
  M src/webapp/demos/uiOptions/html/uiOptionsPreview.html

  Log Message:
  -----------
  FLUID-4377: Updating the new demo

It appears that my changes to the new demo didn't go in with the merge.
I'm committing them now.


  Commit: fdf82433e5ebce4b4742ad350b13448f7d1fa37f
      https://github.com/fluid-project/infusion/commit/fdf82433e5ebce4b4742ad350b13448f7d1fa37f
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2011-08-18 (Thu, 18 Aug 2011)

  Changed paths:
    M src/webapp/components/progress/js/Progress.js
  M src/webapp/framework/fss/css/fss-reset.css
  M src/webapp/framework/fss/css/fss-theme-hc.css
  M src/webapp/framework/fss/css/fss-theme-hci.css
  M src/webapp/lib/jquery/ui/css/fl-theme-hc/hc.css
  M src/webapp/lib/jquery/ui/css/fl-theme-hci/hci.css

  Log Message:
  -----------
  FLUID-4377: Fixed typo

Fixed a spelling mistake for the word "Depricated". I found some more in
other files as well so I fixed them all.


  Commit: fc7ac1db340fc4786b6bcddd4cf818991929cdee
      https://github.com/fluid-project/infusion/commit/fc7ac1db340fc4786b6bcddd4cf818991929cdee
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2011-08-18 (Thu, 18 Aug 2011)

  Changed paths:
    M build-scripts/importantInjection.json
  M src/webapp/components/pager/css/Pager.css
  M src/webapp/components/progress/js/Progress.js
  M src/webapp/components/uiOptions/css/FatPanelUIOptions.css
  M src/webapp/components/uiOptions/css/FatPanelUIOptionsFrame.css
  M src/webapp/components/uiOptions/css/FullUIOptions.css
  M src/webapp/components/uiOptions/css/UIOptions.css
  M src/webapp/components/uiOptions/html/FatPanelUIOptions.html
  M src/webapp/components/uiOptions/html/FatPanelUIOptionsFrame.html
  R src/webapp/components/uiOptions/images/blackYellow/uio_icon_bigA_blackYellow_20x20.png
  R src/webapp/components/uiOptions/images/blackYellow/uio_icon_cancel_blackYellow_13x13.png
  R src/webapp/components/uiOptions/images/blackYellow/uio_icon_layoutandnavigation_blackYellowInverted_16x16.png
  R src/webapp/components/uiOptions/images/blackYellow/uio_icon_layoutandnavigation_blackYellow_16x16.png
  R src/webapp/components/uiOptions/images/blackYellow/uio_icon_layoutandnavigation_blackYellow_18x18.png
  R src/webapp/components/uiOptions/images/blackYellow/uio_icon_linesNarrow_blackYellow_16x12.png
  R src/webapp/components/uiOptions/images/blackYellow/uio_icon_linesWide_blackYellow_16x21.png
  R src/webapp/components/uiOptions/images/blackYellow/uio_icon_linksandbuttons_blackYellowInverted_16x16.png
  R src/webapp/components/uiOptions/images/blackYellow/uio_icon_linksandbuttons_blackYellow_16x16.png
  R src/webapp/components/uiOptions/images/blackYellow/uio_icon_linksandbuttons_blackYellow_18x18.png
  R src/webapp/components/uiOptions/images/blackYellow/uio_icon_reset_blackYellowInverted_16x16.png
  R src/webapp/components/uiOptions/images/blackYellow/uio_icon_save_blackYellow_13x13.png
  R src/webapp/components/uiOptions/images/blackYellow/uio_icon_smallA_blackYellow_10x10.png
  R src/webapp/components/uiOptions/images/blackYellow/uio_icon_textanddisplay_blackYellowInverted_16x16.png
  R src/webapp/components/uiOptions/images/blackYellow/uio_icon_textanddisplay_blackYellow_16x16.png
  R src/webapp/components/uiOptions/images/blackYellow/uio_icon_textanddisplay_blackYellow_18x18.png
  A src/webapp/components/uiOptions/images/bw/uio_icon_bigA_hc_20x20.png
  A src/webapp/components/uiOptions/images/bw/uio_icon_cancel_hc_13x13.png
  A src/webapp/components/uiOptions/images/bw/uio_icon_layoutandnavigation_hcInverted_16x16.png
  A src/webapp/components/uiOptions/images/bw/uio_icon_layoutandnavigation_hc_16x16.png
  A src/webapp/components/uiOptions/images/bw/uio_icon_layoutandnavigation_hc_18x18.png
  A src/webapp/components/uiOptions/images/bw/uio_icon_linesNarrow_hc_16x12.png
  A src/webapp/components/uiOptions/images/bw/uio_icon_linesWide_hc_16x21.png
  A src/webapp/components/uiOptions/images/bw/uio_icon_linksandbuttons_hcInverted_16x16.png
  A src/webapp/components/uiOptions/images/bw/uio_icon_linksandbuttons_hc_16x16.png
  A src/webapp/components/uiOptions/images/bw/uio_icon_linksandbuttons_hc_18x18.png
  A src/webapp/components/uiOptions/images/bw/uio_icon_reset_hcInverted_16x16.png
  A src/webapp/components/uiOptions/images/bw/uio_icon_save_hc_13x13.png
  A src/webapp/components/uiOptions/images/bw/uio_icon_smallA_hc_10x10.png
  A src/webapp/components/uiOptions/images/bw/uio_icon_textanddisplay_hcInverted_16x16.png
  A src/webapp/components/uiOptions/images/bw/uio_icon_textanddisplay_hc_16x16.png
  A src/webapp/components/uiOptions/images/bw/uio_icon_textanddisplay_hc_18x18.png
  A src/webapp/components/uiOptions/images/by/uio_icon_bigA_blackYellow_20x20.png
  A src/webapp/components/uiOptions/images/by/uio_icon_cancel_blackYellow_13x13.png
  A src/webapp/components/uiOptions/images/by/uio_icon_layoutandnavigation_blackYellowInverted_16x16.png
  A src/webapp/components/uiOptions/images/by/uio_icon_layoutandnavigation_blackYellow_16x16.png
  A src/webapp/components/uiOptions/images/by/uio_icon_layoutandnavigation_blackYellow_18x18.png
  A src/webapp/components/uiOptions/images/by/uio_icon_linesNarrow_blackYellow_16x12.png
  A src/webapp/components/uiOptions/images/by/uio_icon_linesWide_blackYellow_16x21.png
  A src/webapp/components/uiOptions/images/by/uio_icon_linksandbuttons_blackYellowInverted_16x16.png
  A src/webapp/components/uiOptions/images/by/uio_icon_linksandbuttons_blackYellow_16x16.png
  A src/webapp/components/uiOptions/images/by/uio_icon_linksandbuttons_blackYellow_18x18.png
  A src/webapp/components/uiOptions/images/by/uio_icon_reset_blackYellowInverted_16x16.png
  A src/webapp/components/uiOptions/images/by/uio_icon_save_blackYellow_13x13.png
  A src/webapp/components/uiOptions/images/by/uio_icon_smallA_blackYellow_10x10.png
  A src/webapp/components/uiOptions/images/by/uio_icon_textanddisplay_blackYellowInverted_16x16.png
  A src/webapp/components/uiOptions/images/by/uio_icon_textanddisplay_blackYellow_16x16.png
  A src/webapp/components/uiOptions/images/by/uio_icon_textanddisplay_blackYellow_18x18.png
  R src/webapp/components/uiOptions/images/hc/uio_icon_bigA_hc_20x20.png
  R src/webapp/components/uiOptions/images/hc/uio_icon_cancel_hc_13x13.png
  R src/webapp/components/uiOptions/images/hc/uio_icon_layoutandnavigation_hcInverted_16x16.png
  R src/webapp/components/uiOptions/images/hc/uio_icon_layoutandnavigation_hc_16x16.png
  R src/webapp/components/uiOptions/images/hc/uio_icon_layoutandnavigation_hc_18x18.png
  R src/webapp/components/uiOptions/images/hc/uio_icon_linesNarrow_hc_16x12.png
  R src/webapp/components/uiOptions/images/hc/uio_icon_linesWide_hc_16x21.png
  R src/webapp/components/uiOptions/images/hc/uio_icon_linksandbuttons_hcInverted_16x16.png
  R src/webapp/components/uiOptions/images/hc/uio_icon_linksandbuttons_hc_16x16.png
  R src/webapp/components/uiOptions/images/hc/uio_icon_linksandbuttons_hc_18x18.png
  R src/webapp/components/uiOptions/images/hc/uio_icon_reset_hcInverted_16x16.png
  R src/webapp/components/uiOptions/images/hc/uio_icon_save_hc_13x13.png
  R src/webapp/components/uiOptions/images/hc/uio_icon_smallA_hc_10x10.png
  R src/webapp/components/uiOptions/images/hc/uio_icon_textanddisplay_hcInverted_16x16.png
  R src/webapp/components/uiOptions/images/hc/uio_icon_textanddisplay_hc_16x16.png
  R src/webapp/components/uiOptions/images/hc/uio_icon_textanddisplay_hc_18x18.png
  R src/webapp/components/uiOptions/images/hci/uio_icon_bigA_hci_20x20.png
  R src/webapp/components/uiOptions/images/hci/uio_icon_cancel_hci_13x13.png
  R src/webapp/components/uiOptions/images/hci/uio_icon_layoutandnavigation_hciInverted_16x16.png
  R src/webapp/components/uiOptions/images/hci/uio_icon_layoutandnavigation_hci_16x16.png
  R src/webapp/components/uiOptions/images/hci/uio_icon_layoutandnavigation_hci_18x18.png
  R src/webapp/components/uiOptions/images/hci/uio_icon_linesNarrow_hci_16x12.png
  R src/webapp/components/uiOptions/images/hci/uio_icon_linesWide_hci_16x21.png
  R src/webapp/components/uiOptions/images/hci/uio_icon_linksandbuttons_hciInverted_16x16.png
  R src/webapp/components/uiOptions/images/hci/uio_icon_linksandbuttons_hci_16x16.png
  R src/webapp/components/uiOptions/images/hci/uio_icon_linksandbuttons_hci_18x18.png
  R src/webapp/components/uiOptions/images/hci/uio_icon_reset_hciInverted_16x16.png
  R src/webapp/components/uiOptions/images/hci/uio_icon_reset_hci_16x16.png
  R src/webapp/components/uiOptions/images/hci/uio_icon_save_hci_13x13.png
  R src/webapp/components/uiOptions/images/hci/uio_icon_smallA_hci_10x10.png
  R src/webapp/components/uiOptions/images/hci/uio_icon_textanddisplay_hciInverted_16x16.png
  R src/webapp/components/uiOptions/images/hci/uio_icon_textanddisplay_hci_16x16.png
  R src/webapp/components/uiOptions/images/hci/uio_icon_textanddisplay_hci_18x18.png
  A src/webapp/components/uiOptions/images/wb/uio_icon_bigA_hci_20x20.png
  A src/webapp/components/uiOptions/images/wb/uio_icon_cancel_hci_13x13.png
  A src/webapp/components/uiOptions/images/wb/uio_icon_layoutandnavigation_hciInverted_16x16.png
  A src/webapp/components/uiOptions/images/wb/uio_icon_layoutandnavigation_hci_16x16.png
  A src/webapp/components/uiOptions/images/wb/uio_icon_layoutandnavigation_hci_18x18.png
  A src/webapp/components/uiOptions/images/wb/uio_icon_linesNarrow_hci_16x12.png
  A src/webapp/components/uiOptions/images/wb/uio_icon_linesWide_hci_16x21.png
  A src/webapp/components/uiOptions/images/wb/uio_icon_linksandbuttons_hciInverted_16x16.png
  A src/webapp/components/uiOptions/images/wb/uio_icon_linksandbuttons_hci_16x16.png
  A src/webapp/components/uiOptions/images/wb/uio_icon_linksandbuttons_hci_18x18.png
  A src/webapp/components/uiOptions/images/wb/uio_icon_reset_hciInverted_16x16.png
  A src/webapp/components/uiOptions/images/wb/uio_icon_reset_hci_16x16.png
  A src/webapp/components/uiOptions/images/wb/uio_icon_save_hci_13x13.png
  A src/webapp/components/uiOptions/images/wb/uio_icon_smallA_hci_10x10.png
  A src/webapp/components/uiOptions/images/wb/uio_icon_textanddisplay_hciInverted_16x16.png
  A src/webapp/components/uiOptions/images/wb/uio_icon_textanddisplay_hci_16x16.png
  A src/webapp/components/uiOptions/images/wb/uio_icon_textanddisplay_hci_18x18.png
  A src/webapp/components/uiOptions/images/yb/uio_icon_bigA_yellowBlack_20x20.png
  A src/webapp/components/uiOptions/images/yb/uio_icon_cancel_yellowBlack_13x13.png
  A src/webapp/components/uiOptions/images/yb/uio_icon_layoutandnavigation_yellowBlackInverted_16x16.png
  A src/webapp/components/uiOptions/images/yb/uio_icon_layoutandnavigation_yellowBlack_16x16.png
  A src/webapp/components/uiOptions/images/yb/uio_icon_layoutandnavigation_yellowBlack_18x18.png
  A src/webapp/components/uiOptions/images/yb/uio_icon_linesNarrow_yellowBlack_16x12.png
  A src/webapp/components/uiOptions/images/yb/uio_icon_linesWide_yellowBlack_16x21.png
  A src/webapp/components/uiOptions/images/yb/uio_icon_linksandbuttons_yellowBlackInverted_16x16.png
  A src/webapp/components/uiOptions/images/yb/uio_icon_linksandbuttons_yellowBlack_16x16.png
  A src/webapp/components/uiOptions/images/yb/uio_icon_linksandbuttons_yellowBlack_18x18.png
  A src/webapp/components/uiOptions/images/yb/uio_icon_reset_yellowBlackInverted_16x16.png
  A src/webapp/components/uiOptions/images/yb/uio_icon_save_yellowBlack_13x13.png
  A src/webapp/components/uiOptions/images/yb/uio_icon_smallA_yellowBlack_10x10.png
  A src/webapp/components/uiOptions/images/yb/uio_icon_textanddisplay_yellowBlackInverted_16x16.png
  A src/webapp/components/uiOptions/images/yb/uio_icon_textanddisplay_yellowBlack_16x16.png
  A src/webapp/components/uiOptions/images/yb/uio_icon_textanddisplay_yellowBlack_18x18.png
  R src/webapp/components/uiOptions/images/yellowBlack/uio_icon_bigA_yellowBlack_20x20.png
  R src/webapp/components/uiOptions/images/yellowBlack/uio_icon_cancel_yellowBlack_13x13.png
  R src/webapp/components/uiOptions/images/yellowBlack/uio_icon_layoutandnavigation_yellowBlackInverted_16x16.png
  R src/webapp/components/uiOptions/images/yellowBlack/uio_icon_layoutandnavigation_yellowBlack_16x16.png
  R src/webapp/components/uiOptions/images/yellowBlack/uio_icon_layoutandnavigation_yellowBlack_18x18.png
  R src/webapp/components/uiOptions/images/yellowBlack/uio_icon_linesNarrow_yellowBlack_16x12.png
  R src/webapp/components/uiOptions/images/yellowBlack/uio_icon_linesWide_yellowBlack_16x21.png
  R src/webapp/components/uiOptions/images/yellowBlack/uio_icon_linksandbuttons_yellowBlackInverted_16x16.png
  R src/webapp/components/uiOptions/images/yellowBlack/uio_icon_linksandbuttons_yellowBlack_16x16.png
  R src/webapp/components/uiOptions/images/yellowBlack/uio_icon_linksandbuttons_yellowBlack_18x18.png
  R src/webapp/components/uiOptions/images/yellowBlack/uio_icon_reset_yellowBlackInverted_16x16.png
  R src/webapp/components/uiOptions/images/yellowBlack/uio_icon_save_yellowBlack_13x13.png
  R src/webapp/components/uiOptions/images/yellowBlack/uio_icon_smallA_yellowBlack_10x10.png
  R src/webapp/components/uiOptions/images/yellowBlack/uio_icon_textanddisplay_yellowBlackInverted_16x16.png
  R src/webapp/components/uiOptions/images/yellowBlack/uio_icon_textanddisplay_yellowBlack_16x16.png
  R src/webapp/components/uiOptions/images/yellowBlack/uio_icon_textanddisplay_yellowBlack_18x18.png
  M src/webapp/components/uiOptions/js/UIEnhancer.js
  M src/webapp/demos/fss/themes/html/themes.html
  M src/webapp/demos/uiOptions/html/uiOptions.html
  M src/webapp/demos/uiOptions/html/uiOptionsFullWithPreview.html
  M src/webapp/demos/uiOptions/html/uiOptionsFullWithoutPreview.html
  M src/webapp/demos/uiOptions/html/uiOptionsPreview.html
  M src/webapp/framework/fss/css/fss-reset.css
  R src/webapp/framework/fss/css/fss-theme-blackYellow.css
  A src/webapp/framework/fss/css/fss-theme-bw.css
  A src/webapp/framework/fss/css/fss-theme-by.css
  M src/webapp/framework/fss/css/fss-theme-hc.css
  M src/webapp/framework/fss/css/fss-theme-hci.css
  A src/webapp/framework/fss/css/fss-theme-wb.css
  A src/webapp/framework/fss/css/fss-theme-yb.css
  R src/webapp/framework/fss/css/fss-theme-yellowBlack.css
  M src/webapp/framework/fss/fssDependencies.json
  R src/webapp/framework/fss/images/themes/blackYellow/buttons-med-bg.png
  R src/webapp/framework/fss/images/themes/blackYellow/buttons-med-cap.png
  R src/webapp/framework/fss/images/themes/blackYellow/buttons-titlebar-bg.png
  R src/webapp/framework/fss/images/themes/blackYellow/buttons-titlebar-cap.png
  R src/webapp/framework/fss/images/themes/blackYellow/icon-widget-Close.png
  R src/webapp/framework/fss/images/themes/blackYellow/icon-widget-More.png
  R src/webapp/framework/fss/images/themes/blackYellow/icon-widget-gripper.png
  A src/webapp/framework/fss/images/themes/bw/buttons-med-bg.png
  A src/webapp/framework/fss/images/themes/bw/buttons-med-cap.png
  A src/webapp/framework/fss/images/themes/bw/buttons-titlebar-bg.png
  A src/webapp/framework/fss/images/themes/bw/buttons-titlebar-cap.png
  A src/webapp/framework/fss/images/themes/bw/icon-widget-Close.png
  A src/webapp/framework/fss/images/themes/bw/icon-widget-More.png
  A src/webapp/framework/fss/images/themes/bw/icon-widget-gripper.png
  A src/webapp/framework/fss/images/themes/by/buttons-med-bg.png
  A src/webapp/framework/fss/images/themes/by/buttons-med-cap.png
  A src/webapp/framework/fss/images/themes/by/buttons-titlebar-bg.png
  A src/webapp/framework/fss/images/themes/by/buttons-titlebar-cap.png
  A src/webapp/framework/fss/images/themes/by/icon-widget-Close.png
  A src/webapp/framework/fss/images/themes/by/icon-widget-More.png
  A src/webapp/framework/fss/images/themes/by/icon-widget-gripper.png
  R src/webapp/framework/fss/images/themes/hc/buttons-med-bg.png
  R src/webapp/framework/fss/images/themes/hc/buttons-med-cap.png
  R src/webapp/framework/fss/images/themes/hc/buttons-titlebar-bg.png
  R src/webapp/framework/fss/images/themes/hc/buttons-titlebar-cap.png
  R src/webapp/framework/fss/images/themes/hc/icon-widget-Close.png
  R src/webapp/framework/fss/images/themes/hc/icon-widget-More.png
  R src/webapp/framework/fss/images/themes/hc/icon-widget-gripper.png
  R src/webapp/framework/fss/images/themes/hci/buttons-med-bg.png
  R src/webapp/framework/fss/images/themes/hci/buttons-med-cap.png
  R src/webapp/framework/fss/images/themes/hci/buttons-titlebar-bg.png
  R src/webapp/framework/fss/images/themes/hci/buttons-titlebar-cap.png
  R src/webapp/framework/fss/images/themes/hci/icon-widget-Close.png
  R src/webapp/framework/fss/images/themes/hci/icon-widget-More.png
  R src/webapp/framework/fss/images/themes/hci/icon-widget-gripper.png
  A src/webapp/framework/fss/images/themes/wb/buttons-med-bg.png
  A src/webapp/framework/fss/images/themes/wb/buttons-med-cap.png
  A src/webapp/framework/fss/images/themes/wb/buttons-titlebar-bg.png
  A src/webapp/framework/fss/images/themes/wb/buttons-titlebar-cap.png
  A src/webapp/framework/fss/images/themes/wb/icon-widget-Close.png
  A src/webapp/framework/fss/images/themes/wb/icon-widget-More.png
  A src/webapp/framework/fss/images/themes/wb/icon-widget-gripper.png
  A src/webapp/framework/fss/images/themes/yb/buttons-med-bg.png
  A src/webapp/framework/fss/images/themes/yb/buttons-med-cap.png
  A src/webapp/framework/fss/images/themes/yb/buttons-titlebar-bg.png
  A src/webapp/framework/fss/images/themes/yb/buttons-titlebar-cap.png
  A src/webapp/framework/fss/images/themes/yb/icon-widget-Close.png
  A src/webapp/framework/fss/images/themes/yb/icon-widget-More.png
  A src/webapp/framework/fss/images/themes/yb/icon-widget-gripper.png
  R src/webapp/framework/fss/images/themes/yellowBlack/buttons-med-bg.png
  R src/webapp/framework/fss/images/themes/yellowBlack/buttons-med-cap.png
  R src/webapp/framework/fss/images/themes/yellowBlack/buttons-titlebar-bg.png
  R src/webapp/framework/fss/images/themes/yellowBlack/buttons-titlebar-cap.png
  R src/webapp/framework/fss/images/themes/yellowBlack/icon-widget-Close.png
  R src/webapp/framework/fss/images/themes/yellowBlack/icon-widget-More.png
  R src/webapp/framework/fss/images/themes/yellowBlack/icon-widget-gripper.png
  M src/webapp/integration-demos/sakai/html/UIOptionsPreview.html
  M src/webapp/integration-demos/sakai/html/ui-options-fss-sakai.html
  M src/webapp/integration-demos/uportal/html/portal.html
  R src/webapp/lib/jquery/ui/css/fl-theme-blackYellow/blackYellow.css
  R src/webapp/lib/jquery/ui/css/fl-theme-blackYellow/images/ui-bg_flat_0_aaaaaa_40x100.png
  R src/webapp/lib/jquery/ui/css/fl-theme-blackYellow/images/ui-bg_flat_100_000000_40x100.png
  R src/webapp/lib/jquery/ui/css/fl-theme-blackYellow/images/ui-icons_454545_256x240.png
  R src/webapp/lib/jquery/ui/css/fl-theme-blackYellow/images/ui-icons_cd0a0a_256x240.png
  R src/webapp/lib/jquery/ui/css/fl-theme-blackYellow/images/ui-icons_ffff00_256x240.png
  A src/webapp/lib/jquery/ui/css/fl-theme-bw/bw.css
  A src/webapp/lib/jquery/ui/css/fl-theme-bw/images/ui-bg_flat_0_000000_40x100.png
  A src/webapp/lib/jquery/ui/css/fl-theme-bw/images/ui-bg_flat_0_ffffff_40x100.png
  A src/webapp/lib/jquery/ui/css/fl-theme-bw/images/ui-icons_000000_256x240.png
  A src/webapp/lib/jquery/ui/css/fl-theme-bw/images/ui-icons_ffffff_256x240.png
  A src/webapp/lib/jquery/ui/css/fl-theme-by/by.css
  A src/webapp/lib/jquery/ui/css/fl-theme-by/images/ui-bg_flat_0_000000_40x100.png
  A src/webapp/lib/jquery/ui/css/fl-theme-by/images/ui-bg_flat_0_ffff00_40x100.png
  A src/webapp/lib/jquery/ui/css/fl-theme-by/images/ui-icons_000000_256x240.png
  A src/webapp/lib/jquery/ui/css/fl-theme-by/images/ui-icons_ffff00_256x240.png
  M src/webapp/lib/jquery/ui/css/fl-theme-hc/hc.css
  R src/webapp/lib/jquery/ui/css/fl-theme-hc/images/ui-bg_flat_0_000000_40x100.png
  R src/webapp/lib/jquery/ui/css/fl-theme-hc/images/ui-bg_flat_0_ffffff_40x100.png
  R src/webapp/lib/jquery/ui/css/fl-theme-hc/images/ui-icons_000000_256x240.png
  R src/webapp/lib/jquery/ui/css/fl-theme-hc/images/ui-icons_ffffff_256x240.png
  M src/webapp/lib/jquery/ui/css/fl-theme-hci/hci.css
  R src/webapp/lib/jquery/ui/css/fl-theme-hci/images/ui-bg_flat_0_000000_40x100.png
  R src/webapp/lib/jquery/ui/css/fl-theme-hci/images/ui-bg_flat_0_999999_40x100.png
  R src/webapp/lib/jquery/ui/css/fl-theme-hci/images/ui-bg_flat_0_ffffff_40x100.png
  R src/webapp/lib/jquery/ui/css/fl-theme-hci/images/ui-icons_000000_256x240.png
  R src/webapp/lib/jquery/ui/css/fl-theme-hci/images/ui-icons_fffff_256x240.png
  R src/webapp/lib/jquery/ui/css/fl-theme-hci/images/ui-icons_ffffff_256x240.png
  A src/webapp/lib/jquery/ui/css/fl-theme-wb/images/ui-bg_flat_0_000000_40x100.png
  A src/webapp/lib/jquery/ui/css/fl-theme-wb/images/ui-bg_flat_0_ffffff_40x100.png
  A src/webapp/lib/jquery/ui/css/fl-theme-wb/images/ui-icons_000000_256x240.png
  A src/webapp/lib/jquery/ui/css/fl-theme-wb/images/ui-icons_ffffff_256x240.png
  A src/webapp/lib/jquery/ui/css/fl-theme-wb/wb.css
  A src/webapp/lib/jquery/ui/css/fl-theme-yb/images/ui-bg_flat_0_000000_40x100.png
  A src/webapp/lib/jquery/ui/css/fl-theme-yb/images/ui-bg_flat_0_ffff00_40x100.png
  A src/webapp/lib/jquery/ui/css/fl-theme-yb/images/ui-icons_000000_256x240.png
  A src/webapp/lib/jquery/ui/css/fl-theme-yb/images/ui-icons_ffff00_256x240.png
  A src/webapp/lib/jquery/ui/css/fl-theme-yb/yb.css
  R src/webapp/lib/jquery/ui/css/fl-theme-yellowBlack/images/ui-bg_flat_0_aaaaaa_40x100.png
  R src/webapp/lib/jquery/ui/css/fl-theme-yellowBlack/images/ui-bg_flat_0_ffff00_40x100.png
  R src/webapp/lib/jquery/ui/css/fl-theme-yellowBlack/images/ui-bg_flat_100_ffff00_40x100.png
  R src/webapp/lib/jquery/ui/css/fl-theme-yellowBlack/images/ui-icons_000000_256x240.png
  R src/webapp/lib/jquery/ui/css/fl-theme-yellowBlack/images/ui-icons_454545_256x240.png
  R src/webapp/lib/jquery/ui/css/fl-theme-yellowBlack/images/ui-icons_888888_256x240.png
  R src/webapp/lib/jquery/ui/css/fl-theme-yellowBlack/images/ui-icons_cd0a0a_256x240.png
  R src/webapp/lib/jquery/ui/css/fl-theme-yellowBlack/yellowBlack.css
  M src/webapp/tests/component-tests/uiOptions/html/FatPanelUIOptionsFrame-test.html
  M src/webapp/tests/component-tests/uiOptions/html/UIEnhancer-test.html
  M src/webapp/tests/component-tests/uiOptions/js/UIEnhancerTests.js
  M src/webapp/tests/component-tests/uiOptions/js/UIOptionsTests.js
  M src/webapp/tests/framework-tests/fss/html/8.fss.themes.html
  M src/webapp/tests/manual-tests/html/SomeKindOfNews.html

  Log Message:
  -----------
  Merge remote-tracking branch 'jobara/FLUID-4377'

* jobara/FLUID-4377:
  FLUID-4377: Fixed typo
  FLUID-4377: Updating the new demo
  FLUID-4377: cleaned up css overrides for the tabs in fat panel uio
  FLUID-4377: renamed uio images directories
  FLUID-4377: renamed fl-inverted
  FLUID-4377: Adding the fl-inverted class to fat panel uio
  FLUID-4377: Fixing theme specific styles for uio
  FLUID-4377: Renamed uses of the contrast themes
  FLUID-4377: Renamed the FSS contrast themes
  FLUID-4377: Corrected and renamed the jQuery UI contrast themes
  FLUID-4377: added inverted class scoping to hci theme
  FLUID-4377: added inverted class scoping to hc theme
  FLUID-4377: added inverted class scoping to yellowBlack theme
  FLUID-4377: added inverted class scoping to blackYellow theme


Compare: https://github.com/fluid-project/infusion/compare/457fba9...fc7ac1d


More information about the Commits mailing list