{"action":"created","comment":{"url":"https://api.github.com/repos/thoughtbot/neat/pulls/comments/100590111","pull_request_review_id":21306076,"id":100590111,"diff_hunk":"@@ -0,0 +1,23 @@\n+@charset \"UTF-8\";\n+/// Apply Neat's default properties to undefined values within a map.","path":"core/neat/functions/_neat-merge-defaults.scss","position":2,"original_position":2,"commit_id":"32e82a541d9b008933969315ba90f89a6fca53f8","original_commit_id":"32e82a541d9b008933969315ba90f89a6fca53f8","user":{"login":"houndci-bot","id":6697940,"avatar_url":"https://avatars.githubusercontent.com/u/6697940?v=3","gravatar_id":"","url":"https://api.github.com/users/houndci-bot","html_url":"https://github.com/houndci-bot","followers_url":"https://api.github.com/users/houndci-bot/followers","following_url":"https://api.github.com/users/houndci-bot/following{/other_user}","gists_url":"https://api.github.com/users/houndci-bot/gists{/gist_id}","starred_url":"https://api.github.com/users/houndci-bot/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/houndci-bot/subscriptions","organizations_url":"https://api.github.com/users/houndci-bot/orgs","repos_url":"https://api.github.com/users/houndci-bot/repos","events_url":"https://api.github.com/users/houndci-bot/events{/privacy}","received_events_url":"https://api.github.com/users/houndci-bot/received_events","type":"User","site_admin":false},"body":"Comment literal should be followed by one space","created_at":"2017-02-10T18:05:37Z","updated_at":"2017-02-10T18:05:37Z","html_url":"https://github.com/thoughtbot/neat/pull/535#discussion_r100590111","pull_request_url":"https://api.github.com/repos/thoughtbot/neat/pulls/535","_links":{"self":{"href":"https://api.github.com/repos/thoughtbot/neat/pulls/comments/100590111"},"html":{"href":"https://github.com/thoughtbot/neat/pull/535#discussion_r100590111"},"pull_request":{"href":"https://api.github.com/repos/thoughtbot/neat/pulls/535"}}},"pull_request":{"url":"https://api.github.com/repos/thoughtbot/neat/pulls/535","id":105459348,"html_url":"https://github.com/thoughtbot/neat/pull/535","diff_url":"https://github.com/thoughtbot/neat/pull/535.diff","patch_url":"https://github.com/thoughtbot/neat/pull/535.patch","issue_url":"https://api.github.com/repos/thoughtbot/neat/issues/535","number":535,"state":"open","locked":false,"title":"Inherit undefined media grid properties from global neat-grid","user":{"login":"whmii","id":2489247,"avatar_url":"https://avatars.githubusercontent.com/u/2489247?v=3","gravatar_id":"","url":"https://api.github.com/users/whmii","html_url":"https://github.com/whmii","followers_url":"https://api.github.com/users/whmii/followers","following_url":"https://api.github.com/users/whmii/following{/other_user}","gists_url":"https://api.github.com/users/whmii/gists{/gist_id}","starred_url":"https://api.github.com/users/whmii/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/whmii/subscriptions","organizations_url":"https://api.github.com/users/whmii/orgs","repos_url":"https://api.github.com/users/whmii/repos","events_url":"https://api.github.com/users/whmii/events{/privacy}","received_events_url":"https://api.github.com/users/whmii/received_events","type":"User","site_admin":false},"body":"Currently a custom grid used with the `grid-media()` mixin will inherit any undefined properties from neat's internal default grid and not the globally defined `$neat-grid` which is user accessible. This issue was addressed in [https://github.com/thoughtbot/neat/issues/532]. Because of this the following changes have been addressed in this PR.\r\n\r\n1. Since the defaults are now being used in multiple locations, I have abstracted them in to their own function, the newly dubbed `_neat-merge-defaults`. This function accepts a single map, and merges it with the neat's defaults to fill in any missing pieces.\r\n2. Secondly, the `grid-media()` mixin now performs an operation of merging the mixin it has been passed with the user defined `$neat-grid` before falling back to the neat internal defaults.\r\n\r\nI was able to replicate the original issue in the contrib pages as below:\r\n\r\n## Sass grids\r\n```scss\r\n\r\n$neat-grid: (\r\n  columns: 12,\r\n  gutter: 40px,\r\n);\r\n\r\n$specific-neat-grid: (\r\n  columns: 7,\r\n  media: \"only screen and (min-width: 1000px) and (max-width: 1100px)\",\r\n);\r\n```\r\n\r\n## Original behavior\r\n\r\n<img width=\"1076\" alt=\"screen shot 2017-02-09 at 10 44 56 am\" src=\"https://cloud.githubusercontent.com/assets/2489247/22791505/951e950a-eeb7-11e6-839d-9ed8b5dd189d.png\">\r\n\r\nIn this screenshot, `$specific-neat-grid` has engaged, based on it's `media` attribute. Since it does not have a `gutter` set, the grid falls back to the default. Even though `$neat-grid` has a gutter defined, the library skips it and goes straight back to neat's default `20px`. Not really *wrong* but feels unexpected. This could be issue could be eschewed by adding `gutter: 40px,` to `$specific-neat-grid`.\r\n\r\n## New Behavior\r\n\r\n<img width=\"1074\" alt=\"screen shot 2017-02-09 at 10 45 12 am\" src=\"https://cloud.githubusercontent.com/assets/2489247/22791521/a08803ea-eeb7-11e6-93c6-f8ada260770f.png\">\r\n\r\nIn this example, `$specific-neat-grid`'s undefined `gutter` property now inherits from `$neat-grid` prior to falling back to the internal neat default. The column now observes the `40px` gutter of its predecessors.\r\n\r\n---\r\n\r\nAddress: https://github.com/thoughtbot/neat/issues/532","created_at":"2017-02-09T16:13:08Z","updated_at":"2017-02-10T18:05:37Z","closed_at":null,"merged_at":null,"merge_commit_sha":"5f63468ad996a10e3555545c04aa75f7847d966e","assignee":null,"assignees":[],"milestone":null,"commits_url":"https://api.github.com/repos/thoughtbot/neat/pulls/535/commits","review_comments_url":"https://api.github.com/repos/thoughtbot/neat/pulls/535/comments","review_comment_url":"https://api.github.com/repos/thoughtbot/neat/pulls/comments{/number}","comments_url":"https://api.github.com/repos/thoughtbot/neat/issues/535/comments","statuses_url":"https://api.github.com/repos/thoughtbot/neat/statuses/32e82a541d9b008933969315ba90f89a6fca53f8","head":{"label":"thoughtbot:whmii-media-query-inheritance","ref":"whmii-media-query-inheritance","sha":"32e82a541d9b008933969315ba90f89a6fca53f8","user":{"login":"thoughtbot","id":6183,"avatar_url":"https://avatars.githubusercontent.com/u/6183?v=3","gravatar_id":"","url":"https://api.github.com/users/thoughtbot","html_url":"https://github.com/thoughtbot","followers_url":"https://api.github.com/users/thoughtbot/followers","following_url":"https://api.github.com/users/thoughtbot/following{/other_user}","gists_url":"https://api.github.com/users/thoughtbot/gists{/gist_id}","starred_url":"https://api.github.com/users/thoughtbot/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/thoughtbot/subscriptions","organizations_url":"https://api.github.com/users/thoughtbot/orgs","repos_url":"https://api.github.com/users/thoughtbot/repos","events_url":"https://api.github.com/users/thoughtbot/events{/privacy}","received_events_url":"https://api.github.com/users/thoughtbot/received_events","type":"Organization","site_admin":false},"repo":{"id":5275559,"name":"neat","full_name":"thoughtbot/neat","owner":{"login":"thoughtbot","id":6183,"avatar_url":"https://avatars.githubusercontent.com/u/6183?v=3","gravatar_id":"","url":"https://api.github.com/users/thoughtbot","html_url":"https://github.com/thoughtbot","followers_url":"https://api.github.com/users/thoughtbot/followers","following_url":"https://api.github.com/users/thoughtbot/following{/other_user}","gists_url":"https://api.github.com/users/thoughtbot/gists{/gist_id}","starred_url":"https://api.github.com/users/thoughtbot/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/thoughtbot/subscriptions","organizations_url":"https://api.github.com/users/thoughtbot/orgs","repos_url":"https://api.github.com/users/thoughtbot/repos","events_url":"https://api.github.com/users/thoughtbot/events{/privacy}","received_events_url":"https://api.github.com/users/thoughtbot/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/thoughtbot/neat","description":"A lightweight and flexible Sass grid","fork":false,"url":"https://api.github.com/repos/thoughtbot/neat","forks_url":"https://api.github.com/repos/thoughtbot/neat/forks","keys_url":"https://api.github.com/repos/thoughtbot/neat/keys{/key_id}","collaborators_url":"https://api.github.com/repos/thoughtbot/neat/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/thoughtbot/neat/teams","hooks_url":"https://api.github.com/repos/thoughtbot/neat/hooks","issue_events_url":"https://api.github.com/repos/thoughtbot/neat/issues/events{/number}","events_url":"https://api.github.com/repos/thoughtbot/neat/events","assignees_url":"https://api.github.com/repos/thoughtbot/neat/assignees{/user}","branches_url":"https://api.github.com/repos/thoughtbot/neat/branches{/branch}","tags_url":"https://api.github.com/repos/thoughtbot/neat/tags","blobs_url":"https://api.github.com/repos/thoughtbot/neat/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/thoughtbot/neat/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/thoughtbot/neat/git/refs{/sha}","trees_url":"https://api.github.com/repos/thoughtbot/neat/git/trees{/sha}","statuses_url":"https://api.github.com/repos/thoughtbot/neat/statuses/{sha}","languages_url":"https://api.github.com/repos/thoughtbot/neat/languages","stargazers_url":"https://api.github.com/repos/thoughtbot/neat/stargazers","contributors_url":"https://api.github.com/repos/thoughtbot/neat/contributors","subscribers_url":"https://api.github.com/repos/thoughtbot/neat/subscribers","subscription_url":"https://api.github.com/repos/thoughtbot/neat/subscription","commits_url":"https://api.github.com/repos/thoughtbot/neat/commits{/sha}","git_commits_url":"https://api.github.com/repos/thoughtbot/neat/git/commits{/sha}","comments_url":"https://api.github.com/repos/thoughtbot/neat/comments{/number}","issue_comment_url":"https://api.github.com/repos/thoughtbot/neat/issues/comments{/number}","contents_url":"https://api.github.com/repos/thoughtbot/neat/contents/{+path}","compare_url":"https://api.github.com/repos/thoughtbot/neat/compare/{base}...{head}","merges_url":"https://api.github.com/repos/thoughtbot/neat/merges","archive_url":"https://api.github.com/repos/thoughtbot/neat/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/thoughtbot/neat/downloads","issues_url":"https://api.github.com/repos/thoughtbot/neat/issues{/number}","pulls_url":"https://api.github.com/repos/thoughtbot/neat/pulls{/number}","milestones_url":"https://api.github.com/repos/thoughtbot/neat/milestones{/number}","notifications_url":"https://api.github.com/repos/thoughtbot/neat/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/thoughtbot/neat/labels{/name}","releases_url":"https://api.github.com/repos/thoughtbot/neat/releases{/id}","deployments_url":"https://api.github.com/repos/thoughtbot/neat/deployments","created_at":"2012-08-02T17:28:38Z","updated_at":"2017-02-10T00:47:49Z","pushed_at":"2017-02-10T18:05:27Z","git_url":"git://github.com/thoughtbot/neat.git","ssh_url":"git@github.com:thoughtbot/neat.git","clone_url":"https://github.com/thoughtbot/neat.git","svn_url":"https://github.com/thoughtbot/neat","homepage":"http://neat.bourbon.io","size":1286,"stargazers_count":3991,"watchers_count":3991,"language":"CSS","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":true,"forks_count":410,"mirror_url":null,"open_issues_count":20,"forks":410,"open_issues":20,"watchers":3991,"default_branch":"master"}},"base":{"label":"thoughtbot:whmii-relocate-neat-defaults","ref":"whmii-relocate-neat-defaults","sha":"a70218425be35ba2f75cd344ae5f02e42dda2c21","user":{"login":"thoughtbot","id":6183,"avatar_url":"https://avatars.githubusercontent.com/u/6183?v=3","gravatar_id":"","url":"https://api.github.com/users/thoughtbot","html_url":"https://github.com/thoughtbot","followers_url":"https://api.github.com/users/thoughtbot/followers","following_url":"https://api.github.com/users/thoughtbot/following{/other_user}","gists_url":"https://api.github.com/users/thoughtbot/gists{/gist_id}","starred_url":"https://api.github.com/users/thoughtbot/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/thoughtbot/subscriptions","organizations_url":"https://api.github.com/users/thoughtbot/orgs","repos_url":"https://api.github.com/users/thoughtbot/repos","events_url":"https://api.github.com/users/thoughtbot/events{/privacy}","received_events_url":"https://api.github.com/users/thoughtbot/received_events","type":"Organization","site_admin":false},"repo":{"id":5275559,"name":"neat","full_name":"thoughtbot/neat","owner":{"login":"thoughtbot","id":6183,"avatar_url":"https://avatars.githubusercontent.com/u/6183?v=3","gravatar_id":"","url":"https://api.github.com/users/thoughtbot","html_url":"https://github.com/thoughtbot","followers_url":"https://api.github.com/users/thoughtbot/followers","following_url":"https://api.github.com/users/thoughtbot/following{/other_user}","gists_url":"https://api.github.com/users/thoughtbot/gists{/gist_id}","starred_url":"https://api.github.com/users/thoughtbot/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/thoughtbot/subscriptions","organizations_url":"https://api.github.com/users/thoughtbot/orgs","repos_url":"https://api.github.com/users/thoughtbot/repos","events_url":"https://api.github.com/users/thoughtbot/events{/privacy}","received_events_url":"https://api.github.com/users/thoughtbot/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/thoughtbot/neat","description":"A lightweight and flexible Sass grid","fork":false,"url":"https://api.github.com/repos/thoughtbot/neat","forks_url":"https://api.github.com/repos/thoughtbot/neat/forks","keys_url":"https://api.github.com/repos/thoughtbot/neat/keys{/key_id}","collaborators_url":"https://api.github.com/repos/thoughtbot/neat/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/thoughtbot/neat/teams","hooks_url":"https://api.github.com/repos/thoughtbot/neat/hooks","issue_events_url":"https://api.github.com/repos/thoughtbot/neat/issues/events{/number}","events_url":"https://api.github.com/repos/thoughtbot/neat/events","assignees_url":"https://api.github.com/repos/thoughtbot/neat/assignees{/user}","branches_url":"https://api.github.com/repos/thoughtbot/neat/branches{/branch}","tags_url":"https://api.github.com/repos/thoughtbot/neat/tags","blobs_url":"https://api.github.com/repos/thoughtbot/neat/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/thoughtbot/neat/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/thoughtbot/neat/git/refs{/sha}","trees_url":"https://api.github.com/repos/thoughtbot/neat/git/trees{/sha}","statuses_url":"https://api.github.com/repos/thoughtbot/neat/statuses/{sha}","languages_url":"https://api.github.com/repos/thoughtbot/neat/languages","stargazers_url":"https://api.github.com/repos/thoughtbot/neat/stargazers","contributors_url":"https://api.github.com/repos/thoughtbot/neat/contributors","subscribers_url":"https://api.github.com/repos/thoughtbot/neat/subscribers","subscription_url":"https://api.github.com/repos/thoughtbot/neat/subscription","commits_url":"https://api.github.com/repos/thoughtbot/neat/commits{/sha}","git_commits_url":"https://api.github.com/repos/thoughtbot/neat/git/commits{/sha}","comments_url":"https://api.github.com/repos/thoughtbot/neat/comments{/number}","issue_comment_url":"https://api.github.com/repos/thoughtbot/neat/issues/comments{/number}","contents_url":"https://api.github.com/repos/thoughtbot/neat/contents/{+path}","compare_url":"https://api.github.com/repos/thoughtbot/neat/compare/{base}...{head}","merges_url":"https://api.github.com/repos/thoughtbot/neat/merges","archive_url":"https://api.github.com/repos/thoughtbot/neat/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/thoughtbot/neat/downloads","issues_url":"https://api.github.com/repos/thoughtbot/neat/issues{/number}","pulls_url":"https://api.github.com/repos/thoughtbot/neat/pulls{/number}","milestones_url":"https://api.github.com/repos/thoughtbot/neat/milestones{/number}","notifications_url":"https://api.github.com/repos/thoughtbot/neat/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/thoughtbot/neat/labels{/name}","releases_url":"https://api.github.com/repos/thoughtbot/neat/releases{/id}","deployments_url":"https://api.github.com/repos/thoughtbot/neat/deployments","created_at":"2012-08-02T17:28:38Z","updated_at":"2017-02-10T00:47:49Z","pushed_at":"2017-02-10T18:05:27Z","git_url":"git://github.com/thoughtbot/neat.git","ssh_url":"git@github.com:thoughtbot/neat.git","clone_url":"https://github.com/thoughtbot/neat.git","svn_url":"https://github.com/thoughtbot/neat","homepage":"http://neat.bourbon.io","size":1286,"stargazers_count":3991,"watchers_count":3991,"language":"CSS","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":true,"forks_count":410,"mirror_url":null,"open_issues_count":20,"forks":410,"open_issues":20,"watchers":3991,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/thoughtbot/neat/pulls/535"},"html":{"href":"https://github.com/thoughtbot/neat/pull/535"},"issue":{"href":"https://api.github.com/repos/thoughtbot/neat/issues/535"},"comments":{"href":"https://api.github.com/repos/thoughtbot/neat/issues/535/comments"},"review_comments":{"href":"https://api.github.com/repos/thoughtbot/neat/pulls/535/comments"},"review_comment":{"href":"https://api.github.com/repos/thoughtbot/neat/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/thoughtbot/neat/pulls/535/commits"},"statuses":{"href":"https://api.github.com/repos/thoughtbot/neat/statuses/32e82a541d9b008933969315ba90f89a6fca53f8"}}}}
{"actor":{"display_login":"houndci-bot"}}