[Commits] [fluid-project/infusion] 5f815d: Merge remote-tracking branch 'heidiv/FLUID-4230'

noreply at github.com noreply at github.com
Fri Jun 24 21:43:29 UTC 2011


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

  Commit: 5f815dbee21fd45fbe63ef30f605e6443e1698c9
      https://github.com/fluid-project/infusion/commit/5f815dbee21fd45fbe63ef30f605e6443e1698c9
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2011-06-24 (Fri, 24 Jun 2011)

  Changed paths:
    M src/webapp/components/uiOptions/css/FatPanelUIOptions.css
  M src/webapp/components/uiOptions/css/FullNoPreviewUIOptions.css
  M src/webapp/components/uiOptions/css/FullPreviewUIOptions.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/FullNoPreviewUIOptions.html
  M src/webapp/components/uiOptions/html/FullPreviewUIOptions.html
  M src/webapp/components/uiOptions/html/UIOptionsTemplate-text.html
  A src/webapp/components/uiOptions/images/blackYellow/uio_icon_bigA_blackYellow_20x20.png
  A src/webapp/components/uiOptions/images/blackYellow/uio_icon_cancel_blackYellow_13x13.png
  A src/webapp/components/uiOptions/images/blackYellow/uio_icon_layoutandnavigation_blackYellowInverted_16x16.png
  A src/webapp/components/uiOptions/images/blackYellow/uio_icon_layoutandnavigation_blackYellow_16x16.png
  A src/webapp/components/uiOptions/images/blackYellow/uio_icon_layoutandnavigation_blackYellow_18x18.png
  A src/webapp/components/uiOptions/images/blackYellow/uio_icon_linesNarrow_blackYellow_16x12.png
  A src/webapp/components/uiOptions/images/blackYellow/uio_icon_linesWide_blackYellow_16x21.png
  A src/webapp/components/uiOptions/images/blackYellow/uio_icon_linksandbuttons_blackYellowInverted_16x16.png
  A src/webapp/components/uiOptions/images/blackYellow/uio_icon_linksandbuttons_blackYellow_16x16.png
  A src/webapp/components/uiOptions/images/blackYellow/uio_icon_linksandbuttons_blackYellow_18x18.png
  A src/webapp/components/uiOptions/images/blackYellow/uio_icon_reset_blackYellowInverted_16x16.png
  A src/webapp/components/uiOptions/images/blackYellow/uio_icon_save_blackYellow_13x13.png
  A src/webapp/components/uiOptions/images/blackYellow/uio_icon_smallA_blackYellow_10x10.png
  A src/webapp/components/uiOptions/images/blackYellow/uio_icon_textanddisplay_blackYellowInverted_16x16.png
  A src/webapp/components/uiOptions/images/blackYellow/uio_icon_textanddisplay_blackYellow_16x16.png
  A src/webapp/components/uiOptions/images/blackYellow/uio_icon_textanddisplay_blackYellow_18x18.png
  A src/webapp/components/uiOptions/images/default/uio_icon_bigA_default_20x20.png
  A src/webapp/components/uiOptions/images/default/uio_icon_cancel_default_13x13.png
  A src/webapp/components/uiOptions/images/default/uio_icon_layoutandnavigation_defaultInverted_16x16.png
  A src/webapp/components/uiOptions/images/default/uio_icon_layoutandnavigation_default_16x16.png
  A src/webapp/components/uiOptions/images/default/uio_icon_layoutandnavigation_default_18x18.png
  A src/webapp/components/uiOptions/images/default/uio_icon_linesNarrow_default_16x12.png
  A src/webapp/components/uiOptions/images/default/uio_icon_linesWide_default_16x21.png
  A src/webapp/components/uiOptions/images/default/uio_icon_linksandbuttons_defaultInverted_16x16.png
  A src/webapp/components/uiOptions/images/default/uio_icon_linksandbuttons_default_16x16.png
  A src/webapp/components/uiOptions/images/default/uio_icon_linksandbuttons_default_18x18.png
  A src/webapp/components/uiOptions/images/default/uio_icon_reset_defaultInverted_16x16.png
  A src/webapp/components/uiOptions/images/default/uio_icon_save_default_13x13.png
  A src/webapp/components/uiOptions/images/default/uio_icon_sliderhandle.png
  A src/webapp/components/uiOptions/images/default/uio_icon_smallA_default_10x10.png
  A src/webapp/components/uiOptions/images/default/uio_icon_textanddisplay_defaultInverted_16x16.png
  A src/webapp/components/uiOptions/images/default/uio_icon_textanddisplay_default_16x16.png
  A src/webapp/components/uiOptions/images/default/uio_icon_textanddisplay_default_18x18.png
  A src/webapp/components/uiOptions/images/hc/uio_icon_bigA_hc_20x20.png
  A src/webapp/components/uiOptions/images/hc/uio_icon_cancel_hc_13x13.png
  A src/webapp/components/uiOptions/images/hc/uio_icon_layoutandnavigation_hcInverted_16x16.png
  A src/webapp/components/uiOptions/images/hc/uio_icon_layoutandnavigation_hc_16x16.png
  A src/webapp/components/uiOptions/images/hc/uio_icon_layoutandnavigation_hc_18x18.png
  A src/webapp/components/uiOptions/images/hc/uio_icon_linesNarrow_hc_16x12.png
  A src/webapp/components/uiOptions/images/hc/uio_icon_linesWide_hc_16x21.png
  A src/webapp/components/uiOptions/images/hc/uio_icon_linksandbuttons_hcInverted_16x16.png
  A src/webapp/components/uiOptions/images/hc/uio_icon_linksandbuttons_hc_16x16.png
  A src/webapp/components/uiOptions/images/hc/uio_icon_linksandbuttons_hc_18x18.png
  A src/webapp/components/uiOptions/images/hc/uio_icon_reset_hcInverted_16x16.png
  A src/webapp/components/uiOptions/images/hc/uio_icon_save_hc_13x13.png
  A src/webapp/components/uiOptions/images/hc/uio_icon_smallA_hc_10x10.png
  A src/webapp/components/uiOptions/images/hc/uio_icon_textanddisplay_hcInverted_16x16.png
  A src/webapp/components/uiOptions/images/hc/uio_icon_textanddisplay_hc_16x16.png
  A src/webapp/components/uiOptions/images/hc/uio_icon_textanddisplay_hc_18x18.png
  A src/webapp/components/uiOptions/images/hci/uio_icon_bigA_hci_20x20.png
  A src/webapp/components/uiOptions/images/hci/uio_icon_cancel_hci_13x13.png
  A src/webapp/components/uiOptions/images/hci/uio_icon_layoutandnavigation_hciInverted_16x16.png
  A src/webapp/components/uiOptions/images/hci/uio_icon_layoutandnavigation_hci_16x16.png
  A src/webapp/components/uiOptions/images/hci/uio_icon_layoutandnavigation_hci_18x18.png
  A src/webapp/components/uiOptions/images/hci/uio_icon_linesNarrow_hci_16x12.png
  A src/webapp/components/uiOptions/images/hci/uio_icon_linesWide_hci_16x21.png
  A src/webapp/components/uiOptions/images/hci/uio_icon_linksandbuttons_hciInverted_16x16.png
  A src/webapp/components/uiOptions/images/hci/uio_icon_linksandbuttons_hci_16x16.png
  A src/webapp/components/uiOptions/images/hci/uio_icon_linksandbuttons_hci_18x18.png
  A src/webapp/components/uiOptions/images/hci/uio_icon_reset_hciInverted_16x16.png
  A src/webapp/components/uiOptions/images/hci/uio_icon_reset_hci_16x16.png
  A src/webapp/components/uiOptions/images/hci/uio_icon_save_hci_13x13.png
  A src/webapp/components/uiOptions/images/hci/uio_icon_smallA_hci_10x10.png
  A src/webapp/components/uiOptions/images/hci/uio_icon_textanddisplay_hciInverted_16x16.png
  A src/webapp/components/uiOptions/images/hci/uio_icon_textanddisplay_hci_16x16.png
  A src/webapp/components/uiOptions/images/hci/uio_icon_textanddisplay_hci_18x18.png
  R src/webapp/components/uiOptions/images/select_arrow.png
  R src/webapp/components/uiOptions/images/uio_icon_bigA_20x20.png
  R src/webapp/components/uiOptions/images/uio_icon_cancel_13x13.png
  R src/webapp/components/uiOptions/images/uio_icon_layoutandnavigation_16x16.png
  R src/webapp/components/uiOptions/images/uio_icon_layoutandnavigation_18x18.png
  R src/webapp/components/uiOptions/images/uio_icon_layoutandnavigation_inverted_16x16.png
  R src/webapp/components/uiOptions/images/uio_icon_linesNarrow_16x12.png
  R src/webapp/components/uiOptions/images/uio_icon_linesWide_16x21.png
  R src/webapp/components/uiOptions/images/uio_icon_linksandbuttons_16x16.png
  R src/webapp/components/uiOptions/images/uio_icon_linksandbuttons_18x18.png
  R src/webapp/components/uiOptions/images/uio_icon_linksandbuttons_inverted_16x16.png
  R src/webapp/components/uiOptions/images/uio_icon_reset_16x16.png
  R src/webapp/components/uiOptions/images/uio_icon_save_13x13.png
  R src/webapp/components/uiOptions/images/uio_icon_sliderhandle.png
  R src/webapp/components/uiOptions/images/uio_icon_smallA_10x10.png
  R src/webapp/components/uiOptions/images/uio_icon_textanddisplay_16x16.png
  R src/webapp/components/uiOptions/images/uio_icon_textanddisplay_18x18.png
  R src/webapp/components/uiOptions/images/uio_icon_textanddisplay_inverted_16x16.png
  A src/webapp/components/uiOptions/images/yellowBlack/uio_icon_bigA_yellowBlack_20x20.png
  A src/webapp/components/uiOptions/images/yellowBlack/uio_icon_cancel_yellowBlack_13x13.png
  A src/webapp/components/uiOptions/images/yellowBlack/uio_icon_layoutandnavigation_yellowBlackInverted_16x16.png
  A src/webapp/components/uiOptions/images/yellowBlack/uio_icon_layoutandnavigation_yellowBlack_16x16.png
  A src/webapp/components/uiOptions/images/yellowBlack/uio_icon_layoutandnavigation_yellowBlack_18x18.png
  A src/webapp/components/uiOptions/images/yellowBlack/uio_icon_linesNarrow_yellowBlack_16x12.png
  A src/webapp/components/uiOptions/images/yellowBlack/uio_icon_linesWide_yellowBlack_16x21.png
  A src/webapp/components/uiOptions/images/yellowBlack/uio_icon_linksandbuttons_yellowBlackInverted_16x16.png
  A src/webapp/components/uiOptions/images/yellowBlack/uio_icon_linksandbuttons_yellowBlack_16x16.png
  A src/webapp/components/uiOptions/images/yellowBlack/uio_icon_linksandbuttons_yellowBlack_18x18.png
  A src/webapp/components/uiOptions/images/yellowBlack/uio_icon_reset_yellowBlackInverted_16x16.png
  A src/webapp/components/uiOptions/images/yellowBlack/uio_icon_save_yellowBlack_13x13.png
  A src/webapp/components/uiOptions/images/yellowBlack/uio_icon_smallA_yellowBlack_10x10.png
  A src/webapp/components/uiOptions/images/yellowBlack/uio_icon_textanddisplay_yellowBlackInverted_16x16.png
  A src/webapp/components/uiOptions/images/yellowBlack/uio_icon_textanddisplay_yellowBlack_16x16.png
  A src/webapp/components/uiOptions/images/yellowBlack/uio_icon_textanddisplay_yellowBlack_18x18.png
  M src/webapp/components/uiOptions/js/FullNoPreviewUIOptions.js
  R src/webapp/demos/uiOptions/FatPanelUIOptions/css/uiOptions.css
  M src/webapp/demos/uiOptions/FatPanelUIOptions/html/uiOptions.html
  M src/webapp/demos/uiOptions/FullNoPreviewUIOptions/css/UIOptions.css
  M src/webapp/demos/uiOptions/FullNoPreviewUIOptions/html/uiOptions.html
  M src/webapp/demos/uiOptions/FullPreviewUIOptions/css/uiOptions.css
  M src/webapp/demos/uiOptions/FullPreviewUIOptions/html/uiOptions.html
  M src/webapp/framework/fss/css/fss-layout.css

  Log Message:
  -----------
  Merge remote-tracking branch 'heidiv/FLUID-4230'

