Skip to content
This repository has been archived by the owner on Jul 14, 2023. It is now read-only.
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: thoughtbot/neat
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.9.0
Choose a base ref
...
head repository: thoughtbot/neat
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref

Commits on Feb 3, 2017

  1. Remove all Neat Sass

    Tyson Gach authored and whmii committed Feb 3, 2017
    Copy the full SHA
    bf871e1 View commit details
  2. Remove all tests

    Tyson Gach authored and whmii committed Feb 3, 2017
    Copy the full SHA
    164d908 View commit details
  3. Remove Sache

    Tyson Gach authored and whmii committed Feb 3, 2017
    Copy the full SHA
    5da00ce View commit details
  4. Clear out contributing files

    Tyson Gach authored and whmii committed Feb 3, 2017
    Copy the full SHA
    33c840a View commit details
  5. Use https for RubyGems gem source

    Tyson Gach authored and whmii committed Feb 3, 2017
    Copy the full SHA
    f87b3ae View commit details
  6. ABC

    Tyson Gach authored and whmii committed Feb 3, 2017
    Copy the full SHA
    89a4576 View commit details
  7. Remove Bourbon dependency

    Tyson Gach authored and whmii committed Feb 3, 2017
    Copy the full SHA
    8c23faa View commit details
  8. Update and clear out readme

    Tyson Gach authored and whmii committed Feb 3, 2017
    Copy the full SHA
    fd8efe9 View commit details
  9. Update SCSS-Lint to 0.44

    Tyson Gach authored and whmii committed Feb 3, 2017
    Copy the full SHA
    f44d3eb View commit details
  10. Update gemspec

    Tyson Gach authored and whmii committed Feb 3, 2017
    Copy the full SHA
    377f62e View commit details
  11. Use core/ as the primary Neat source directory

    Tyson Gach authored and whmii committed Feb 3, 2017
    Copy the full SHA
    c3166e9 View commit details
  12. Remove Travis

    Tyson Gach authored and whmii committed Feb 3, 2017
    Copy the full SHA
    813a693 View commit details
  13. Remove readme badges

    Tyson Gach authored and whmii committed Feb 3, 2017
    Copy the full SHA
    edcd916 View commit details
  14. Clean up requirements

    - Remove Sass 3.2 support
    - Add LibSass requirement
    Tyson Gach authored and whmii committed Feb 3, 2017
    Copy the full SHA
    aa4aeaf View commit details
  15. Neat, not Bourbon

    Tyson Gach authored and whmii committed Feb 3, 2017
    Copy the full SHA
    1218c61 View commit details
  16. Remove engine, Railtie, and install task

    This is an artifact left from the days before the Rails Assets Pipeline. Moving
    forward, this option of install will no longer be available and we'll only
    support Rails 4.2+.
    Tyson Gach authored and whmii committed Feb 3, 2017
    Copy the full SHA
    6006f4d View commit details
  17. Mention Rails version

    Tyson Gach authored and whmii committed Feb 3, 2017
    Copy the full SHA
    44319df View commit details
  18. Update path

    Tyson Gach authored and whmii committed Feb 3, 2017
    Copy the full SHA
    a22d393 View commit details
  19. Update copyright year

    Tyson Gach authored and whmii committed Feb 3, 2017
    Copy the full SHA
    4959eb3 View commit details
  20. Clean up Rakefile

    Tyson Gach authored and whmii committed Feb 3, 2017
    Copy the full SHA
    3e5e71b View commit details
  21. Add core grid functionality

    These changes introduce the use of `calc` within Neat, allowing for more
    flexible use of the system. This includes the use of static values (ie 1.25rem)
    for the grid's gutters, while having percentage values for a column's width,
    like 1/3 or 25%.
    whmii committed Feb 3, 2017
    Copy the full SHA
    07e015e View commit details
  22. Contrib script and instructions

    wardpenney authored and whmii committed Feb 3, 2017
    Copy the full SHA
    821160f View commit details
  23. Create container for floated grid

    * Add to contrib
    wardpenney authored and whmii committed Feb 3, 2017
    Copy the full SHA
    33c76b9 View commit details
  24. Configure hound

    wardpenney authored and whmii committed Feb 3, 2017
    Copy the full SHA
    432df2e View commit details
  25. Add releasing information

    Tyson Gach authored and whmii committed Feb 3, 2017
    Copy the full SHA
    f5fab06 View commit details
  26. Fix and improve documentation

    Tyson Gach authored and whmii committed Feb 3, 2017
    Copy the full SHA
    9317ab6 View commit details
  27. Add bundle exec for rake release task

    Tyson Gach authored and whmii committed Feb 3, 2017
    Copy the full SHA
    442b104 View commit details
  28. Add push grid functionality

    whmii committed Feb 3, 2017
    Copy the full SHA
    ea449f4 View commit details
  29. Fix SASS_PATH

    History:
    
    - We tried simplifying this in Bourbon and then also brought that change
    here to Neat: thoughtbot/bourbon@73b09f6
    - It then broke the world: thoughtbot/bourbon#879
    - We then went back: thoughtbot/bourbon@a462ed2
    
    This brings the fix update that we put in Bourbon here to Neat.
    Tyson Gach authored and whmii committed Feb 3, 2017
    Copy the full SHA
    98fd6e1 View commit details
  30. Add retrieve-neat-setting function

    `retrieve-neat-setting` takes the default map `$_neat-grid-default` and merges
    it with the map passed in to it (typically `$neat-grid`) and then retrieves the
    value for the key passed into it.
    whmii committed Feb 3, 2017
    Copy the full SHA
    7a87e0e View commit details
  31. Copy the full SHA
    facdd89 View commit details
  32. Copy the full SHA
    0c0c535 View commit details
  33. Update naming of grid-calc() to _neat-column-width()

    Naming a function "-grid-calc" is disallowed and will be an error in future
    versions of Sass. This name conflicts with an existing CSS function with
    special parse rules.
    whmii committed Feb 3, 2017
    Copy the full SHA
    c0477db View commit details
  34. Added a shorthand for custom grids like 2 of 5

    This feature is a carryover from Neat 1.x. While it should be considered an
    advanced feature, It can be useful on a component level. The "official" way to
    do this is to create a map for your sub-grid and pass it in to the mixin.
    
    To achieve this, `neat-column-ratio` determines the ratio of the `$column`
    to the total columns as defined in `$neat-grid` if it detects multiple values (a
    list), it will pass the value to the `neat-parse-column`. This function will
    return the third value assuming this is meant to be the total column value.
    whmii committed Feb 3, 2017
    1
    Copy the full SHA
    141cbbd View commit details
  35. Remove unused dependencies

    Ward Penney authored and whmii committed Feb 3, 2017
    Copy the full SHA
    98d3f8c View commit details
  36. Copy the full SHA
    20b9d06 View commit details
  37. Update changelog content

    whmii committed Feb 3, 2017
    Copy the full SHA
    7805dbb View commit details
  38. Copy the full SHA
    870993a View commit details
  39. Copy the full SHA
    01299d5 View commit details
  40. Add tests

    - Restore test suite from pre-2.0 with updates from Bourbon tests
    - Add tests for grid-calc
    - Add tests for retrieve-neat-settings
    - Add tests for grid-columns
    - Add tests for grid-container
    - Add tests for grid-push
    - Rename spec files from grid calc to neat-column-width
    joshuaogle authored and whmii committed Feb 3, 2017
    Copy the full SHA
    12e6457 View commit details
  41. Add test coverage for negative values and shorthand

    - `grid-push` accepst negative values. This is now tested.
    - `grid-column` shorthand (`3 of 5` for example) is now tested with both the
      default and custom grids.
    whmii committed Feb 3, 2017
    Copy the full SHA
    16498ab View commit details
  42. Refactor neat-column-width to check if gutter is zero

    While `span-columns` contained a check for when the gutter equals zero.
    Since calc operations fail when you attempt to add or subtract zero, an
    operation like `calc(100% - 0)` would need to be output as `calc(100%)`.
    This opperation has been moved to the `neat-column-width` function so it
    can be used by the other mixins.
    whmii committed Feb 3, 2017
    Copy the full SHA
    809f58a View commit details
  43. Add full width default for grid-column on null

    `grid-column` now defaults to a full width grid object. This will likely also
    help avoid people using private functions to retrive grid settings.
    whmii committed Feb 3, 2017
    Copy the full SHA
    6e546d0 View commit details
  44. Copy the full SHA
    b629626 View commit details
  45. Copy the full SHA
    8c3c09c View commit details
  46. Copy the full SHA
    1cd51b1 View commit details
  47. Copy the full SHA
    ebd5012 View commit details
  48. Copy the full SHA
    5682b4f View commit details
  49. Neat v2.0.0-alpha.1

    whmii committed Feb 3, 2017
    Copy the full SHA
    b0f5c61 View commit details
  50. Copy the full SHA
    e506bb6 View commit details
