[Commits] [fluid-project/studios.fluidproject.org] 95dde9: Merge branch 'development' into STUDIO-16-colour-f...

noreply at github.com noreply at github.com
Fri Dec 9 16:22:23 UTC 2011


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

  Commit: 95dde9467fd05c283ba139cd106fe0309976784b
      https://github.com/fluid-project/studios.fluidproject.org/commit/95dde9467fd05c283ba139cd106fe0309976784b
  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
  M wp-content/themes/fluid-studios/style.css

  Log Message:
  -----------
  Merge branch 'development' into STUDIO-16-colour-fixes


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

  Changed paths:
    M wp-content/themes/fluid-studios/header.php
  M wp-content/themes/fluid-studios/style.css

  Log Message:
  -----------
  Merge remote-tracking branch 'acheetham/STUDIO-13-font-neutron' into development

* acheetham/STUDIO-13-font-neutron:
  STUDIO-13: Small clean-up to CSS.
  STUDIO-13: Switch to CSS import for font, use lighter weight.
  STUDIO-13: Set base font to embedded 'Neuton' font.


  Commit: 0cd5e1bad2eb85d33360267cb11ad757467c0bf8
      https://github.com/fluid-project/studios.fluidproject.org/commit/0cd5e1bad2eb85d33360267cb11ad757467c0bf8
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2011-12-09 (Fri, 09 Dec 2011)

  Changed paths:
    M wp-content/themes/fluid-studios/header.php
  M wp-content/themes/fluid-studios/style.css

  Log Message:
  -----------
  Merge branch 'development' into STUDIO-16-colour-fixes


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

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

  Log Message:
  -----------
  STUDIO-10: Fixed the issue that only one post is showed on the selected tags page.


  Commit: aec653c83e36eeefcb71cc1b53c92b5ece5da25d
      https://github.com/fluid-project/studios.fluidproject.org/commit/aec653c83e36eeefcb71cc1b53c92b5ece5da25d
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2011-12-09 (Fri, 09 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
  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/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 branch 'development' of git://github.com/fluid-project/studios.fluidproject.org into development


  Commit: 5b5e903acb51ec344694397388d85a147fa6bfb3
      https://github.com/fluid-project/studios.fluidproject.org/commit/5b5e903acb51ec344694397388d85a147fa6bfb3
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2011-12-09 (Fri, 09 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
  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/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 branch 'development' into STUDIO-10


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

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

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

* cindyli/STUDIO-10:
  STUDIO-10: Fixed the issue that only one post is showed on the selected tags page.


  Commit: 3d74cc3d399dcd99aa65b151d4676b20c74a488e
      https://github.com/fluid-project/studios.fluidproject.org/commit/3d74cc3d399dcd99aa65b151d4676b20c74a488e
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2011-12-09 (Fri, 09 Dec 2011)

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

  Log Message:
  -----------
  STUDIO-16: Fix hover styling.


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

  Changed paths:
    M wp-content/themes/fluid-studios/functions.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-16-colour-fixes' into development

* acheetham/STUDIO-16-colour-fixes:
  STUDIO-16: Fix hover styling.
  STUDIO-16: Small styling fixes to some colours.


  Commit: 17eac7eddc5ae60f9d0735a73f418b49094be565
      https://github.com/fluid-project/studios.fluidproject.org/commit/17eac7eddc5ae60f9d0735a73f418b49094be565
  Author: Colin Clark <colinbdclark at gmail.com>
  Date:   2011-12-09 (Fri, 09 Dec 2011)

  Changed paths:
    M wp-content/themes/fluid-studios/style.css

  Log Message:
  -----------
  Merge remote-tracking branch 'michelled/STUDIO-11' into development

* michelled/STUDIO-11:
  STUDIO-11: Removing the space between the excerpt and the tags on the tag pages.


  Commit: 3dd0f543048a205906e3f6e0668575ef0d1d9012
      https://github.com/fluid-project/studios.fluidproject.org/commit/3dd0f543048a205906e3f6e0668575ef0d1d9012
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2011-12-09 (Fri, 09 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/single.php
  M wp-content/themes/fluid-studios/style.css

  Log Message:
  -----------
  Merge branch 'development'

* development:
  STUDIO-16: Fix hover styling.
  STUDIO-10: Fixed the issue that only one post is showed on the selected tags page.
  STUDIO-13: Small clean-up to CSS.
  STUDIO-13: Switch to CSS import for font, use lighter weight.
  STUDIO-13: Set base font to embedded 'Neuton' font.
  STUDIO-16: Small styling fixes to some colours.
  STUDIO-11: Removing the space between the excerpt and the tags on the tag pages.


Compare: https://github.com/fluid-project/studios.fluidproject.org/compare/88213e0...3dd0f54


More information about the Commits mailing list