Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SCSS calculation fixes #63

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

SCSS calculation fixes #63

wants to merge 8 commits into from

Commits on May 14, 2012

  1. Fixing nested column width calculations.

    - Fixed bug where the overall column width was shadowed by a parameter
      name.
    - Removed the (unnecessary) second parameter to column(). The
      value was used to calculate the ratio of $total-width/$calculated-width
      for fluid-width purposes, and therefore should always use the global
      $column count.
    Brandon Carpenter committed May 14, 2012
    Configuration menu
    Copy the full SHA
    f0cf302 View commit details
    Browse the repository at this point in the history
  2. Simplified calculations: Added gridsystem-ratio()

    The gridsystem-ratio() function calculates the ratio of the
    user-specified $total-width, to the calculated grid width.
    
    This ratio was used in every width calculation, and rewriting the
    calculations using this gridsystem-ratio() made their purposes much more
    obvious.
    Brandon Carpenter committed May 14, 2012
    Configuration menu
    Copy the full SHA
    07c9fba View commit details
    Browse the repository at this point in the history
  3. Fixing incorrect row width calculation.

    gridsystem-width() already calculates the width with the outer margin
    included. Adding the gutter again makes the width of the row too large.
    Brandon Carpenter committed May 14, 2012
    Configuration menu
    Copy the full SHA
    d1b24f8 View commit details
    Browse the repository at this point in the history
  4. Simplfied the column width calculation.

    An expression in the column width calculation was mathematically
    equivalent to the value calculated by gridsystem-width(), so I replaced
    it with a call to that function.
    Brandon Carpenter committed May 14, 2012
    Configuration menu
    Copy the full SHA
    974f83b View commit details
    Browse the repository at this point in the history
  5. Simplfied the push/pull margin calculation.

    Just as in the width calculation for column(), the push and pull mixins
    contained an expression that was mathematically equivalent to the value
    calculated by gridsystem-width(), so I replaced it with a call to that
    function.
    Brandon Carpenter committed May 14, 2012
    Configuration menu
    Copy the full SHA
    a5e86fc View commit details
    Browse the repository at this point in the history
  6. Corrected the push/pull margin calculations.

    The previous formula for calculating push/pull margins was incorrect.
    The correct behavior is for the push/pull margin of $x to be equivalent
    to the width of column($x) plus half of the gutter.
    
    The formula could be simplified further, but I feel that writing it this
    way emphesises the relationship to the column width formula.
    Brandon Carpenter committed May 14, 2012
    Configuration menu
    Copy the full SHA
    2a029ce View commit details
    Browse the repository at this point in the history

Commits on May 15, 2012

  1. Fixed bug in gridsystem-ratio.

    It didn't take changing default values into account. I updated it to
    recalculate the "default width" every time.
    Brandon Carpenter committed May 15, 2012
    Configuration menu
    Copy the full SHA
    ae1f183 View commit details
    Browse the repository at this point in the history
  2. Added some specs for the SCSS version.

    - Using 960.gs as a benchmark for what the column widths that are
      generated should be.
    - Ensure that the row widths are calculated correctly in relation to the
      column widths.
    Brandon Carpenter committed May 15, 2012
    Configuration menu
    Copy the full SHA
    d701135 View commit details
    Browse the repository at this point in the history