remove bourbon-neat

Gaurav0 · Gaurav0 · commit e5a33eb3c1e7 · 2020-03-06T19:11:24.000-05:00
diff --git a/app/styles/app.scss b/app/styles/app.scss
@@ -2,7 +2,6 @@
 @import "normalize";
 @import "bourbon";
 @import "./base/base";
-@import "neat";
 @import "./components/all";
 @import "class";
 @import "ember-power-select";
diff --git a/app/styles/base/_grid-settings.scss b/app/styles/base/_grid-settings.scss
@@ -1,13 +1,6 @@
-@import "neat-helpers"; // or "../neat/neat-helpers" when not in Rails
-// Neat Overrides
-// $column: 90px;
-// $gutter: 30px;
-// $grid-columns: 12;
-// $max-width: 1088px;
-// Neat Breakpoints
 $mobile-portrait-screen: 30em; // 480px
 $medium-screen: 40em; // 640px
 $large-screen: 54em; // 864px
 $medium-screen-up: new-breakpoint(min-width $medium-screen 4);
 $medium-large-screen-up: new-breakpoint(min-width $medium-screen 8);
-$large-screen-up: new-breakpoint(min-width $large-screen 8);
+$large-screen-up: new-breakpoint(min-width $large-screen 8);
diff --git a/app/styles/components/_back-to-top.scss b/app/styles/components/_back-to-top.scss
@@ -5,12 +5,12 @@
   margin-left: 1em;
   text-align: center;
 
-  @include media(max-width 89em) {
+  @media (max-width: 89em) {
     @include size(1.5em);
     overflow: hidden;
   }
 
-  @include media(max-width 78em) {
+  @media (max-width: 78em) {
     height: 0;
   }
 }
diff --git a/app/styles/components/_layout.scss b/app/styles/components/_layout.scss
@@ -1,11 +1,11 @@
 main {
-  @include media($large-screen) {
+  @media screen and (min-width: $large-screen) {
     display: flex;
   }
 }
 
 .container {
-  @include outer-container;
+  margin: 0 auto;
   padding: 0 1em;
   &::after {
   	clear: both;
diff --git a/app/styles/components/_sidebar.scss b/app/styles/components/_sidebar.scss
@@ -1,6 +1,6 @@
 .sidebar {
 
-  @include media($large-screen-up) {
+  @media (min-width: $large-screen-up) {
     margin-right: 0;
     border-bottom: 0;
     padding: $small-spacing $base-spacing $base-spacing * 1.5;
@@ -46,7 +46,7 @@ label[for="toc-toggle"] {
     border-width: 0 4px 5px 4px;
   }
 
-  @include media($large-screen) {
+  @media screen and (min-width: $large-screen) {
     display: none;
   }
 }
@@ -59,7 +59,7 @@ label[for="toc-toggle"] {
   .toc-toggle:checked ~ & {
     display: block;
   }
-  @include media($large-screen) {
+  @media screen and (min-width: $large-screen) {
     display: block;
 
     // ensure toc-toggle can not cause toc-container to be hidden on large screen
diff --git a/ember-cli-build.js b/ember-cli-build.js
@@ -13,7 +13,6 @@ module.exports = function(defaults) {
     sassOptions: {
       includePaths: [
         'app/styles',
-        'node_modules/bourbon-neat/app/assets/stylesheets',
         'node_modules/normalize.css'
       ]
     },
diff --git a/package.json b/package.json
@@ -39,7 +39,6 @@
     "@ember/jquery": "^0.5.2",
     "@ember/optional-features": "^0.6.3",
     "algoliasearch": "^3.32.1",
-    "bourbon-neat": "^1.9.1",
     "broccoli-asset-rev": "^3.0.0",
     "broccoli-funnel": "^2.0.1",
     "broccoli-merge-trees": "^2.0.0",
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -5,12 +5,12 @@`
`5`	`5`	`margin-left: 1em;`
`6`	`6`	`text-align: center;`
`7`	`7`
`8`		`- @include media(max-width 89em) {`
	`8`	`+ @media (max-width: 89em) {`
`9`	`9`	`@include size(1.5em);`
`10`	`10`	`overflow: hidden;`
`11`	`11`	`}`
`12`	`12`
`13`		`- @include media(max-width 78em) {`
	`13`	`+ @media (max-width: 78em) {`
`14`	`14`	`height: 0;`
`15`	`15`	`}`
`16`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,11 @@`
`1`	`1`	`main {`
`2`		`- @include media($large-screen) {`
	`2`	`+ @media screen and (min-width: $large-screen) {`
`3`	`3`	`display: flex;`
`4`	`4`	`}`
`5`	`5`	`}`
`6`	`6`
`7`	`7`	`.container {`
`8`		`- @include outer-container;`
	`8`	`+ margin: 0 auto;`
`9`	`9`	`padding: 0 1em;`
`10`	`10`	`&::after {`
`11`	`11`	`clear: both;`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`.sidebar {`
`2`	`2`
`3`		`- @include media($large-screen-up) {`
	`3`	`+ @media (min-width: $large-screen-up) {`
`4`	`4`	`margin-right: 0;`
`5`	`5`	`border-bottom: 0;`
`6`	`6`	`padding: $small-spacing $base-spacing $base-spacing * 1.5;`
`@@ -46,7 +46,7 @@ label[for="toc-toggle"] {`
`46`	`46`	`border-width: 0 4px 5px 4px;`
`47`	`47`	`}`
`48`	`48`
`49`		`- @include media($large-screen) {`
	`49`	`+ @media screen and (min-width: $large-screen) {`
`50`	`50`	`display: none;`
`51`	`51`	`}`
`52`	`52`	`}`
`@@ -59,7 +59,7 @@ label[for="toc-toggle"] {`
`59`	`59`	`.toc-toggle:checked ~ & {`
`60`	`60`	`display: block;`
`61`	`61`	`}`
`62`		`- @include media($large-screen) {`
	`62`	`+ @media screen and (min-width: $large-screen) {`
`63`	`63`	`display: block;`
`64`	`64`
`65`	`65`	`// ensure toc-toggle can not cause toc-container to be hidden on large screen`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,6 @@ module.exports = function(defaults) {`
`13`	`13`	`sassOptions: {`
`14`	`14`	`includePaths: [`
`15`	`15`	`'app/styles',`
`16`		`- 'node_modules/bourbon-neat/app/assets/stylesheets',`
`17`	`16`	`'node_modules/normalize.css'`
`18`	`17`	`]`
`19`	`18`	`},`