* heidiv/FLUID-4230:
  FLUID-4230: CSS cleanup, detabbing, commenting, organising
  FLUID-4230: Fixes for other browsers
  FLUID-4230: Tab and layout fixes for different themes
  FLUID-4229: Tweaks re: James's suggestions
  FLUID-4228: Fixed linearizing for full with and without preview layouts
  FLUID-4228: Linearization fixing
  FLUID-4228: Linearization fixing
  FLUID-4230: Fixed theme font style changes for textfields.
  FLUID-4230: Fixed some icons which were not 100% black. Fixed reset not appearing in Default.
  FLUID-4230: Updated icons to be the same size and shape. High contrast theme now uses black icons. Deleted some unused icons.
  FLUID-4228: Fixed styling tweaks James suggested
  FLUID-4230: Finished adapting styles for yellowBlack theme. Added icon images for themes.
  FLUID-4230: Added yellow-black theme adaptation. Cleaned up CSS code. Properly name-spaced styles.
  FLUID-4230: Finished adapting style for Black-Yellow.
  FLUID-4230: removed a margin that was changing the tab sizes when changing themes.
  FLUID-4230: Removed theme importants
  FLUID-4230: Starting work on adapting styles to Black on Yellow theme.
  FLUID-4230: Fixed icon placement for tabs in White-black theme. Cleaned up CSS code formatting.
  FLUID-4230: Minor tweak to tab padding.
  FLUID-4230: Fixed missing border on tabs.
  FLUID-4228: Full with preview layout tweaking
  FLUID-4230: Overriding HC and HCI theme styles to match UI options design.
  FLUID-4228: bg images for header icons
  FLUID-4229: hc icons
  FLUID-4229: Fixed slideralignments
  FLUID-4229: Full no preview layout tweaks, background imgs added to text control template, theme images added, copyrights edited
  FLUID-4229: No Preview style tweaks





More information about the Commits mailing list