Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: modularscale/modularscale-sass
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v3.0.5
Choose a base ref
...
head repository: modularscale/modularscale-sass
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3.x
Choose a head ref
  • 18 commits
  • 21 files changed
  • 5 contributors

Commits on Feb 15, 2018

  1. REMOVE broken example link

    The link is no longer available, so it may be removed.
    nilswindisch authored Feb 15, 2018
    Copy the full SHA
    17f5cac View commit details

Commits on Feb 16, 2018

  1. Merge pull request #147 from nilswindisch/patch-1

    REMOVE broken example link
    scottkellum authored Feb 16, 2018
    Copy the full SHA
    97a3e23 View commit details

Commits on May 12, 2018

  1. updates

    scottkellum committed May 12, 2018
    Copy the full SHA
    b2b7953 View commit details
  2. Copy the full SHA
    9b12153 View commit details

Commits on May 30, 2018

  1. Update readme.md

    Fix sentence
    dinony authored May 30, 2018
    Copy the full SHA
    56d48b3 View commit details
  2. Merge pull request #153 from dinony/patch-1

    Update readme.md
    scottkellum authored May 30, 2018
    Copy the full SHA
    ee0cc66 View commit details

Commits on Sep 14, 2018

  1. fix deprecated syntax

    FND committed Sep 14, 2018
    Copy the full SHA
    7f46b61 View commit details

Commits on Sep 28, 2018

  1. Merge pull request #158 from FND/elseif-deprecation

    Fix deprecated `elseif` syntax
    scottkellum authored Sep 28, 2018
    Copy the full SHA
    4b75bf0 View commit details
  2. Copy the full SHA
    a68fc15 View commit details
  3. Version up

    scottkellum committed Sep 28, 2018
    Copy the full SHA
    68e0319 View commit details
  4. ignore zips

    scottkellum committed Sep 28, 2018
    Copy the full SHA
    b33b8c3 View commit details
  5. Copy the full SHA
    ce76e5a View commit details
  6. Version up

    scottkellum committed Sep 28, 2018
    Copy the full SHA
    aa7549e View commit details

Commits on Oct 1, 2018

  1. Forgot to commit 🙃

    scottkellum committed Oct 1, 2018
    Copy the full SHA
    98470f0 View commit details

Commits on Apr 28, 2019

  1. Mark as compatble with eyeglass v2

    Boris Bera committed Apr 28, 2019
    Copy the full SHA
    27fbff4 View commit details
  2. Add a test for eyeglass

    Boris Bera committed Apr 28, 2019
    Copy the full SHA
    e3927e0 View commit details

Commits on Sep 22, 2019

  1. Merge pull request #163 from dotboris/162-support-eyeglass-v2

    Mark module as compatible with eyeglass v1 & v2
    scottkellum authored Sep 22, 2019
    Copy the full SHA
    01e55f5 View commit details
  2. push update

    scottkellum committed Sep 22, 2019
    Copy the full SHA
    5726305 View commit details
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -8,3 +8,4 @@ libsass/npm-debug.log

stylesheets/modular-scale.zip
.DS_Store
*.zip
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "modular-scale",
"version": "v3.0.4",
"version": "v3.0.8",
"main": [
"stylesheets/_modularscale.scss"
],
16 changes: 16 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
# Version 3.0.8

* Fix issues with removal of rounding, sorry folks.

# Version 3.0.7

* Remove rounding.

# Version 3.0.6

* Fix deprecation warnings.

# Version 3.0.5

* Added an !important flag for specificity in some frameworks like IntuitCSS. [See pull 146 for details](https://github.com/modularscale/modularscale-sass/pull/146).

# Version 3.0.4

* Fixed line breaks in error messaging to be compatable with future versions of Sass.
4 changes: 2 additions & 2 deletions lib/modular-scale.rb
Original file line number Diff line number Diff line change
@@ -16,8 +16,8 @@
# a prerelease version
# Date is in the form of YYYY-MM-DD
module ModularScale
VERSION = "3.0.4"
DATE = "2017-04-04"
VERSION = "3.0.8"
DATE = "2018-09-27"
end

# This is where any custom SassScript should be placed. The functions will be
Loading