Showing with 8,438 additions and 2,680 deletions.
  1. +34 −0 .circleci/config.yml
  2. +22 −0 .github/ISSUE_TEMPLATE.md
  3. +8 −0 .github/PULL_REQUEST_TEMPLATE.md
  4. +4 −4 .gitignore
  5. +5 −0 .hound.yml
  6. +8 −7 .npmignore
  7. +0 −1 .rspec
  8. +0 −1 .ruby-version
  9. +7 −1 .scss-lint.yml
  10. +2 −0 .tool-versions
  11. +0 −10 .travis.yml
  12. +388 −0 CHANGELOG.md
  13. +6 −0 CODE_OF_CONDUCT.md
  14. +12 −0 CONTRIBUTING.md
  15. +1 −2 Gemfile
  16. +36 −26 Gulpfile.js
  17. +1 −1 LICENSE.md
  18. +0 −47 NEWS.md
  19. +141 −213 README.md
  20. +28 −0 RELEASING.md
  21. +3 −13 Rakefile
  22. +0 −11 app/assets/stylesheets/_neat-helpers.scss
  23. +0 −24 app/assets/stylesheets/_neat.scss
  24. +0 −49 app/assets/stylesheets/functions/_new-breakpoint.scss
  25. +0 −154 app/assets/stylesheets/functions/_private.scss
  26. +0 −15 app/assets/stylesheets/grid/_box-sizing.scss
  27. +0 −33 app/assets/stylesheets/grid/_direction-context.scss
  28. +0 −28 app/assets/stylesheets/grid/_display-context.scss
  29. +0 −22 app/assets/stylesheets/grid/_fill-parent.scss
  30. +0 −92 app/assets/stylesheets/grid/_media.scss
  31. +0 −112 app/assets/stylesheets/grid/_omega.scss
  32. +0 −34 app/assets/stylesheets/grid/_outer-container.scss
  33. +0 −25 app/assets/stylesheets/grid/_pad.scss
  34. +0 −35 app/assets/stylesheets/grid/_private.scss
  35. +0 −14 app/assets/stylesheets/grid/_reset-display.scss
  36. +0 −45 app/assets/stylesheets/grid/_row.scss
  37. +0 −50 app/assets/stylesheets/grid/_shift.scss
  38. +0 −94 app/assets/stylesheets/grid/_span-columns.scss
  39. +0 −81 app/assets/stylesheets/grid/_to-deprecate.scss
  40. +0 −42 app/assets/stylesheets/grid/_visual-grid.scss
  41. +0 −25 app/assets/stylesheets/mixins/_clearfix.scss
  42. +0 −13 app/assets/stylesheets/settings/_disable-warnings.scss
  43. +0 −51 app/assets/stylesheets/settings/_grid.scss
  44. +0 −27 app/assets/stylesheets/settings/_visual-grid.scss
  45. +0 −41 bower.json
  46. +8 −0 contrib/base/_variables.scss
  47. +88 −223 contrib/index.html
  48. +11 −0 contrib/patterns/_box.scss
  49. +32 −0 contrib/patterns/_global.scss
  50. +3 −0 contrib/patterns/_grid-collapse.scss
  51. +36 −0 contrib/patterns/_grid-media.scss
  52. +12 −0 contrib/patterns/_grid-nested.scss
  53. +7 −0 contrib/patterns/_grid-push.scss
  54. +7 −0 contrib/patterns/_grid-shift.scss
  55. +3 −0 contrib/patterns/_grid-visual.scss
  56. +39 −0 contrib/patterns/_grid.scss
  57. +13 −293 contrib/styles.scss
  58. +26 −0 core/_neat.scss
  59. +21 −0 core/neat/functions/_neat-append-grid-visual.scss
  60. +23 −0 core/neat/functions/_neat-column-default.scss
  61. +24 −0 core/neat/functions/_neat-column-ratio.scss
  62. +25 −0 core/neat/functions/_neat-column-width.scss
  63. +22 −0 core/neat/functions/_neat-float-direction.scss
  64. +23 −0 core/neat/functions/_neat-merge-defaults.scss
  65. +22 −0 core/neat/functions/_neat-opposite-direction.scss
  66. +22 −0 core/neat/functions/_neat-parse-columns.scss
  67. +20 −0 core/neat/functions/_neat-parse-media.scss
  68. +19 −0 core/neat/functions/_retrieve-neat-settings.scss
  69. +35 −0 core/neat/mixins/_grid-collapse.scss
  70. +39 −0 core/neat/mixins/_grid-column.scss
  71. +31 −0 core/neat/mixins/_grid-container.scss
  72. +88 −0 core/neat/mixins/_grid-media.scss
  73. +37 −0 core/neat/mixins/_grid-push.scss
  74. +36 −0 core/neat/mixins/_grid-shift.scss
  75. +41 −0 core/neat/mixins/_grid-visual.scss
  76. +74 −0 core/neat/settings/_settings.scss
  77. +1 −1 index.js
  78. +6 −11 lib/neat.rb
  79. +0 −5 lib/neat/engine.rb
  80. +27 −8 lib/neat/generator.rb
  81. +1 −1 lib/neat/version.rb
  82. +0 −19 lib/tasks/install.rake
  83. +26 −33 neat.gemspec
  84. +5,937 −0 package-lock.json
  85. +7 −9 package.json
  86. +0 −5 sache.json
  87. 0 spec/.keep
  88. +1 −0 spec/fixtures/_setup.scss
  89. +22 −0 spec/fixtures/functions/neat-column-default.scss
  90. +30 −0 spec/fixtures/functions/neat-column-width.scss
  91. +17 −0 spec/fixtures/functions/neat-float-direction.scss
  92. +17 −0 spec/fixtures/functions/neat-opposite-direction.scss
  93. +9 −0 spec/fixtures/functions/neat-parse-media.scss
  94. +22 −0 spec/fixtures/functions/retrieve-neat-settings.scss
  95. +14 −0 spec/fixtures/mixins/grid-collapse.scss
  96. +57 −0 spec/fixtures/mixins/grid-column.scss
  97. +5 −0 spec/fixtures/mixins/grid-container.scss
  98. +45 −0 spec/fixtures/mixins/grid-media.scss
  99. +38 −0 spec/fixtures/mixins/grid-push.scss
  100. +38 −0 spec/fixtures/mixins/grid-shift.scss
  101. +0 −73 spec/neat/columns_spec.rb
  102. +0 −21 spec/neat/container_spec.rb
  103. +0 −15 spec/neat/default_spec.rb
  104. +0 −19 spec/neat/direction_spec.rb
  105. +0 −19 spec/neat/display_spec.rb
  106. +35 −0 spec/neat/functions/neat_column_default_spec.rb
  107. +47 −0 spec/neat/functions/neat_column_width_spec.rb
  108. +23 −0 spec/neat/functions/neat_float_direction_spec.rb
  109. +23 −0 spec/neat/functions/neat_opposite_direction_spec.rb
  110. +23 −0 spec/neat/functions/neat_parse_media_spec.rb
  111. +35 −0 spec/neat/functions/retrieve_neat_settings_spec.rb
  112. +0 −55 spec/neat/media_spec.rb
  113. +26 −0 spec/neat/mixins/grid_collapse_spec.rb
  114. +101 −0 spec/neat/mixins/grid_column_spec.rb
  115. +17 −0 spec/neat/mixins/grid_container_spec.rb
  116. +39 −0 spec/neat/mixins/grid_media_spec.rb
  117. +59 −0 spec/neat/mixins/grid_push_spec.rb
  118. +59 −0 spec/neat/mixins/grid_shift_spec.rb
  119. +0 −17 spec/neat/new_breakpoint_spec.rb
  120. +0 −66 spec/neat/omega_spec.rb
  121. +0 −32 spec/neat/pad_spec.rb
  122. +0 −39 spec/neat/row_spec.rb
  123. +0 −41 spec/neat/shift_spec.rb
  124. +20 −0 spec/support/matchers/have_ruleset.rb
  125. +9 −7 spec/support/matchers/have_value.rb
  126. +8 −1 spec/support/parser_support.rb
  127. +1 −1 spec/support/sass_support.rb
  128. +0 −2 test/_setup.scss
  129. +0 −1 test/default.scss
  130. +0 −13 test/direction-context.scss
  131. +0 −15 test/display-context.scss
  132. +0 −39 test/media.scss
  133. +0 −13 test/new-breakpoint.scss
  134. +0 −29 test/omega.scss
  135. +0 −11 test/outer-container.scss
  136. +0 −17 test/pad.scss
  137. +0 −26 test/row.scss
  138. +0 −36 test/shift.scss
  139. +0 −21 test/span-columns.scss
