[Commits] [fluid-project/studios.fluidproject.org] d43ebc: Merge branch 'development' into STUDIO-3-sidebar-f...

noreply at github.com noreply at github.com
Wed Dec 7 22:10:45 UTC 2011


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

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

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

  Log Message:
  -----------
  Merge branch 'development' into STUDIO-3-sidebar-footer


  Commit: 84f35a2b2c775b9b0a40a26d0dffe742e6b3b7d0
      https://github.com/fluid-project/studios.fluidproject.org/commit/84f35a2b2c775b9b0a40a26d0dffe742e6b3b7d0
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2011-12-07 (Wed, 07 Dec 2011)

  Changed paths:
    M wp-content/themes/fluid-studios/footer.php
  M wp-content/themes/fluid-studios/header.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/style.css

  Log Message:
  -----------
  STUDIOS-3: Another pass at fixing the sidebar and UIO button.

Still to fix:
- sidebar pattern fills screen, but if only to bottom of initially visible area


  Commit: 195a1b7a66c26e89e94c5bb0688042e719eccde3
      https://github.com/fluid-project/studios.fluidproject.org/commit/195a1b7a66c26e89e94c5bb0688042e719eccde3
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2011-12-07 (Wed, 07 Dec 2011)

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

  Log Message:
  -----------
  STUDIO-3: Remove the extra div I added.


  Commit: 9a888afd7b79ea87bf11d82e5f008a365adab851
      https://github.com/fluid-project/studios.fluidproject.org/commit/9a888afd7b79ea87bf11d82e5f008a365adab851
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2011-12-07 (Wed, 07 Dec 2011)

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

  Log Message:
  -----------
  STUDIO-3: Something very close to working wrt columns


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

  Changed paths:
    M wp-content/themes/fluid-studios/archive.php
  M wp-content/themes/fluid-studios/header.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/single.php
  M wp-content/themes/fluid-studios/style.css

  Log Message:
  -----------
  STUDIO-3: Remove unnecessary 'wrapper' div


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

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

  Log Message:
  -----------
  STUDIO-3: Working sidebar background pattern height


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

  Changed paths:
    M wp-content/themes/fluid-studios/footer.php
  M wp-content/themes/fluid-studios/index.php
  M wp-content/themes/fluid-studios/single.php
  M wp-content/themes/fluid-studios/style.css

  Log Message:
  -----------
  STUDIO-3: Ensure footer stays at bottom of page properly. (Not vertically aligned with images.)


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

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

  Log Message:
  -----------
  STUDIO-3: Ensure UIO button stays on top.


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

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

  Log Message:
  -----------
  STUDIO-3: Restyling of buttons to blue and in upper-right corner.


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

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

  Log Message:
  -----------
  STUDIO-3: Fixed text for hiding the display preferences.


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

  Changed paths:
    M wp-content/themes/fluid-studios/archive.php
  M wp-content/themes/fluid-studios/footer.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/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 'STUDIO-3-sidebar-footer' into development

* STUDIO-3-sidebar-footer:
  STUDIO-3: Fixed text for hiding the display preferences.
  STUDIO-3: Restyling of buttons to blue and in upper-right corner.
  STUDIO-3: Ensure UIO button stays on top.
  STUDIO-3: Ensure footer stays at bottom of page properly. (Not vertically aligned with images.)
  STUDIO-3: Working sidebar background pattern height
  STUDIO-3: Remove unnecessary 'wrapper' div
  STUDIO-3: Something very close to working wrt columns
  STUDIO-3: Remove the extra div I added.
  STUDIOS-3: Another pass at fixing the sidebar and UIO button.
  STUDIO-3: Get rid of space above sidebar.
  STUDIO-3: Improvements to sidebar and footer interaction.


Compare: https://github.com/fluid-project/studios.fluidproject.org/compare/c11a906...9f3aaf9


More information about the Commits mailing list