[Commits] [fluid-project/studios.fluidproject.org] ee7294: Merge branch 'development' into STUDIO-36-backgrou...

noreply at github.com noreply at github.com
Mon Dec 19 17:04:12 UTC 2011


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

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

  Changed paths:
    M README.txt
  M wp-admin/edit-form-advanced.php
  A wp-content/plugins/fl-title-length/fl-title-length.php
  A wp-content/plugins/fl-title-length/js/fl-title-length.js
  A wp-content/plugins/fl-title-length/readme.txt
  A wp-content/themes/fluid-studios/favicon.ico
  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/sidebar-non-index.php
  M wp-content/themes/fluid-studios/style.css

  Log Message:
  -----------
  Merge branch 'development' into STUDIO-36-background-on-right

Conflicts:
	wp-content/themes/fluid-studios/style.css


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

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

  Log Message:
  -----------
  STUDIO-36: Fix to layering to ensure new login button position works with backgrounds.


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

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

  Log Message:
  -----------
  Merge remote-tracking branch 'acheetham/STUDIO-36-background-on-right' into development

* acheetham/STUDIO-36-background-on-right:
  STUDIO-36: Fix to layering to ensure new login button position works with backgrounds.
  STUDIO-36: Adding JS hook to hide the background when the theme is switched.
  STUDIO-36: Fix background on short pages.
  STUDIO-36: Ensure background doesn't cover content at bottom. Still not right on short pages.
  Adding background to far right.


Compare: https://github.com/fluid-project/studios.fluidproject.org/compare/d1351a0...d9675f2


More information about the Commits mailing list