34 changes: 34 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
version: 2

jobs:
build:
docker:
- image: circleci/ruby:2.6.3-node

steps:
- checkout

- restore_cache:
keys:
- neat-{{ arch }}-{{ checksum "neat.gemspec" }}

- run:
name: Install Ruby dependencies
command: bundle install --path vendor/bundle

- run:
name: Install SassDoc
command: sudo npm install -g sassdoc@2.5.0

- save_cache:
key: neat-{{ arch }}-{{ checksum "neat.gemspec" }}
paths:
- vendor/bundle

- run:
name: Run the tests
command: bundle exec rake

- run:
name: Parse SassDoc comments
command: sassdoc core/ --parse --verbose --strict
22 changes: 22 additions & 0 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
Welcome to Neat! 👋🎉

Do you need help or have a question? Please check out Neat on [Stack Overflow]. Got an idea for a new feature or found a bug? Please fill out the sections below... thank you 👍

[Stack Overflow]: https://stackoverflow.com/questions/tagged/neat

### Issue Summary

A summary of the issue and the browser/OS environment in which it occurs.

### Steps to Reproduce

1. This is the first step
2. This is the second step, etc.

Any other info, for example, why you consider this to be a bug? What did you expect to happen instead?

### Technical details:

- Neat Version:
- Build Tool or Environment:
- Browser/OS:
8 changes: 8 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
Got some code for us? Awesome 🎊!

