[Commits] [fluid-project/infusion] f748f7: Merge branch 'master' into FLUID-4023

noreply at github.com noreply at github.com
Wed Jun 1 20:09:38 UTC 2011

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

Commit: f748f71068125724df02a6e112db8efc423f2918
Author: Justin Obara <obarajustin at gmail.com>
Date:   2011-06-01 (Wed, 01 Jun 2011)

Changed paths:
  M src/webapp/components/pager/js/Pager.js
  M src/webapp/integration-demos/sakai/html/ui-options-fss-sakai.html
  M src/webapp/tests/component-tests/pager/js/PagerTests.js

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

Commit: 8f74283cce4195d2d89742dfe22f588ed2472546
Author: Justin Obara <obarajustin at gmail.com>
Date:   2011-06-01 (Wed, 01 Jun 2011)

Changed paths:
  M ReleaseNotes.txt
  M src/webapp/framework/fss/css/fss-layout.css

Log Message:
FLUID-4023: Added the Micro Clearfix to FSS

We were unable to obtain an adequate license for the New Clearfix at this moment. Due to this we have switched to the Micro Clearfix. It both has a smaller foot print, and is also licensed under the MIT licenses. I've updated the demo css styles in the fss-layout.css.

Commit: f430de85a8465aa09eeaa54bbe71f44ce06fe9b4
Author: Michelle D'Souza <michelled33 at gmail.com>
Date:   2011-06-01 (Wed, 01 Jun 2011)

Changed paths:
  M ReleaseNotes.txt
  A src/webapp/demos/fss/clearfix/css/clearfix.css
  A src/webapp/demos/fss/clearfix/demo.html
  A src/webapp/demos/fss/clearfix/html/clearfix.html
  A src/webapp/demos/fss/clearfix/js/clearfix.js
  M src/webapp/demos/index.html
  M src/webapp/framework/fss/css/fss-layout.css

Log Message:
Merge remote-tracking branch 'justin/FLUID-4023'

* justin/FLUID-4023:
  FLUID-4023: Added the Micro Clearfix to FSS
  FLUID-4023: Refactoring based on code review
  FLUID-4023: removed commented out markup from demo
  FLUID-4023: Added copyright to demo js file
  FLUID-4023: linted
  FLUID-4023: missed adding the link from the portal
  FLUID-4023: Removed old demo creator function
  FLUID-4023: Added demo portal page
  FLUID-4023: Updated styling and markup of demo
  FLUID-4023: Modernized the clearfix demo
  FLUID-4023: Updated paths in clearfix demo
  FLUID-4023: renaming clearfix demo files
  FLUID-4023: promoting clearfix test page to demos
  FLUID-4023: Adding in missing dependency
  FLUID-4023: Added the new clearfix solution to fss-layout and test page
  FLUID-4023: small changes to cleafix demo to emphasize clearing-too-far issue
  FLUID-4023: fixed some col styling bugs
  FLUID-4023: Switched to a custom jquery ui theme
  FLUID-4023: Added tabs to separate examples
  FLUID-4023: Added more layouts to the clearfix
  FLUID-4023: Corrected new clearfix method
  FLUID-4023: added inline-block clearfix option
  FLUID-4023: Demoing the fl-fix overflow issue
  FLUID-4023: cleaning up the updated test page
  FLUID-4021: Demonstrating an issue with clearfix
  FLUID-4023: Adding in FSS columns to the example
  FLUID-4032: Renamed title to description
  FLUID-4023: Removed guillotine bug example
  FLUID-4023: Modified a bit, to add Guillotine bug
  FLUID-4023: Refactored fl-fix.js code
  FLUID-4023: test page update for overflow issue
  FLUID-4023: Remove console log
  FLUID-4023: Adding test file for fl-fix / clearfix

Compare: https://github.com/fluid-project/infusion/compare/eab3445...f430de8

More information about the Commits mailing list