[Commits] [fluid-project/studios.fluidproject.org] 76232c: Merge branch 'development' into STUDIO-9-consisten...

noreply at github.com noreply at github.com
Thu Dec 8 20:19:40 UTC 2011


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

  Commit: 76232c77bbba433ff3c09f6cf5a7893d7bfe2235
      https://github.com/fluid-project/studios.fluidproject.org/commit/76232c77bbba433ff3c09f6cf5a7893d7bfe2235
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2011-12-08 (Thu, 08 Dec 2011)

  Changed paths:
    A wp-content/themes/fluid-studios/images/icon-back-green.png
  A wp-content/themes/fluid-studios/images/logo-fluidSTUDIOS-green.png
  M wp-content/themes/fluid-studios/style.css

  Log Message:
  -----------
  Merge branch 'development' into STUDIO-9-consistent-row-height


  Commit: 7b74d21f101c5195584b533dbf7d220fcead9d9a
      https://github.com/fluid-project/studios.fluidproject.org/commit/7b74d21f101c5195584b533dbf7d220fcead9d9a
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2011-12-08 (Thu, 08 Dec 2011)

  Changed paths:
    M wp-content/themes/fluid-studios/archive.php
  M wp-content/themes/fluid-studios/functions.php
  M wp-content/themes/fluid-studios/header.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/page.php
  M wp-content/themes/fluid-studios/search.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

  Log Message:
  -----------
  STUDIO-9: Move the 'tag summary' code into functions.php; clean up whitespace.


  Commit: 63d68527b630c4b65761cbf26ca950f58b7d7c2e
      https://github.com/fluid-project/studios.fluidproject.org/commit/63d68527b630c4b65761cbf26ca950f58b7d7c2e
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2011-12-08 (Thu, 08 Dec 2011)

  Changed paths:
    M wp-content/themes/fluid-studios/functions.php

  Log Message:
  -----------
  STUDIO-9: Fix naming conventions for new functions.


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

  Changed paths:
    M wp-content/themes/fluid-studios/archive.php
  M wp-content/themes/fluid-studios/functions.php
  M wp-content/themes/fluid-studios/header.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/page.php
  M wp-content/themes/fluid-studios/search.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:
  -----------
  Merge remote-tracking branch 'acheetham/STUDIO-9-consistent-row-height' into development

* acheetham/STUDIO-9-consistent-row-height:
  STUDIO-9: Fix naming conventions for new functions.
  STUDIO-9: Move the 'tag summary' code into functions.php; clean up whitespace.
  STUDIO-9: Small styling fixes to improve cross-browser appearance.
  STUDIO-9: Temporary implementation of consistent row heights on the index pages.


Compare: https://github.com/fluid-project/studios.fluidproject.org/compare/ffdff0a...fcfdbf7


More information about the Commits mailing list