Please include a description of your change and the problem it solves. Then check your PR against this list. Thanks!
- [ ] Commit message has a short title & issue references
- [ ] Commits are squashed
- [ ] The build will pass (run `bundle exec rake`).

More info can be found by clicking the "guidelines for contributing" link above.
8 changes: 4 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
.DS_store
.sass-cache
*gem
*swp
.DS_store
.sass-cache
contrib/*.css
Gemfile.lock
node_modules
public
tmp
contrib/*.css
node_modules
5 changes: 5 additions & 0 deletions .hound.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
ruby:
enabled: true
scss:
config_file: .scss-lint.yml
enabled: true
15 changes: 8 additions & 7 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -1,19 +1,20 @@
.github/
.gitignore
.rspec
.hound.yml
.ruby-version
.sass-cache
.scss-lint.yml
.travis.yml
_site
bin/
bower.json
circle.yml
CODE_OF_CONDUCT.md
contrib/
CONTRIBUTING.md
Gemfile
Gemfile.lock
Gulpfile.js
lib/
neat.gemspec
NEWS.md
pkg/
Rakefile
sache.json
RELEASING.md
spec/
test/
1 change: 0 additions & 1 deletion .rspec

This file was deleted.

1 change: 0 additions & 1 deletion .ruby-version

This file was deleted.

8 changes: 7 additions & 1 deletion .scss-lint.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
scss_files: "**/*.scss"

severity: warning

linters:
BangFormat:
enabled: true
@@ -147,7 +149,7 @@ linters:
max_depth: 2

SelectorFormat:
enabled: false
enabled: true
convention: hyphenated_BEM

Shorthand:
@@ -165,6 +167,10 @@ linters:
enabled: true
style: one_space

SpaceAfterComment:
enabled: false
allow_empty_comments: true

SpaceAfterPropertyColon:
enabled: true
style: one_space
2 changes: 2 additions & 0 deletions .tool-versions
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ruby 2.6.3
nodejs 10.16.0
10 changes: 0 additions & 10 deletions .travis.yml

This file was deleted.

Loading