[Commits] [fluid-project/infusion] 35e725: FLUID-4995: Images removed from UIO, replaced with...
GitHub
noreply at github.com
Wed Jun 5 10:31:41 EDT 2013
Branch: refs/heads/master
Home: https://github.com/fluid-project/infusion
Commit: 35e725e45c18fda3f9c5683f83e8375783914bea
https://github.com/fluid-project/infusion/commit/35e725e45c18fda3f9c5683f83e8375783914bea
Author: heidi valles <hvalles at ocad.ca>
Date: 2013-05-13 (Mon, 13 May 2013)
Changed paths:
R src/webapp/components/uiOptions/images/bw/uio_icon_bigA_hc_20x20.png
R src/webapp/components/uiOptions/images/bw/uio_icon_button.png
R src/webapp/components/uiOptions/images/bw/uio_icon_contrast.png
R src/webapp/components/uiOptions/images/bw/uio_icon_indicator.png
R src/webapp/components/uiOptions/images/bw/uio_icon_layoutandnavigation_hcInverted_16x16.png
R src/webapp/components/uiOptions/images/bw/uio_icon_layoutandnavigation_hc_16x16.png
R src/webapp/components/uiOptions/images/bw/uio_icon_layoutandnavigation_hc_18x18.png
R src/webapp/components/uiOptions/images/bw/uio_icon_lineSpace.png
R src/webapp/components/uiOptions/images/bw/uio_icon_linesNarrow_hc_16x12.png
R src/webapp/components/uiOptions/images/bw/uio_icon_linesWide_hc_16x21.png
R src/webapp/components/uiOptions/images/bw/uio_icon_linksandbuttons_hcInverted_16x16.png
R src/webapp/components/uiOptions/images/bw/uio_icon_linksandbuttons_hc_16x16.png
R src/webapp/components/uiOptions/images/bw/uio_icon_linksandbuttons_hc_18x18.png
R src/webapp/components/uiOptions/images/bw/uio_icon_list.png
R src/webapp/components/uiOptions/images/bw/uio_icon_smallA_hc_10x10.png
R src/webapp/components/uiOptions/images/bw/uio_icon_textSize.png
R src/webapp/components/uiOptions/images/bw/uio_icon_textStyle.png
R src/webapp/components/uiOptions/images/bw/uio_icon_textanddisplay_hcInverted_16x16.png
R src/webapp/components/uiOptions/images/bw/uio_icon_textanddisplay_hc_16x16.png
R src/webapp/components/uiOptions/images/bw/uio_icon_textanddisplay_hc_18x18.png
R src/webapp/components/uiOptions/images/by/uio_icon_bigA_blackYellow_20x20.png
R src/webapp/components/uiOptions/images/by/uio_icon_button.png
R src/webapp/components/uiOptions/images/by/uio_icon_contrast.png
R src/webapp/components/uiOptions/images/by/uio_icon_indicator.png
R src/webapp/components/uiOptions/images/by/uio_icon_layoutandnavigation_blackYellowInverted_16x16.png
R src/webapp/components/uiOptions/images/by/uio_icon_layoutandnavigation_blackYellow_16x16.png
R src/webapp/components/uiOptions/images/by/uio_icon_layoutandnavigation_blackYellow_18x18.png
R src/webapp/components/uiOptions/images/by/uio_icon_lineSpace.png
R src/webapp/components/uiOptions/images/by/uio_icon_linesNarrow_blackYellow_16x12.png
R src/webapp/components/uiOptions/images/by/uio_icon_linesWide_blackYellow_16x21.png
R src/webapp/components/uiOptions/images/by/uio_icon_linksandbuttons_blackYellowInverted_16x16.png
R src/webapp/components/uiOptions/images/by/uio_icon_linksandbuttons_blackYellow_16x16.png
R src/webapp/components/uiOptions/images/by/uio_icon_linksandbuttons_blackYellow_18x18.png
R src/webapp/components/uiOptions/images/by/uio_icon_list.png
R src/webapp/components/uiOptions/images/by/uio_icon_smallA_blackYellow_10x10.png
R src/webapp/components/uiOptions/images/by/uio_icon_textSize.png
R src/webapp/components/uiOptions/images/by/uio_icon_textStyle.png
R src/webapp/components/uiOptions/images/by/uio_icon_textanddisplay_blackYellowInverted_16x16.png
R src/webapp/components/uiOptions/images/by/uio_icon_textanddisplay_blackYellow_16x16.png
R src/webapp/components/uiOptions/images/by/uio_icon_textanddisplay_blackYellow_18x18.png
R src/webapp/components/uiOptions/images/default/uio_icon_bigA_default_20x20.png
R src/webapp/components/uiOptions/images/default/uio_icon_button.png
R src/webapp/components/uiOptions/images/default/uio_icon_contrast.png
R src/webapp/components/uiOptions/images/default/uio_icon_indicator.png
R src/webapp/components/uiOptions/images/default/uio_icon_layoutandnavigation_defaultInverted_16x16.png
R src/webapp/components/uiOptions/images/default/uio_icon_layoutandnavigation_default_16x16.png
R src/webapp/components/uiOptions/images/default/uio_icon_layoutandnavigation_default_18x18.png
R src/webapp/components/uiOptions/images/default/uio_icon_lineSpace.png
R src/webapp/components/uiOptions/images/default/uio_icon_linesNarrow_default_16x12.png
R src/webapp/components/uiOptions/images/default/uio_icon_linesWide_default_16x21.png
R src/webapp/components/uiOptions/images/default/uio_icon_linksandbuttons_defaultInverted_16x16.png
R src/webapp/components/uiOptions/images/default/uio_icon_linksandbuttons_default_16x16.png
R src/webapp/components/uiOptions/images/default/uio_icon_linksandbuttons_default_18x18.png
R src/webapp/components/uiOptions/images/default/uio_icon_list.png
R src/webapp/components/uiOptions/images/default/uio_icon_smallA_default_10x10.png
R src/webapp/components/uiOptions/images/default/uio_icon_textSize.png
R src/webapp/components/uiOptions/images/default/uio_icon_textStyle.png
R src/webapp/components/uiOptions/images/default/uio_icon_textanddisplay_defaultInverted_16x16.png
R src/webapp/components/uiOptions/images/default/uio_icon_textanddisplay_default_16x16.png
R src/webapp/components/uiOptions/images/default/uio_icon_textanddisplay_default_18x18.png
R src/webapp/components/uiOptions/images/wb/uio_icon_bigA_hci_20x20.png
R src/webapp/components/uiOptions/images/wb/uio_icon_button.png
R src/webapp/components/uiOptions/images/wb/uio_icon_contrast.png
R src/webapp/components/uiOptions/images/wb/uio_icon_indicator.png
R src/webapp/components/uiOptions/images/wb/uio_icon_layoutandnavigation_hciInverted_16x16.png
R src/webapp/components/uiOptions/images/wb/uio_icon_layoutandnavigation_hci_16x16.png
R src/webapp/components/uiOptions/images/wb/uio_icon_layoutandnavigation_hci_18x18.png
R src/webapp/components/uiOptions/images/wb/uio_icon_lineSpace.png
R src/webapp/components/uiOptions/images/wb/uio_icon_linesNarrow_hci_16x12.png
R src/webapp/components/uiOptions/images/wb/uio_icon_linesWide_hci_16x21.png
R src/webapp/components/uiOptions/images/wb/uio_icon_linksandbuttons_hciInverted_16x16.png
R src/webapp/components/uiOptions/images/wb/uio_icon_linksandbuttons_hci_16x16.png
R src/webapp/components/uiOptions/images/wb/uio_icon_linksandbuttons_hci_18x18.png
R src/webapp/components/uiOptions/images/wb/uio_icon_list.png
R src/webapp/components/uiOptions/images/wb/uio_icon_smallA_hci_10x10.png
R src/webapp/components/uiOptions/images/wb/uio_icon_textSize.png
R src/webapp/components/uiOptions/images/wb/uio_icon_textStyle.png
R src/webapp/components/uiOptions/images/wb/uio_icon_textanddisplay_hciInverted_16x16.png
R src/webapp/components/uiOptions/images/wb/uio_icon_textanddisplay_hci_16x16.png
R src/webapp/components/uiOptions/images/wb/uio_icon_textanddisplay_hci_18x18.png
R src/webapp/components/uiOptions/images/yb/uio_icon_bigA_yellowBlack_20x20.png
R src/webapp/components/uiOptions/images/yb/uio_icon_button.png
R src/webapp/components/uiOptions/images/yb/uio_icon_contrast.png
R src/webapp/components/uiOptions/images/yb/uio_icon_indicator.png
R src/webapp/components/uiOptions/images/yb/uio_icon_layoutandnavigation_yellowBlackInverted_16x16.png
R src/webapp/components/uiOptions/images/yb/uio_icon_layoutandnavigation_yellowBlack_16x16.png
R src/webapp/components/uiOptions/images/yb/uio_icon_layoutandnavigation_yellowBlack_18x18.png
R src/webapp/components/uiOptions/images/yb/uio_icon_lineSpace.png
R src/webapp/components/uiOptions/images/yb/uio_icon_linesNarrow_yellowBlack_16x12.png
R src/webapp/components/uiOptions/images/yb/uio_icon_linesWide_yellowBlack_16x21.png
R src/webapp/components/uiOptions/images/yb/uio_icon_linksandbuttons_yellowBlackInverted_16x16.png
R src/webapp/components/uiOptions/images/yb/uio_icon_linksandbuttons_yellowBlack_16x16.png
R src/webapp/components/uiOptions/images/yb/uio_icon_linksandbuttons_yellowBlack_18x18.png
R src/webapp/components/uiOptions/images/yb/uio_icon_list.png
R src/webapp/components/uiOptions/images/yb/uio_icon_smallA_yellowBlack_10x10.png
R src/webapp/components/uiOptions/images/yb/uio_icon_textSize.png
R src/webapp/components/uiOptions/images/yb/uio_icon_textStyle.png
R src/webapp/components/uiOptions/images/yb/uio_icon_textanddisplay_yellowBlackInverted_16x16.png
R src/webapp/components/uiOptions/images/yb/uio_icon_textanddisplay_yellowBlack_16x16.png
R src/webapp/components/uiOptions/images/yb/uio_icon_textanddisplay_yellowBlack_18x18.png
A src/webapp/lib/fonts/InfusionIcons-UIOptions.ttf
Log Message:
-----------
FLUID-4995: Images removed from UIO, replaced with font icons
Commit: 6d9b5c39d718363dc5269958e7e76207d5eca6df
https://github.com/fluid-project/infusion/commit/6d9b5c39d718363dc5269958e7e76207d5eca6df
Author: heidi valles <hvalles at ocad.ca>
Date: 2013-05-13 (Mon, 13 May 2013)
Changed paths:
M src/webapp/components/uiOptions/css/FatPanelUIOptionsFrame.css
M src/webapp/components/uiOptions/css/UIOptions.css
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-textFont.html
M src/webapp/components/uiOptions/html/UIOptionsTemplate-textSizer.html
Log Message:
-----------
FLUID-4995: Css changes to add font icons
Commit: 5b6b0daac21d37a8ee76d7571b7e3106d59d7796
https://github.com/fluid-project/infusion/commit/5b6b0daac21d37a8ee76d7571b7e3106d59d7796
Author: heidi valles <hvalles at ocad.ca>
Date: 2013-05-13 (Mon, 13 May 2013)
Changed paths:
M src/webapp/components/uiOptions/css/FatPanelUIOptionsFrame.css
M src/webapp/components/uiOptions/css/UIOptions.css
R src/webapp/components/uiOptions/images/bw/uio_icon_reset_hcInverted_16x16.png
R src/webapp/components/uiOptions/images/by/uio_icon_reset_blackYellowInverted_16x16.png
R src/webapp/components/uiOptions/images/default/uio_icon_reset_defaultInverted_16x16.png
R src/webapp/components/uiOptions/images/wb/uio_icon_reset_hciInverted_16x16.png
R src/webapp/components/uiOptions/images/yb/uio_icon_reset_yellowBlackInverted_16x16.png
Log Message:
-----------
FLUID-4995: CSS cleanup
Commit: ee497c961c9d3cba65df0f92ca48050031e48b7d
https://github.com/fluid-project/infusion/commit/ee497c961c9d3cba65df0f92ca48050031e48b7d
Author: heidi valles <hvalles at ocad.ca>
Date: 2013-05-13 (Mon, 13 May 2013)
Changed paths:
M src/webapp/demos/uiOptions/css/uiOptions.css
M src/webapp/demos/uiOptions/html/uiOptions.html
Log Message:
-----------
FLUID-4995: Reset on demo tab
Commit: 216065bec598e0d8779846768273a37b47aee6f8
https://github.com/fluid-project/infusion/commit/216065bec598e0d8779846768273a37b47aee6f8
Author: heidi valles <hvalles at ocad.ca>
Date: 2013-05-13 (Mon, 13 May 2013)
Changed paths:
M src/webapp/components/uiOptions/css/FatPanelUIOptionsFrame.css
M src/webapp/components/uiOptions/css/ie8.css
A src/webapp/lib/fonts/InfusionIcons-UIOptions.eot
M src/webapp/lib/fonts/InfusionIcons-UIOptions.ttf
Log Message:
-----------
FLUID-4995: font file update, IE8 additions
Commit: 181e291e5abb240607ffb327b63ba0cd79bc1250
https://github.com/fluid-project/infusion/commit/181e291e5abb240607ffb327b63ba0cd79bc1250
Author: heidi valles <hvalles at ocad.ca>
Date: 2013-06-04 (Tue, 04 Jun 2013)
Changed paths:
M src/webapp/components/uiOptions/css/FatPanelUIOptionsFrame.css
A src/webapp/components/uiOptions/css/InfusionIcons-UIOptions.eot
A src/webapp/components/uiOptions/css/InfusionIcons-UIOptions.ttf
M src/webapp/components/uiOptions/css/UIOptions.css
R src/webapp/lib/fonts/InfusionIcons-UIOptions.eot
R src/webapp/lib/fonts/InfusionIcons-UIOptions.ttf
Log Message:
-----------
FLUID-4995: Moved icon files to uio instead of lib, moved header icons to general UIO css file
Commit: 456822fbeed10fee46a236241490aa773b4c88f0
https://github.com/fluid-project/infusion/commit/456822fbeed10fee46a236241490aa773b4c88f0
Author: heidi valles <hvalles at ocad.ca>
Date: 2013-06-04 (Tue, 04 Jun 2013)
Changed paths:
M src/webapp/components/uiOptions/css/FatPanelUIOptionsFrame.css
Log Message:
-----------
FLUID-4995: Typo fix
Commit: dbe5899897bcab6c478d3f64bdfc170cdd2a7359
https://github.com/fluid-project/infusion/commit/dbe5899897bcab6c478d3f64bdfc170cdd2a7359
Author: heidi valles <hvalles at ocad.ca>
Date: 2013-06-04 (Tue, 04 Jun 2013)
Changed paths:
M src/webapp/components/uiOptions/css/ie8.css
M src/webapp/demos/uiOptions/html/uiOptions.html
Log Message:
-----------
FLUID-4995: IE8 support
Commit: e85edaacd30f50ae93dc66087685aa7e97d14415
https://github.com/fluid-project/infusion/commit/e85edaacd30f50ae93dc66087685aa7e97d14415
Author: heidi valles <hvalles at ocad.ca>
Date: 2013-06-04 (Tue, 04 Jun 2013)
Changed paths:
M src/webapp/components/uiOptions/css/FatPanelUIOptionsFrame.css
M src/webapp/components/uiOptions/css/UIOptions.css
Log Message:
-----------
FLUID-4995: text style over-ride for icon font
Commit: 683e5604c8848d5d5534dc9f0e9f6df45637658c
https://github.com/fluid-project/infusion/commit/683e5604c8848d5d5534dc9f0e9f6df45637658c
Author: heidi valles <hvalles at ocad.ca>
Date: 2013-06-04 (Tue, 04 Jun 2013)
Changed paths:
A src/webapp/components/uiOptions/fonts/InfusionIcons-UIOptions.eot
A src/webapp/components/uiOptions/fonts/InfusionIcons-UIOptions.ttf
Log Message:
-----------
FLUID-4995: Reworked how different font format srcs are given
Commit: 7af863cc5623b6f31e8683c12d1b3aded5bc115b
https://github.com/fluid-project/infusion/commit/7af863cc5623b6f31e8683c12d1b3aded5bc115b
Author: heidi valles <hvalles at ocad.ca>
Date: 2013-06-04 (Tue, 04 Jun 2013)
Changed paths:
R src/webapp/components/uiOptions/css/InfusionIcons-UIOptions.eot
R src/webapp/components/uiOptions/css/InfusionIcons-UIOptions.ttf
M src/webapp/components/uiOptions/css/UIOptions.css
M src/webapp/components/uiOptions/css/ie8.css
Log Message:
-----------
FLUID-4995: Reworked how different font format srcs are given
Commit: d673e754e5a02ebf3352aac27330d74827acc096
https://github.com/fluid-project/infusion/commit/d673e754e5a02ebf3352aac27330d74827acc096
Author: heidi valles <hvalles at ocad.ca>
Date: 2013-06-04 (Tue, 04 Jun 2013)
Changed paths:
M src/webapp/demos/uiOptions/css/uiOptions.css
Log Message:
-----------
FLUID-4995: css typo
Commit: 0d1ed696c3ba80af82fc5c5f71e350ba0f7f1719
https://github.com/fluid-project/infusion/commit/0d1ed696c3ba80af82fc5c5f71e350ba0f7f1719
Author: heidi valles <hvalles at ocad.ca>
Date: 2013-06-04 (Tue, 04 Jun 2013)
Changed paths:
M ReleaseNotes.txt
M build-scripts/build.properties
A fonts/OpenSans-LICENSE.txt b/src/webapp/lib/fonts/OpenSans-LICENSE.txt
R fonts/OpenSans-LICENSE.txt b/src/webapp/lib/fonts/OpenSans-LICENSE.txt
R fonts/OpenSans-Light.ttf b/src/webapp/lib/fonts/OpenSans-Light.ttf
A fonts/OpenSans-Light.ttf b/src/webapp/lib/fonts/OpenSans-Light.ttf
A fonts/OpenSans-Regular.ttf b/src/webapp/lib/fonts/OpenSans-Regular.ttf
R fonts/OpenSans-Regular.ttf b/src/webapp/lib/fonts/OpenSans-Regular.ttf
R fonts/OpenSans-Semibold.ttf b/src/webapp/lib/fonts/OpenSans-Semibold.ttf
A fonts/OpenSans-Semibold.ttf b/src/webapp/lib/fonts/OpenSans-Semibold.ttf
M src/webapp/components/inlineEdit/js/InlineEdit.js
M src/webapp/components/inlineEdit/js/InlineEditIntegrations.js
M src/webapp/components/uiOptions/html/FatPanelUIOptionsFrame.html
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/components/uiOptions/js/FatPanelUIOptions.js
M src/webapp/components/uiOptions/js/SettingsPanels.js
M src/webapp/components/uiOptions/js/UIOptions.js
A src/webapp/components/uiOptions/js/i18n.js
M src/webapp/components/uiOptions/uiOptionsDependencies.json
M src/webapp/components/undo/js/Undo.js
M src/webapp/components/uploader/js/Uploader.js
M src/webapp/demos/inlineEdit/rich/html/inlineEdit.html
M src/webapp/demos/inlineEdit/simple/html/inlineEdit.html
M src/webapp/demos/uiOptions/html/uiOptions.html
M src/webapp/framework/core/js/Fluid.js
M src/webapp/framework/core/js/FluidIoC.js
M src/webapp/integration-demos/sakai/html/ui-options-fss-sakai.html
A src/webapp/lib/fonts/fontsDependencies.json
A src/webapp/lib/jquery/plugins/touchPunch/jQueryTouchPunchPluginDependencies.json
A src/webapp/lib/jquery/plugins/touchPunch/js/jquery.ui.touch-punch.js
M src/webapp/tests/component-tests/inlineEdit/js/InlineEditTests.js
M src/webapp/tests/component-tests/uiOptions/all-tests.html
M src/webapp/tests/component-tests/uiOptions/html/FatPanelUIOptions-test.html
M src/webapp/tests/component-tests/uiOptions/html/FullNoPreviewUIOptions-test.html
M src/webapp/tests/component-tests/uiOptions/html/FullPreviewUIOptions-test.html
A src/webapp/tests/component-tests/uiOptions/html/I18n-test.html
M src/webapp/tests/component-tests/uiOptions/html/SettingsPanels-test.html
M src/webapp/tests/component-tests/uiOptions/html/UIOptions-test.html
M src/webapp/tests/component-tests/uiOptions/js/FatPanelUIOptionsTests.js
A src/webapp/tests/component-tests/uiOptions/js/I18nTests.js
M src/webapp/tests/component-tests/uiOptions/js/UIOptionsTests.js
M src/webapp/tests/component-tests/uploader/js/UploaderCompatibilityTests.js
M src/webapp/tests/framework-tests/core/js/FluidIoCTests.js
M src/webapp/tests/manual-tests/html/dropdown.html
M src/webapp/tests/manual-tests/html/uiOptionsFullWithPreview.html
M src/webapp/tests/manual-tests/html/uiOptionsFullWithoutPreview.html
Log Message:
-----------
Merge branch 'master' of git://github.com/fluid-project/infusion into FLUID-4995
Conflicts:
src/webapp/components/uiOptions/html/UIOptionsTemplate-layout.html
src/webapp/components/uiOptions/html/UIOptionsTemplate-lineSpacer.html
src/webapp/components/uiOptions/html/UIOptionsTemplate-textFont.html
src/webapp/components/uiOptions/html/UIOptionsTemplate-textSizer.html
Commit: 20bb4282878b301837fcbd888ed4f61ef4c01dd4
https://github.com/fluid-project/infusion/commit/20bb4282878b301837fcbd888ed4f61ef4c01dd4
Author: heidi valles <hvalles at ocad.ca>
Date: 2013-06-04 (Tue, 04 Jun 2013)
Changed paths:
M src/webapp/components/uiOptions/css/ie8.css
Log Message:
-----------
FLUID-4995: ie8 font face added back in
Commit: 15dca59fee40c27f5e76c4ce2084fd19ec0f2b1c
https://github.com/fluid-project/infusion/commit/15dca59fee40c27f5e76c4ce2084fd19ec0f2b1c
Author: heidi valles <hvalles at ocad.ca>
Date: 2013-06-04 (Tue, 04 Jun 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/demos/uiOptions/css/uiOptions.css
Log Message:
-----------
FLUID-4995: name-spaced icon classes, removed line-spacing
Commit: 377269139b5efefd90eaba06ea3178f7d29f56a1
https://github.com/fluid-project/infusion/commit/377269139b5efefd90eaba06ea3178f7d29f56a1
Author: Justin Obara <obarajustin at gmail.com>
Date: 2013-06-05 (Wed, 05 Jun 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/css/ie8.css
A src/webapp/components/uiOptions/fonts/InfusionIcons-UIOptions.eot
A src/webapp/components/uiOptions/fonts/InfusionIcons-UIOptions.ttf
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-textFont.html
M src/webapp/components/uiOptions/html/UIOptionsTemplate-textSizer.html
R src/webapp/components/uiOptions/images/bw/uio_icon_bigA_hc_20x20.png
R src/webapp/components/uiOptions/images/bw/uio_icon_button.png
R src/webapp/components/uiOptions/images/bw/uio_icon_contrast.png
R src/webapp/components/uiOptions/images/bw/uio_icon_indicator.png
R src/webapp/components/uiOptions/images/bw/uio_icon_layoutandnavigation_hcInverted_16x16.png
R src/webapp/components/uiOptions/images/bw/uio_icon_layoutandnavigation_hc_16x16.png
R src/webapp/components/uiOptions/images/bw/uio_icon_layoutandnavigation_hc_18x18.png
R src/webapp/components/uiOptions/images/bw/uio_icon_lineSpace.png
R src/webapp/components/uiOptions/images/bw/uio_icon_linesNarrow_hc_16x12.png
R src/webapp/components/uiOptions/images/bw/uio_icon_linesWide_hc_16x21.png
R src/webapp/components/uiOptions/images/bw/uio_icon_linksandbuttons_hcInverted_16x16.png
R src/webapp/components/uiOptions/images/bw/uio_icon_linksandbuttons_hc_16x16.png
R src/webapp/components/uiOptions/images/bw/uio_icon_linksandbuttons_hc_18x18.png
R src/webapp/components/uiOptions/images/bw/uio_icon_list.png
R src/webapp/components/uiOptions/images/bw/uio_icon_reset_hcInverted_16x16.png
R src/webapp/components/uiOptions/images/bw/uio_icon_smallA_hc_10x10.png
R src/webapp/components/uiOptions/images/bw/uio_icon_textSize.png
R src/webapp/components/uiOptions/images/bw/uio_icon_textStyle.png
R src/webapp/components/uiOptions/images/bw/uio_icon_textanddisplay_hcInverted_16x16.png
R src/webapp/components/uiOptions/images/bw/uio_icon_textanddisplay_hc_16x16.png
R src/webapp/components/uiOptions/images/bw/uio_icon_textanddisplay_hc_18x18.png
R src/webapp/components/uiOptions/images/by/uio_icon_bigA_blackYellow_20x20.png
R src/webapp/components/uiOptions/images/by/uio_icon_button.png
R src/webapp/components/uiOptions/images/by/uio_icon_contrast.png
R src/webapp/components/uiOptions/images/by/uio_icon_indicator.png
R src/webapp/components/uiOptions/images/by/uio_icon_layoutandnavigation_blackYellowInverted_16x16.png
R src/webapp/components/uiOptions/images/by/uio_icon_layoutandnavigation_blackYellow_16x16.png
R src/webapp/components/uiOptions/images/by/uio_icon_layoutandnavigation_blackYellow_18x18.png
R src/webapp/components/uiOptions/images/by/uio_icon_lineSpace.png
R src/webapp/components/uiOptions/images/by/uio_icon_linesNarrow_blackYellow_16x12.png
R src/webapp/components/uiOptions/images/by/uio_icon_linesWide_blackYellow_16x21.png
R src/webapp/components/uiOptions/images/by/uio_icon_linksandbuttons_blackYellowInverted_16x16.png
R src/webapp/components/uiOptions/images/by/uio_icon_linksandbuttons_blackYellow_16x16.png
R src/webapp/components/uiOptions/images/by/uio_icon_linksandbuttons_blackYellow_18x18.png
R src/webapp/components/uiOptions/images/by/uio_icon_list.png
R src/webapp/components/uiOptions/images/by/uio_icon_reset_blackYellowInverted_16x16.png
R src/webapp/components/uiOptions/images/by/uio_icon_smallA_blackYellow_10x10.png
R src/webapp/components/uiOptions/images/by/uio_icon_textSize.png
R src/webapp/components/uiOptions/images/by/uio_icon_textStyle.png
R src/webapp/components/uiOptions/images/by/uio_icon_textanddisplay_blackYellowInverted_16x16.png
R src/webapp/components/uiOptions/images/by/uio_icon_textanddisplay_blackYellow_16x16.png
R src/webapp/components/uiOptions/images/by/uio_icon_textanddisplay_blackYellow_18x18.png
R src/webapp/components/uiOptions/images/default/uio_icon_bigA_default_20x20.png
R src/webapp/components/uiOptions/images/default/uio_icon_button.png
R src/webapp/components/uiOptions/images/default/uio_icon_contrast.png
R src/webapp/components/uiOptions/images/default/uio_icon_indicator.png
R src/webapp/components/uiOptions/images/default/uio_icon_layoutandnavigation_defaultInverted_16x16.png
R src/webapp/components/uiOptions/images/default/uio_icon_layoutandnavigation_default_16x16.png
R src/webapp/components/uiOptions/images/default/uio_icon_layoutandnavigation_default_18x18.png
R src/webapp/components/uiOptions/images/default/uio_icon_lineSpace.png
R src/webapp/components/uiOptions/images/default/uio_icon_linesNarrow_default_16x12.png
R src/webapp/components/uiOptions/images/default/uio_icon_linesWide_default_16x21.png
R src/webapp/components/uiOptions/images/default/uio_icon_linksandbuttons_defaultInverted_16x16.png
R src/webapp/components/uiOptions/images/default/uio_icon_linksandbuttons_default_16x16.png
R src/webapp/components/uiOptions/images/default/uio_icon_linksandbuttons_default_18x18.png
R src/webapp/components/uiOptions/images/default/uio_icon_list.png
R src/webapp/components/uiOptions/images/default/uio_icon_reset_defaultInverted_16x16.png
R src/webapp/components/uiOptions/images/default/uio_icon_smallA_default_10x10.png
R src/webapp/components/uiOptions/images/default/uio_icon_textSize.png
R src/webapp/components/uiOptions/images/default/uio_icon_textStyle.png
R src/webapp/components/uiOptions/images/default/uio_icon_textanddisplay_defaultInverted_16x16.png
R src/webapp/components/uiOptions/images/default/uio_icon_textanddisplay_default_16x16.png
R src/webapp/components/uiOptions/images/default/uio_icon_textanddisplay_default_18x18.png
R src/webapp/components/uiOptions/images/wb/uio_icon_bigA_hci_20x20.png
R src/webapp/components/uiOptions/images/wb/uio_icon_button.png
R src/webapp/components/uiOptions/images/wb/uio_icon_contrast.png
R src/webapp/components/uiOptions/images/wb/uio_icon_indicator.png
R src/webapp/components/uiOptions/images/wb/uio_icon_layoutandnavigation_hciInverted_16x16.png
R src/webapp/components/uiOptions/images/wb/uio_icon_layoutandnavigation_hci_16x16.png
R src/webapp/components/uiOptions/images/wb/uio_icon_layoutandnavigation_hci_18x18.png
R src/webapp/components/uiOptions/images/wb/uio_icon_lineSpace.png
R src/webapp/components/uiOptions/images/wb/uio_icon_linesNarrow_hci_16x12.png
R src/webapp/components/uiOptions/images/wb/uio_icon_linesWide_hci_16x21.png
R src/webapp/components/uiOptions/images/wb/uio_icon_linksandbuttons_hciInverted_16x16.png
R src/webapp/components/uiOptions/images/wb/uio_icon_linksandbuttons_hci_16x16.png
R src/webapp/components/uiOptions/images/wb/uio_icon_linksandbuttons_hci_18x18.png
R src/webapp/components/uiOptions/images/wb/uio_icon_list.png
R src/webapp/components/uiOptions/images/wb/uio_icon_reset_hciInverted_16x16.png
R src/webapp/components/uiOptions/images/wb/uio_icon_smallA_hci_10x10.png
R src/webapp/components/uiOptions/images/wb/uio_icon_textSize.png
R src/webapp/components/uiOptions/images/wb/uio_icon_textStyle.png
R src/webapp/components/uiOptions/images/wb/uio_icon_textanddisplay_hciInverted_16x16.png
R src/webapp/components/uiOptions/images/wb/uio_icon_textanddisplay_hci_16x16.png
R src/webapp/components/uiOptions/images/wb/uio_icon_textanddisplay_hci_18x18.png
R src/webapp/components/uiOptions/images/yb/uio_icon_bigA_yellowBlack_20x20.png
R src/webapp/components/uiOptions/images/yb/uio_icon_button.png
R src/webapp/components/uiOptions/images/yb/uio_icon_contrast.png
R src/webapp/components/uiOptions/images/yb/uio_icon_indicator.png
R src/webapp/components/uiOptions/images/yb/uio_icon_layoutandnavigation_yellowBlackInverted_16x16.png
R src/webapp/components/uiOptions/images/yb/uio_icon_layoutandnavigation_yellowBlack_16x16.png
R src/webapp/components/uiOptions/images/yb/uio_icon_layoutandnavigation_yellowBlack_18x18.png
R src/webapp/components/uiOptions/images/yb/uio_icon_lineSpace.png
R src/webapp/components/uiOptions/images/yb/uio_icon_linesNarrow_yellowBlack_16x12.png
R src/webapp/components/uiOptions/images/yb/uio_icon_linesWide_yellowBlack_16x21.png
R src/webapp/components/uiOptions/images/yb/uio_icon_linksandbuttons_yellowBlackInverted_16x16.png
R src/webapp/components/uiOptions/images/yb/uio_icon_linksandbuttons_yellowBlack_16x16.png
R src/webapp/components/uiOptions/images/yb/uio_icon_linksandbuttons_yellowBlack_18x18.png
R src/webapp/components/uiOptions/images/yb/uio_icon_list.png
R src/webapp/components/uiOptions/images/yb/uio_icon_reset_yellowBlackInverted_16x16.png
R src/webapp/components/uiOptions/images/yb/uio_icon_smallA_yellowBlack_10x10.png
R src/webapp/components/uiOptions/images/yb/uio_icon_textSize.png
R src/webapp/components/uiOptions/images/yb/uio_icon_textStyle.png
R src/webapp/components/uiOptions/images/yb/uio_icon_textanddisplay_yellowBlackInverted_16x16.png
R src/webapp/components/uiOptions/images/yb/uio_icon_textanddisplay_yellowBlack_16x16.png
R src/webapp/components/uiOptions/images/yb/uio_icon_textanddisplay_yellowBlack_18x18.png
M src/webapp/demos/uiOptions/css/uiOptions.css
M src/webapp/demos/uiOptions/html/uiOptions.html
Log Message:
-----------
Merge remote-tracking branch 'heidi/FLUID-4995'
* heidi/FLUID-4995:
FLUID-4995: name-spaced icon classes, removed line-spacing
FLUID-4995: ie8 font face added back in
FLUID-4995: css typo
FLUID-4995: Reworked how different font format srcs are given
FLUID-4995: Reworked how different font format srcs are given
FLUID-4995: text style over-ride for icon font
FLUID-4995: IE8 support
FLUID-4995: Typo fix
FLUID-4995: Moved icon files to uio instead of lib, moved header icons to general UIO css file
FLUID-4995: font file update, IE8 additions
FLUID-4995: Reset on demo tab
FLUID-4995: CSS cleanup
FLUID-4995: Css changes to add font icons
FLUID-4995: Images removed from UIO, replaced with font icons
Compare: https://github.com/fluid-project/infusion/compare/c3c88cd965e8...377269139b5e
More information about the Commits
mailing list