[Commits] [fluid-project/studios.fluidproject.org] d24972: Merge branch 'development' of git://github.com/flu...

noreply at github.com noreply at github.com
Thu Dec 15 15:41:25 UTC 2011


  Branch: refs/heads/development
  Home:   https://github.com/fluid-project/studios.fluidproject.org

  Commit: d249720da51158a34d7ae55481ae155b35806277
      https://github.com/fluid-project/studios.fluidproject.org/commit/d249720da51158a34d7ae55481ae155b35806277
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2011-12-14 (Wed, 14 Dec 2011)

  Changed paths:
    M wp-admin/edit-form-advanced.php
  R wp-content/themes/fluid-studios/README.txt
  R wp-content/themes/fluid-studios/apple-touch-icon.png
  R wp-content/themes/fluid-studios/comments.php
  R wp-content/themes/fluid-studios/favicon.ico
  M wp-content/themes/fluid-studios/footer.php
  M wp-content/themes/fluid-studios/functions.php
  M wp-content/themes/fluid-studios/header.php
  R wp-content/themes/fluid-studios/images/960-grid.png
  R wp-content/themes/fluid-studios/images/fluid-logo.png
  M wp-content/themes/fluid-studios/inc/meta.php
  R wp-content/themes/fluid-studios/inc/not-found.php
  R wp-content/themes/fluid-studios/inc/search-not-found.php
  M wp-content/themes/fluid-studios/inc/sidebar-common.php
  M wp-content/themes/fluid-studios/inc/single-post-summary.php
  M wp-content/themes/fluid-studios/infusion/components/uiOptions/css/FatPanelUIOptions.css
  M wp-content/themes/fluid-studios/infusion/components/uiOptions/css/FatPanelUIOptionsFrame.css
  R wp-content/themes/fluid-studios/js/modernizr.js
  R wp-content/themes/fluid-studios/license.txt
  R wp-content/themes/fluid-studios/page.php
  R wp-content/themes/fluid-studios/screenshot.png
  R wp-content/themes/fluid-studios/search.php
  R wp-content/themes/fluid-studios/searchform.php
  M wp-content/themes/fluid-studios/sidebar-non-index.php
  M wp-content/themes/fluid-studios/single.php
  M wp-content/themes/fluid-studios/style.css

  Log Message:
  -----------
  Merge branch 'development' of git://github.com/fluid-project/studios.fluidproject.org into development


  Commit: 088fb5616389633d84660a6399d50f38b1ca4e6d
      https://github.com/fluid-project/studios.fluidproject.org/commit/088fb5616389633d84660a6399d50f38b1ca4e6d
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2011-12-15 (Thu, 15 Dec 2011)

  Changed paths:
    M wp-admin/edit-form-advanced.php
  R wp-content/themes/fluid-studios/README.txt
  R wp-content/themes/fluid-studios/apple-touch-icon.png
  R wp-content/themes/fluid-studios/comments.php
  R wp-content/themes/fluid-studios/favicon.ico
  M wp-content/themes/fluid-studios/footer.php
  M wp-content/themes/fluid-studios/functions.php
  M wp-content/themes/fluid-studios/header.php
  R wp-content/themes/fluid-studios/images/960-grid.png
  R wp-content/themes/fluid-studios/images/fluid-logo.png
  M wp-content/themes/fluid-studios/inc/meta.php
  R wp-content/themes/fluid-studios/inc/not-found.php
  R wp-content/themes/fluid-studios/inc/search-not-found.php
  M wp-content/themes/fluid-studios/inc/sidebar-common.php
  M wp-content/themes/fluid-studios/inc/single-post-summary.php
  M wp-content/themes/fluid-studios/index.php
  M wp-content/themes/fluid-studios/infusion/components/uiOptions/css/FatPanelUIOptions.css
  M wp-content/themes/fluid-studios/infusion/components/uiOptions/css/FatPanelUIOptionsFrame.css
  R wp-content/themes/fluid-studios/js/modernizr.js
  R wp-content/themes/fluid-studios/license.txt
  R wp-content/themes/fluid-studios/page.php
  R wp-content/themes/fluid-studios/screenshot.png
  R wp-content/themes/fluid-studios/search.php
  R wp-content/themes/fluid-studios/searchform.php
  M wp-content/themes/fluid-studios/sidebar-non-index.php
  M wp-content/themes/fluid-studios/sidebar.php
  M wp-content/themes/fluid-studios/single.php
  M wp-content/themes/fluid-studios/style.css

  Log Message:
  -----------
  STUDIO-14: Resolved the conflicts and fixed the styling issues that are resulted from the merge of the latest development branch.


  Commit: 9f49d91bdf223e1f154e9c517327b7e55cae0bb5
      https://github.com/fluid-project/studios.fluidproject.org/commit/9f49d91bdf223e1f154e9c517327b7e55cae0bb5
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2011-12-15 (Thu, 15 Dec 2011)

  Changed paths:
    M wp-content/themes/fluid-studios/header.php
  M wp-content/themes/fluid-studios/inc/single-post-summary.php
  M wp-content/themes/fluid-studios/index.php
  M wp-content/themes/fluid-studios/sidebar-non-index.php
  M wp-content/themes/fluid-studios/sidebar.php
  M wp-content/themes/fluid-studios/single.php
  M wp-content/themes/fluid-studios/style.css
  A wp-content/themes/fluid-studios/style_media.css

  Log Message:
  -----------
  Merge remote-tracking branch 'cindyli/STUDIO-14' into development

* cindyli/STUDIO-14:
  STUDIO-14: Fixed the IE8 styling issues that are caused by, 1. The misuse of the <section> tag; 2. The mix of the regular css classes and @import, @media keywords in one single css file is not handled properly in IE8.


Compare: https://github.com/fluid-project/studios.fluidproject.org/compare/16286a7...9f49d91


More information about the Commits mailing list